Matteo Bruni : wined3d: Fix FFP vertex shaders with ARB_explicit_attrib_location.

[Alexandre Julliard]

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

Author: Matteo Bruni <mbruni(a)codeweavers.com>
Date:   Wed Jun  1 23:16:52 2016 +0200

wined3d: Fix FFP vertex shaders with ARB_explicit_attrib_location.

Signed-off-by: Matteo Bruni <mbruni(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 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index e5a0e69..4e773b6 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -6363,10 +6363,15 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
 
     shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, NULL));
 
+    if (shader_glsl_use_explicit_attrib_location(gl_info))
+        shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n");
+
     for (i = 0; i < WINED3D_FFP_ATTRIBS_COUNT; ++i)
     {
         const char *type = i < ARRAY_SIZE(attrib_info) ? attrib_info[i].type : "vec4";
 
+        if (shader_glsl_use_explicit_attrib_location(gl_info))
+            shader_addline(buffer, "layout(location = %u) ", i);
         shader_addline(buffer, "%s %s vs_in%u;\n", get_attribute_keyword(gl_info), type, i);
     }
     shader_addline(buffer, "\n");