X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tests%2Fglsl%2Fignore_array_in_geometry_passthrough.glsl;h=56fe0dfab4dbe8d5a179f5516beac14e7d3f6369;hb=6377f8efc81ffe84b7ffe44380f1caa2059f437f;hp=2b3eea26fac33ce14d14dd8e0ec69283b8da9dad;hpb=16c02e4dc3c9a10df15d4ddca2afd29cf3be8d73;p=libs%2Fgl.git diff --git a/tests/glsl/ignore_array_in_geometry_passthrough.glsl b/tests/glsl/ignore_array_in_geometry_passthrough.glsl index 2b3eea26..56fe0dfa 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) @@ -32,11 +32,11 @@ void main() } /* Expected output: vertex -uniform mat4 vp_matrix; +layout(location=0) uniform mat4 vp_matrix; layout(location=0) in vec4 position; layout(location=1) in vec2 texcoord; layout(location=2) in vec4 instance_transform[3]; -out vec2 _vs_out_texcoord; +layout(location=0) out vec2 _vs_out_texcoord; void main() { _vs_out_texcoord = texcoord; @@ -46,9 +46,9 @@ void main() /* Expected output: geometry layout(triangles) in; -layout(triangles, max_vertices=3) out; -in vec2 _vs_out_texcoord[]; -out vec2 _gs_out_texcoord; +layout(triangle_strip, max_vertices=3) out; +layout(location=0) in vec2 _vs_out_texcoord[]; +layout(location=0) out vec2 _gs_out_texcoord; void main() { for(int i = 0; i<3; ++i) @@ -61,9 +61,9 @@ void main() */ /* Expected output: fragment -uniform sampler2D tex; +layout(location=4, 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);