X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fglsl%2Fconstructors.glsl;h=9b878e49727c3dbf9ccc7e3d65668292ec35adfc;hb=4737d137d0a1c7fed868c4adc7a3d7e00ba7681c;hp=fe7ca48ab65513ad9e2ce42eec42c0be40bddbc4;hpb=3f44e477f81983c66947fe8a6d8640a3b2f9e0b3;p=libs%2Fgl.git

diff --git a/tests/glsl/constructors.glsl b/tests/glsl/constructors.glsl
index fe7ca48a..9b878e49 100644
--- a/tests/glsl/constructors.glsl
+++ b/tests/glsl/constructors.glsl
@@ -27,32 +27,32 @@ void main()
 }
 
 /* Expected output: vertex
-uniform mat4 model;
-uniform mat4 view_projection;
-uniform vec3 light_dir;
+layout(location=0) uniform mat4 model;
+layout(location=4) uniform mat4 view_projection;
+layout(location=8) uniform vec3 light_dir;
 layout(location=0) in vec3 position;
 layout(location=1) in vec3 normal;
 layout(location=2) in vec3 tangent;
 layout(location=3) in vec3 binormal;
 layout(location=4) in vec2 texcoord;
-out vec3 tbn_light_dir;
-out vec2 _vs_out_texcoord;
+layout(location=0) out vec3 tbn_light_dir;
+layout(location=1) out vec2 _vs_out_texcoord;
 void main()
 {
   mat3 normal_matrix = mat3(model[0].xyz, model[1].xyz, model[2].xyz);
   tbn_light_dir = mat3(normal_matrix*tangent, normal_matrix*binormal, normal_matrix*normal)*light_dir;
-  gl_Position = view_projection*model*vec4(position, float(1));
+  gl_Position = view_projection*model*vec4(position, 1.0);
   _vs_out_texcoord = texcoord;
 }
 */
 
 /* Expected output: fragment
-uniform sampler2D normalmap;
+layout(location=9, binding=25) uniform sampler2D normalmap;
 layout(location=0) out vec4 frag_color;
-in vec2 _vs_out_texcoord;
-in vec3 tbn_light_dir;
+layout(location=1) in vec2 _vs_out_texcoord;
+layout(location=0) in vec3 tbn_light_dir;
 void main()
 {
-  frag_color = vec4(vec3(dot(vec3(texture(normalmap, _vs_out_texcoord).xyz)*2.0-1.0, normalize(tbn_light_dir))), float(1));
+  frag_color = vec4(vec3(dot(vec3(texture(normalmap, _vs_out_texcoord).xyz)*2.0-1.0, normalize(tbn_light_dir))), 1.0);
 }
 */