Assign bindings to all uniform blocks and sampler uniforms

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

diff --git a/tests/glsl/multiple_emitvertex.glsl b/tests/glsl/multiple_emitvertex.glsl
index 06c129d8892cda983b86577a25b59c4e5acf9a51..227f1e093359a4492faadef39e0b0d7108d19a49 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];
@@ -30,7 +30,7 @@ void main()
 
 /* Expected output: vertex
 layout(location=0) in vec4 position;
-out vec2 texcoord;
+layout(location=0) out vec2 texcoord;
 void main()
 {
        texcoord = position.xy*0.5+0.5;
@@ -40,9 +40,9 @@ void main()
 
 /* Expected output: geometry
 layout(triangles) in;
-layout(triangles, max_vertices=3) out;
-in vec2 texcoord[];
-out vec2 _gs_out_texcoord;
+layout(triangle_strip, max_vertices=3) out;
+layout(location=0) in vec2 texcoord[];
+layout(location=0) out vec2 _gs_out_texcoord;
 void main()
 {
        gl_Position = gl_in[0].gl_Position;
@@ -58,9 +58,9 @@ void main()
 */
 
 /* Expected output: fragment
-uniform sampler2D tex;
+layout(location=0, binding=71) uniform sampler2D tex;
 layout(location=0) out vec4 frag_color;
-in vec2 _gs_out_texcoord;
+layout(location=0) in vec2 _gs_out_texcoord;
 void main()
 {
        frag_color = texture(tex, _gs_out_texcoord);