=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Do not enable GL_ARB_texture_multisample in GLSL.

Alexandre Julliard julliard at winehq.org
Fri Feb 9 14:51:45 CST 2018


Module: wine
Branch: master
Commit: 220841f33a4b343709802cb94a852730f2d20d82
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=220841f33a4b343709802cb94a852730f2d20d82

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Fri Feb  9 13:03:26 2018 +0100

wined3d: Do not enable GL_ARB_texture_multisample in GLSL.

GLSL 1.50 is required for SM4+.

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/glsl_shader.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index b3c6404..6f59cf1 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -7481,8 +7481,6 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer,
         shader_addline(buffer, "#extension GL_ARB_texture_cube_map_array : enable\n");
     if (gl_info->supported[ARB_TEXTURE_GATHER])
         shader_addline(buffer, "#extension GL_ARB_texture_gather : enable\n");
-    if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE])
-        shader_addline(buffer, "#extension GL_ARB_texture_multisample : enable\n");
     if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS])
         shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n");
     if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT])




More information about the wine-cvs mailing list