X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tests%2Fglsl%2Fconditional_multiple_emitvertex.glsl;h=7a80a72b2fe7c76faa32f9dffcd507cc198449d2;hb=a8472c4fc8bce5db0d50d920f9c4159bda631e30;hp=09bf25d17f49df9ebfa6e6f3dd795329946ab41b;hpb=801c209fa0a2878c0675b7808154de93bc42f5fd;p=libs%2Fgl.git

diff --git a/tests/glsl/conditional_multiple_emitvertex.glsl b/tests/glsl/conditional_multiple_emitvertex.glsl
index 09bf25d1..7a80a72b 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];
@@ -34,7 +34,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;
@@ -43,11 +43,11 @@ void main()
 */
 
 /* Expected output: geometry
-uniform bool flag;
+layout(location=0) uniform bool flag;
 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;
@@ -66,9 +66,9 @@ void main()
 */
 
 /* Expected output: fragment
-uniform sampler2D tex;
+layout(location=1) 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);