From 4942472d6429a52ac1f03fbaffd57d011624c54a Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Thu, 18 Mar 2021 13:27:55 +0200 Subject: [PATCH] Fix test case errors revealed by the previous commit And one case of adjusted error message too. --- tests/glsl/block_name_conflict.glsl | 2 +- tests/glsl/conditional_multiple_emitvertex.glsl | 4 ++-- tests/glsl/geometry_interface_block.glsl | 4 ++-- tests/glsl/geometry_passthrough.glsl | 4 ++-- .../ignore_array_in_geometry_passthrough.glsl | 4 ++-- tests/glsl/multiple_emitvertex.glsl | 4 ++-- tests/glsl/parentheses.glsl | 16 ++++++++-------- tests/glsl/redundant_geometry_gl_position.glsl | 4 ++-- tests/glsl/struct_member_initializer.glsl | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tests/glsl/block_name_conflict.glsl b/tests/glsl/block_name_conflict.glsl index fb69e8bb..36de91da 100644 --- 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 09bf25d1..375a4366 100644 --- 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 3934dd13..9f3fae5b 100644 --- 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 20043589..9acfe83e 100644 --- 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 2b3eea26..62e4d793 100644 --- 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 06c129d8..c0ef8699 100644 --- 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 32651ac9..1dec4296 100644 --- 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 99d4330f..f8a0e51b 100644 --- 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 8be2e092..97e2786a 100644 --- a/tests/glsl/struct_member_initializer.glsl +++ b/tests/glsl/struct_member_initializer.glsl @@ -8,5 +8,5 @@ struct Material void main() { } /* Expected error: -:4: Struct members can't have initializers +:4: Initializer not allowed on struct member */ -- 2.43.0