Allocate locations to interface variables

[libs/gl.git] / tests / glsl / arithmetic_assignment.glsl

diff --git a/tests/glsl/arithmetic_assignment.glsl b/tests/glsl/arithmetic_assignment.glsl
index adb2a0cbc99493c46738453c333a8b60ba3c3ac6..01e03b075a1580951d510b43a9e9653acdb6457f 100644 (file)
--- a/tests/glsl/arithmetic_assignment.glsl
+++ b/tests/glsl/arithmetic_assignment.glsl
@@ -18,7 +18,7 @@ void main()
 out vec4 frag_color;
 void main()
 {
-       vec3 color = texture(tex, texcoord);
+       vec3 color = texture(tex, texcoord).rgb;
        color *= tint;
        color *= light;
        color += ambient;
@@ -26,12 +26,12 @@ void main()
 }
 
 /* Expected output: vertex
-uniform mat4 mvp;
+layout(location=0) uniform mat4 mvp;
 layout(location=0) in vec4 position;
 layout(location=1) in vec3 normal;
 layout(location=2) in vec2 texcoord;
-out float light;
-out vec2 _vs_out_texcoord;
+layout(location=0) out float light;
+layout(location=1) out vec2 _vs_out_texcoord;
 void main()
 {
   light = normal.z;
@@ -41,15 +41,15 @@ void main()
 */
 
 /* Expected output: fragment
-uniform sampler2D tex;
-uniform vec3 tint;
-uniform vec3 ambient;
-out vec4 frag_color;
-in vec2 _vs_out_texcoord;
-in float light;
+layout(location=4) uniform sampler2D tex;
+layout(location=5) uniform vec3 tint;
+layout(location=6) uniform vec3 ambient;
+layout(location=0) out vec4 frag_color;
+layout(location=1) in vec2 _vs_out_texcoord;
+layout(location=0) in float light;
 void main()
 {
-  vec3 color = texture(tex, _vs_out_texcoord);
+  vec3 color = texture(tex, _vs_out_texcoord).rgb;
   color *= tint;
   color *= light;
   color += ambient;