Józef Kucia : wined3d: Formalize requirements for layout qualifiers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d5b9271e826e102725d92d650d8ad25178fcec65
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d5b9271e826e102725d92d650d...

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Thu Apr 20 11:04:10 2017 +0200

wined3d: Formalize requirements for layout qualifiers.

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/glsl_shader.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 57b9138..dffbf18 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -557,6 +557,14 @@ void shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLuint pro
     print_glsl_info_log(gl_info, program, TRUE);
 }
 
+static BOOL shader_glsl_use_layout_qualifier(const struct wined3d_gl_info *gl_info)
+{
+    /* Layout qualifiers were introduced in GLSL 1.40. The Nvidia Legacy GPU
+     * driver (series 340.xx) doesn't parse layout qualifiers in older GLSL
+     * versions. */
+    return shader_glsl_get_version(gl_info) >= 140;
+}
+
 static BOOL shader_glsl_use_layout_binding_qualifier(const struct wined3d_gl_info *gl_info)
 {
     return !gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && gl_info->supported[ARB_SHADING_LANGUAGE_420PACK];
@@ -2021,7 +2029,8 @@ static BOOL needs_legacy_glsl_syntax(const struct wined3d_gl_info *gl_info)
 
 static BOOL shader_glsl_use_explicit_attrib_location(const struct wined3d_gl_info *gl_info)
 {
-    return !needs_legacy_glsl_syntax(gl_info) && gl_info->supported[ARB_EXPLICIT_ATTRIB_LOCATION];
+    return gl_info->supported[ARB_EXPLICIT_ATTRIB_LOCATION]
+            && shader_glsl_use_layout_qualifier(gl_info) && !needs_legacy_glsl_syntax(gl_info);
 }
 
 static const char *get_attribute_keyword(const struct wined3d_gl_info *gl_info)