[PATCH] wined3d: Don't enable GL_EXT_geometry_shader4 on OpenGL >3.1
Zach Mertes
techiezach at gmail.com
Mon Jul 31 01:13:13 CDT 2017
GL_EXT_geometry_shader4's features are intrinsically enabled on OpenGL
3.1 and newer.
Enabling it past 3.1 causes an annoying GLSL warning.
Tested on Arch Linux
Signed-off-by: Zeke Sonxx <zeke at zekesonxx.com>
---
dlls/wined3d/glsl_shader.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 5b485ef5aa..04220fcfe0 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -7249,7 +7249,8 @@ static void shader_glsl_enable_extensions(struct
wined3d_string_buffer *buffer,
shader_addline(buffer, "#extension
GL_ARB_texture_query_levels : enable\n");
if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT])
shader_addline(buffer, "#extension
GL_ARB_uniform_buffer_object : enable\n");
- if (gl_info->supported[EXT_GEOMETRY_SHADER4])
+ if (gl_info->supported[EXT_GEOMETRY_SHADER4] &&
+ gl_info->selected_gl_version >= MAKEDWORD_VERSION(3, 1))
shader_addline(buffer, "#extension GL_EXT_geometry_shader4 :
enable\n");
if (gl_info->supported[EXT_GPU_SHADER4])
shader_addline(buffer, "#extension GL_EXT_gpu_shader4 : enable\n");
--
2.13.1
More information about the wine-patches
mailing list