Skip to content

W
wine-cw
Commit 416f8d2e authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard
Browse files
Options

wined3d: Add ARB_texture_multisample extension.

Signed-off-by: 's avatarJózef Kucia <jkucia@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 2d0704f7
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
dlls/wined3d/directx.c
View file @ 416f8d2e
...@@ -184,6 +184,7 @@ static const struct wined3d_extension_map gl_extension_map[] = ...@@ -184,6 +184,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
{"GL_ARB_texture_gather", ARB_TEXTURE_GATHER }, {"GL_ARB_texture_gather", ARB_TEXTURE_GATHER },
{"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT }, {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT },
{"GL_ARB_texture_mirror_clamp_to_edge", ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE}, {"GL_ARB_texture_mirror_clamp_to_edge", ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE},
{"GL_ARB_texture_multisample", ARB_TEXTURE_MULTISAMPLE },
{"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO }, {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO },
{"GL_ARB_texture_query_levels", ARB_TEXTURE_QUERY_LEVELS }, {"GL_ARB_texture_query_levels", ARB_TEXTURE_QUERY_LEVELS },
{"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE }, {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE },
...@@ -2888,6 +2889,11 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) ...@@ -2888,6 +2889,11 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
USE_GL_FUNC(glCompressedTexSubImage2DARB) USE_GL_FUNC(glCompressedTexSubImage2DARB)
USE_GL_FUNC(glCompressedTexSubImage3DARB) USE_GL_FUNC(glCompressedTexSubImage3DARB)
USE_GL_FUNC(glGetCompressedTexImageARB) USE_GL_FUNC(glGetCompressedTexImageARB)
/* GL_ARB_texture_multisample */
USE_GL_FUNC(glGetMultisamplefv);
USE_GL_FUNC(glSampleMaski);
USE_GL_FUNC(glTexImage2DMultisample);
USE_GL_FUNC(glTexImage3DMultisample);
/* GL_ARB_texture_storage */ /* GL_ARB_texture_storage */
USE_GL_FUNC(glTexStorage1D) USE_GL_FUNC(glTexStorage1D)
USE_GL_FUNC(glTexStorage2D) USE_GL_FUNC(glTexStorage2D)
...@@ -3868,6 +3874,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, ...@@ -3868,6 +3874,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter,
{ARB_PROVOKING_VERTEX, MAKEDWORD_VERSION(3, 2)}, {ARB_PROVOKING_VERTEX, MAKEDWORD_VERSION(3, 2)},
{ARB_SEAMLESS_CUBE_MAP, MAKEDWORD_VERSION(3, 2)}, {ARB_SEAMLESS_CUBE_MAP, MAKEDWORD_VERSION(3, 2)},
{ARB_SYNC, MAKEDWORD_VERSION(3, 2)}, {ARB_SYNC, MAKEDWORD_VERSION(3, 2)},
{ARB_TEXTURE_MULTISAMPLE, MAKEDWORD_VERSION(3, 2)},
{ARB_VERTEX_ARRAY_BGRA, MAKEDWORD_VERSION(3, 2)}, {ARB_VERTEX_ARRAY_BGRA, MAKEDWORD_VERSION(3, 2)},
{ARB_BLEND_FUNC_EXTENDED, MAKEDWORD_VERSION(3, 3)}, {ARB_BLEND_FUNC_EXTENDED, MAKEDWORD_VERSION(3, 3)},
......
dlls/wined3d/wined3d_gl.h
View file @ 416f8d2e
...@@ -117,6 +117,7 @@ enum wined3d_gl_extension ...@@ -117,6 +117,7 @@ enum wined3d_gl_extension
ARB_TEXTURE_GATHER, ARB_TEXTURE_GATHER,
ARB_TEXTURE_MIRRORED_REPEAT, ARB_TEXTURE_MIRRORED_REPEAT,
ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE, ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE,
ARB_TEXTURE_MULTISAMPLE,
ARB_TEXTURE_NON_POWER_OF_TWO, ARB_TEXTURE_NON_POWER_OF_TWO,
ARB_TEXTURE_QUERY_LEVELS, ARB_TEXTURE_QUERY_LEVELS,
ARB_TEXTURE_RECTANGLE, ARB_TEXTURE_RECTANGLE,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment