[PATCH 3/5] wined3d: Use GLSL 1.30 for all shaders if available.
Józef Kucia
jkucia at codeweavers.com
Wed Apr 12 05:42:28 CDT 2017
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/wined3d/glsl_shader.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 2eba072..2a121dd 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -357,7 +357,7 @@ static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_inf
if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]
|| (version && version->type == WINED3D_SHADER_TYPE_COMPUTE))
return 150;
- else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30) && version && version->major >= 4)
+ else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30))
return 130;
else
return 120;
@@ -2017,7 +2017,7 @@ static unsigned int vec4_varyings(DWORD shader_major, const struct wined3d_gl_in
static BOOL needs_legacy_glsl_syntax(const struct wined3d_gl_info *gl_info)
{
- return gl_info->supported[WINED3D_GL_LEGACY_CONTEXT];
+ return gl_info->glsl_version < MAKEDWORD_VERSION(1, 30);
}
static BOOL shader_glsl_use_explicit_attrib_location(const struct wined3d_gl_info *gl_info)
--
2.10.2
More information about the wine-patches
mailing list