Even more validation for uniform mismatches

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

diff --git a/tests/glsl/parentheses.glsl b/tests/glsl/parentheses.glsl
index 9899c49ed72aecfcc3f5de72c39f817a2c077880..1dec429641b13b9abb172b7aec28c7ec36525eb3 100644 (file)
--- a/tests/glsl/parentheses.glsl
+++ b/tests/glsl/parentheses.glsl
@@ -1,9 +1,9 @@
 struct LightParams
 {
-       uniform vec3 ambient;
-       uniform vec3 color;
-       uniform float intensity;
-       uniform vec3 dir;
+       vec3 ambient;
+       vec3 color;
+       float intensity;
+       vec3 dir;
 };
 uniform LightParams light;
 uniform vec3 material_color;
@@ -51,10 +51,10 @@ void main()
 /* Expected output: fragment
 struct LightParams
 {
-  uniform vec3 ambient;
-  uniform vec3 color;
-  uniform float intensity;
-  uniform vec3 dir;
+  vec3 ambient;
+  vec3 color;
+  float intensity;
+  vec3 dir;
 };
 uniform LightParams light;
 uniform vec3 material_color;
@@ -64,6 +64,6 @@ in vec2 _vs_out_texcoord;
 in vec3 _vs_out_normal;
 void main()
 {
-       frag_color = vec4(material_color*(light.ambient+light.color*light.intensity*max(dot(light.dir, normalize(_vs_out_normal)), 0.0))*float(texture(occlusion_map, _vs_out_texcoord)), 1.0);
+       frag_color = vec4(material_color*(light.ambient+light.color*light.intensity*max(dot(light.dir, normalize(_vs_out_normal)), 0.0))*float(texture(occlusion_map, _vs_out_texcoord).x), 1.0);
 }
 */