Fix test case errors revealed by the previous commit

And one case of adjusted error message too.

diff --git a/tests/glsl/block_name_conflict.glsl b/tests/glsl/block_name_conflict.glsl
index fb69e8bbacca680f6ea6a568296b91fd2c76eee0..36de91da7a8992125faf7867abcc7bc5a6d20c29 100644 (file)
--- a/tests/glsl/block_name_conflict.glsl
+++ b/tests/glsl/block_name_conflict.glsl
@@ -14,7 +14,7 @@ void main()
 
 #pragma MSP stage(geometry)
 layout(triangles) in;
-layout(triangles, max_vertices=3) out;
+layout(triangle_strip, max_vertices=3) out;
 in Output
 {
        vec2 texcoord;

diff --git a/tests/glsl/conditional_multiple_emitvertex.glsl b/tests/glsl/conditional_multiple_emitvertex.glsl
index 09bf25d17f49df9ebfa6e6f3dd795329946ab41b..375a436650c8d4fdea8bdc08bb490d562fb7b016 100644 (file)
--- a/tests/glsl/conditional_multiple_emitvertex.glsl
+++ b/tests/glsl/conditional_multiple_emitvertex.glsl
@@ -11,7 +11,7 @@ void main()
 
 #pragma MSP stage(geometry)
 layout(triangles) in;
-layout(triangles, max_vertices=3) out;
+layout(triangle_strip, max_vertices=3) out;
 void main()
 {
        passthrough[0];
@@ -45,7 +45,7 @@ void main()
 /* Expected output: geometry
 uniform bool flag;
 layout(triangles) in;
-layout(triangles, max_vertices=3) out;
+layout(triangle_strip, max_vertices=3) out;
 in vec2 texcoord[];
 out vec2 _gs_out_texcoord;
 void main()

diff --git a/tests/glsl/geometry_interface_block.glsl b/tests/glsl/geometry_interface_block.glsl
index 3934dd13908e2d4af070ea12960c9b3ec3f14540..9f3fae5bed1a88d8204df98b60c93227ec251344 100644 (file)
--- a/tests/glsl/geometry_interface_block.glsl
+++ b/tests/glsl/geometry_interface_block.glsl
@@ -14,7 +14,7 @@ void main()
 
 #pragma MSP stage(geometry)
 layout(triangles) in;
-layout(triangles, max_vertices=3) out;
+layout(triangle_strip, max_vertices=3) out;
 out GeometryOut
 {
        vec2 texcoord;
@@ -51,7 +51,7 @@ void main()
 
 /* Expected output: geometry
 layout(triangles) in;
-layout(triangles, max_vertices=3) out;
+layout(triangle_strip, max_vertices=3) out;
 out GeometryOut
 {
        vec2 texcoord;

diff --git a/tests/glsl/geometry_passthrough.glsl b/tests/glsl/geometry_passthrough.glsl
index 200435895812d1248c2677f462eb60f459147c8f..9acfe83ef0303eb7c30869e1ab118e5611422661 100644 (file)
--- a/tests/glsl/geometry_passthrough.glsl
+++ b/tests/glsl/geometry_passthrough.glsl
@@ -10,7 +10,7 @@ void main()
 
 #pragma MSP stage(geometry)
 layout(triangles) in;
-layout(triangles, max_vertices=3) out;
+layout(triangle_strip, max_vertices=3) out;
 void main()
 {
        for(int i=0; i<3; ++i)
@@ -39,7 +39,7 @@ void main()
 
 /* Expected output: geometry
 layout(triangles) in;
-layout(triangles, max_vertices=3) out;
+layout(triangle_strip, max_vertices=3) out;
 in vec2 texcoord[];
 out vec2 _gs_out_texcoord;
 void main()

diff --git a/tests/glsl/ignore_array_in_geometry_passthrough.glsl b/tests/glsl/ignore_array_in_geometry_passthrough.glsl
index 2b3eea26fac33ce14d14dd8e0ec69283b8da9dad..62e4d7932bd6cbd78c730c9d6f1e416997faa5db 100644 (file)
--- a/tests/glsl/ignore_array_in_geometry_passthrough.glsl
+++ b/tests/glsl/ignore_array_in_geometry_passthrough.glsl
@@ -14,7 +14,7 @@ void main()
 
 #pragma MSP stage(geometry)
 layout(triangles) in;
-layout(triangles, max_vertices=3) out;
+layout(triangle_strip, max_vertices=3) out;
 void main()
 {
        for(int i=0; i<3; ++i)
@@ -46,7 +46,7 @@ void main()
 
 /* Expected output: geometry
 layout(triangles) in;
-layout(triangles, max_vertices=3) out;
+layout(triangle_strip, max_vertices=3) out;
 in vec2 _vs_out_texcoord[];
 out vec2 _gs_out_texcoord;
 void main()

diff --git a/tests/glsl/multiple_emitvertex.glsl b/tests/glsl/multiple_emitvertex.glsl
index 06c129d8892cda983b86577a25b59c4e5acf9a51..c0ef869972ed43aa5abeae6147392c10892c72d1 100644 (file)
--- a/tests/glsl/multiple_emitvertex.glsl
+++ b/tests/glsl/multiple_emitvertex.glsl
@@ -10,7 +10,7 @@ void main()
 
 #pragma MSP stage(geometry)
 layout(triangles) in;
-layout(triangles, max_vertices=3) out;
+layout(triangle_strip, max_vertices=3) out;
 void main()
 {
        passthrough[0];
@@ -40,7 +40,7 @@ void main()
 
 /* Expected output: geometry
 layout(triangles) in;
-layout(triangles, max_vertices=3) out;
+layout(triangle_strip, max_vertices=3) out;
 in vec2 texcoord[];
 out vec2 _gs_out_texcoord;
 void main()

diff --git a/tests/glsl/parentheses.glsl b/tests/glsl/parentheses.glsl
index 32651ac97fd60bcd989754431e980aa5c9a6ee11..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;

diff --git a/tests/glsl/redundant_geometry_gl_position.glsl b/tests/glsl/redundant_geometry_gl_position.glsl
index 99d4330faf883681e2e5c3a428d37ebe37129d8e..f8a0e51ba2cebdd42c84f9b7cb1d211052f41cdc 100644 (file)
--- a/tests/glsl/redundant_geometry_gl_position.glsl
+++ b/tests/glsl/redundant_geometry_gl_position.glsl
@@ -8,7 +8,7 @@ void main()
 
 #pragma MSP stage(geometry)
 layout(triangles) in;
-layout(triangles, max_vertices=3) out;
+layout(triangle_strip, max_vertices=3) out;
 void main()
 {
        for(int i=0; i<3; ++i)
@@ -29,7 +29,7 @@ void main()
 
 /* Expected output: geometry
 layout(triangles) in;
-layout(triangles, max_vertices=3) out;
+layout(triangle_strip, max_vertices=3) out;
 void main()
 {
        for(int i = 0; i<3; ++i)

diff --git a/tests/glsl/struct_member_initializer.glsl b/tests/glsl/struct_member_initializer.glsl
index 8be2e09240be328623f0ef351a26225dbc39b881..97e2786acb2af595764bfa9fd0c3961a5e01e4f9 100644 (file)
--- a/tests/glsl/struct_member_initializer.glsl
+++ b/tests/glsl/struct_member_initializer.glsl
@@ -8,5 +8,5 @@ struct Material
 void main() { }
 
 /* Expected error:
-<test>:4: Struct members can't have initializers
+<test>:4: Initializer not allowed on struct member
 */