Module: wine Branch: master Commit: a830d7808f2f07e7efc8657134e0962642d94f52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a830d7808f2f07e7efc8657134...
Author: Józef Kucia jkucia@codeweavers.com Date: Wed Apr 12 12:42:28 2017 +0200
wined3d: Use GLSL 1.30 for all shaders if available.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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)