<div dir="ltr">On 12 September 2013 10:47, Nicholas Mack <<a href="mailto:nichmack@gmail.com" target="_blank">nichmack@gmail.com</a>> wrote: <div class="gmail_extra"><div class="gmail_quote"> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">--- .../execution/vs-gs-arrays-fail.shader_test | 63 ++++++++++++++++ .../vs-gs-arrays-within-blocks-pass.shader_test | 86 ++++++++++++++++++++++ 2 files changed, 149 insertions(+) create mode 100644 tests/spec/glsl-1.50/execution/vs-gs-arrays-fail.shader_test create mode 100644 tests/spec/glsl-1.50/execution/vs-gs-arrays-within-blocks-pass.shader_test diff --git a/tests/spec/glsl-1.50/execution/vs-gs-arrays-fail.shader_test b/tests/spec/glsl-1.50/execution/vs-gs-arrays-fail.shader_test new file mode 100644 index 0000000..877b0a6 --- /dev/null +++ b/tests/spec/glsl-1.50/execution/vs-gs-arrays-fail.shader_test @@ -0,0 +1,63 @@ +# Test that vertex array outputs are not allowed outside of output blocks since +# 2D arrays are not supported. </blockquote><div> </div><div>This comment is a little misleading because vertex array outputs acually *are* allowed. What you're actually testing is that the linker rejects trying to link a vertex array outputs up to a geometry shader array input. I'd recommend saying something like: </div><div>"Test that a vertex shader array output (outside an interface block) can't be linked to a geometry shader array input." </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> +# +# From the GLSL 1.50 specification, section 4.3.4 ("Inputs"): +# +# "If the output of a vertex shader is itself an array to be consumed by a +# geometry shader, then it must appear in an output block (see interface blocks +# below) in the vertex shader and in an input block in the geometry shader with +# a block instance name declared as an array. This is required for arrays +# output from a vertex shader because two-dimensional arrays are not +# supported." + +[require] +GL >= 3.2 +GLSL >= 1.50 + +[vertex shader] + +in vec4 vertex; + +out vec4 pos; +out float a[3]; + +void main() +{ + gl_Position = vertex; + pos = vertex; + for(int i = 0; i < 3; i++) { + a[i] = i+1; + } +} + +[geometry shader] + +layout(triangles) in; +layout(triangle_strip, max_vertices = 3) out; + +in vec4 pos[]; +in float a[3]; + + +void main() +{ +} + +[fragment shader] + +out vec4 color; + +void main() +{ + color = vec4(1.0, 0.0, 0.0, 1.0); +} + +[vertex data] +vertex/float/2 +-1.0 -1.0 + 1.0 -1.0 + 1.0 1.0 +-1.0 1.0 + +[test] +link error diff --git a/tests/spec/glsl-1.50/execution/vs-gs-arrays-within-blocks-pass.shader_test b/tests/spec/glsl-1.50/execution/vs-gs-arrays-within-blocks-pass.shader_test new file mode 100644 index 0000000..52b8b00 --- /dev/null +++ b/tests/spec/glsl-1.50/execution/vs-gs-arrays-within-blocks-pass.shader_test @@ -0,0 +1,86 @@ +# Test that vertex array outputs that are passed to a geometry shader are only +# valid if they are declared within an output block. </blockquote><div> </div><div>I'd drop the word "only" from the test description here, since this partuclar test checks that vertex array outputs work when they are in an interface block; it doesn't check that they don't work when they aren't. </div><div>With those two minor comment changes, this patch is: Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>> </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> +# +# From the GLSL 1.50 specification, section 4.3.4 ("Inputs"): +# +# "If the output of a vertex shader is itself an array to be consumed by a +# geometry shader, then it must appear in an output block (see interface blocks +# below) in the vertex shader and in an input block in the geometry shader with +# a block instance name declared as an array. This is required for arrays +# output from a vertex shader because two-dimensional arrays are not +# supported." + +[require] +GL >= 3.2 +GLSL >= 1.50 + +[vertex shader] + +in vec4 vertex; + +out vec4 pos; +out block { + float a[4]; +}; + +void main() +{ + gl_Position = vertex; + pos = vertex; + for(int i = 0; i < 4; i++) { + a[i] = i+1; + } +} + +[geometry shader] + +layout(triangles) in; +layout(triangle_strip, max_vertices = 3) out; + +in vec4 pos[]; +in block { + float a[4]; +} b[]; + +out float aa[4]; + +void main() +{ + for(int i = 0; i < 3; i++) { + gl_Position = pos[i]; + for(int j = 0; j < 4; j++) { + aa[j] = b[i].a[j]; + } + EmitVertex(); + } +} + +[fragment shader] + +in float aa[4]; + +out vec4 color; + +void main() +{ + bool fail = false; + for(int i = 0; i < 4; i++) { + if(aa[i] != i + 1) fail = true; + } + + if (fail) + color = vec4(1.0, 0.0, 0.0, 1.0); + else + color = vec4(0.0, 1.0, 0.0, 1.0); +} + +[vertex data] +vertex/float/2 +-1.0 -1.0 + 1.0 -1.0 + 1.0 1.0 +-1.0 1.0 + +[test] +draw arrays GL_TRIANGLE_FAN 0 4 +probe all rgba 0.0 1.0 0.0 1.0 -- 1.8.3.1 _______________________________________________ Piglit mailing list <a href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/piglit" target="_blank">http://lists.freedesktop.org/mailman/listinfo/piglit</a> </blockquote></div> </div></div>