An assortment of minor fixes

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

diff --git a/tests/glsl/ignore_array_in_geometry_passthrough.glsl b/tests/glsl/ignore_array_in_geometry_passthrough.glsl
index 598a177c28cf066b9a537af5dc80821d97934a02..b616096827cc0f452332aef3bf2b75f31bd37fd9 100644 (file)
--- a/tests/glsl/ignore_array_in_geometry_passthrough.glsl
+++ b/tests/glsl/ignore_array_in_geometry_passthrough.glsl
@@ -1,4 +1,7 @@
-uniform mat4 vp_matrix;
+layout(push_constant) uniform Transform
+{
+       mat4 vp_matrix;
+};
 uniform sampler2D tex;
 
 #pragma MSP stage(vertex)
@@ -31,23 +34,28 @@ void main()
        frag_color = texture(tex, texcoord);
 }
 
+// Target API: Vulkan
+
 /* Expected output: vertex
-layout(location=0) uniform mat4 vp_matrix;
+layout(push_constant) uniform Transform
+{
+       mat4 vp_matrix;
+};
 layout(location=0) in vec4 position;
 layout(location=1) in vec2 texcoord;
 layout(location=2) in vec4 instance_transform[3];
 layout(location=0) out vec2 _vs_out_texcoord;
 void main()
 {
-  _vs_out_texcoord = texcoord;
-  gl_Position = vp_matrix*transpose(mat4(instance_transform[0], instance_transform[1], instance_transform[2], vec4(0.0, 0.0, 0.0, 1.0)))*position;
+       _vs_out_texcoord = texcoord;
+       gl_Position = vp_matrix*transpose(mat4(instance_transform[0], instance_transform[1], instance_transform[2], vec4(0.0, 0.0, 0.0, 1.0)))*position;
 }
 */
 
 /* Expected output: geometry
 layout(triangles) in;
 layout(triangle_strip, max_vertices=3) out;
-layout(location=0) in vec2 _vs_out_texcoord[];
+layout(location=0) in vec2 _vs_out_texcoord[3];
 layout(location=0) out vec2 _gs_out_texcoord;
 void main()
 {
@@ -61,7 +69,7 @@ void main()
 */
 
 /* Expected output: fragment
-layout(location=4) uniform sampler2D tex;
+layout(set=0, binding=71) uniform sampler2D tex;
 layout(location=0) out vec4 frag_color;
 layout(location=0) in vec2 _gs_out_texcoord;
 void main()