=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Add ARB_texture_storage_multisample extension.
Alexandre Julliard
julliard at winehq.org
Mon Feb 5 16:48:26 CST 2018
Module: wine
Branch: master
Commit: fea8cf8b36846fbf173f31fce2f82499f92f54a5
URL: https://source.winehq.org/git/wine.git/?a=commit;h=fea8cf8b36846fbf173f31fce2f82499f92f54a5
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Mon Feb 5 13:13:37 2018 +0100
wined3d: Add ARB_texture_storage_multisample extension.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/directx.c | 5 +++++
dlls/wined3d/wined3d_gl.h | 1 +
2 files changed, 6 insertions(+)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 4a69b28..000d0b7 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -191,6 +191,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
{"GL_ARB_texture_rg", ARB_TEXTURE_RG },
{"GL_ARB_texture_rgb10_a2ui", ARB_TEXTURE_RGB10_A2UI },
{"GL_ARB_texture_storage", ARB_TEXTURE_STORAGE },
+ {"GL_ARB_texture_storage_multisample", ARB_TEXTURE_STORAGE_MULTISAMPLE},
{"GL_ARB_texture_swizzle", ARB_TEXTURE_SWIZZLE },
{"GL_ARB_texture_view", ARB_TEXTURE_VIEW },
{"GL_ARB_timer_query", ARB_TIMER_QUERY },
@@ -2898,6 +2899,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
USE_GL_FUNC(glTexStorage1D)
USE_GL_FUNC(glTexStorage2D)
USE_GL_FUNC(glTexStorage3D)
+ /* GL_ARB_texture_storage_multisample */
+ USE_GL_FUNC(glTexStorage2DMultisample);
+ USE_GL_FUNC(glTexStorage3DMultisample);
/* GL_ARB_texture_view */
USE_GL_FUNC(glTextureView)
/* GL_ARB_timer_query */
@@ -3921,6 +3925,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter,
{ARB_STENCIL_TEXTURING, MAKEDWORD_VERSION(4, 3)},
{ARB_TEXTURE_BUFFER_RANGE, MAKEDWORD_VERSION(4, 3)},
{ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)},
+ {ARB_TEXTURE_STORAGE_MULTISAMPLE, MAKEDWORD_VERSION(4, 2)},
{ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)},
{ARB_CLEAR_TEXTURE, MAKEDWORD_VERSION(4, 4)},
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index 1bbdaa2..a3dee24 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -124,6 +124,7 @@ enum wined3d_gl_extension
ARB_TEXTURE_RG,
ARB_TEXTURE_RGB10_A2UI,
ARB_TEXTURE_STORAGE,
+ ARB_TEXTURE_STORAGE_MULTISAMPLE,
ARB_TEXTURE_SWIZZLE,
ARB_TEXTURE_VIEW,
ARB_TIMER_QUERY,
More information about the wine-cvs
mailing list