<div dir="ltr">On 23 August 2013 15:13, 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"> --- ...ax-vertices-multiple-shader-objects.shader_test | 64 ++++++++++++++++++++++ ...output-type-multiple-shader-objects.shader_test | 64 ++++++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 tests/spec/glsl-1.50/linker/gs-same-max-vertices-multiple-shader-objects.shader_test create mode 100644 tests/spec/glsl-1.50/linker/gs-same-output-type-multiple-shader-objects.shader_test diff --git a/tests/spec/glsl-1.50/linker/gs-same-max-vertices-multiple-shader-objects.shader_test b/tests/spec/glsl-1.50/linker/gs-same-max-vertices-multiple-shader-objects.shader_test new file mode 100644 index 0000000..414629f --- /dev/null +++ b/tests/spec/glsl-1.50/linker/gs-same-max-vertices-multiple-shader-objects.shader_test </blockquote><div> </div><div>The name is a little surprising since the test exercises two shaders that have *different* values of max_vertices. I'd rename it to "gs-different-max-vertices-multiple-shader-objects.shader_test". </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> @@ -0,0 +1,64 @@ +# Section 2.11.2 (Program Objects) of the GLSL 1.50 spec says: +# +# "Linking will also fail if the program object contains objects to form a +# geometry shader (see section 2.12), and +# • the program contains no objects to form a vertex shader; +# • the input primitive type, output primitive type, or maximum output +# vertex count is not specified in any compiled geometry shader object; +# • the input primitive type, output primitive type, or maximum output +# vertex count is specified differently in multiple geometry shader +# objects." + +[require] +GLSL >= 1.50 + +[vertex shader] +#version 150 + +in vec4 vertex; +out vec4 vertex_to_gs; + +void main() +{ + vertex_to_gs = vertex; +} + +[geometry shader] +#version 150 + +layout(triangles) in; +layout(triangle_strip, max_vertices = 3) out; + +void do_vertex(int i); + +void main() +{ + for (int i = 0; i < 2; i++) + do_vertex(i); +} + +[geometry shader] +#version 150 + +layout(max_vertices = 2) out; + +in vec4 vertex_to_gs[2]; </blockquote><div> </div><div>This needs to be "in vec4 vertex_to_gs[3];", otherwise the link will fail for a reason unrelated to what you are trying to test. </div><div> </div> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> + +void do_vertex(int i) +{ + gl_Position = vertex_to_gs[i]; + EmitVertex(); +} + +[fragment shader] +#version 150 + +out vec4 color; + +void main() +{ + color = vec4(0.0, 1.0, 0.0, 1.0); +} + +[test] +link error diff --git a/tests/spec/glsl-1.50/linker/gs-same-output-type-multiple-shader-objects.shader_test b/tests/spec/glsl-1.50/linker/gs-same-output-type-multiple-shader-objects.shader_test </blockquote><div> </div><div>Similar comment on the name of tihs test. </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> new file mode 100644 index 0000000..4a35770 --- /dev/null +++ b/tests/spec/glsl-1.50/linker/gs-same-output-type-multiple-shader-objects.shader_test @@ -0,0 +1,64 @@ +# Section 2.11.2 (Program Objects) of the GLSL 1.50 spec says: +# +# "Linking will also fail if the program object contains objects to form a +# geometry shader (see section 2.12), and +# • the program contains no objects to form a vertex shader; +# • the input primitive type, output primitive type, or maximum output +# vertex count is not specified in any compiled geometry shader object; +# • the input primitive type, output primitive type, or maximum output +# vertex count is specified differently in multiple geometry shader +# objects." + +[require] +GLSL >= 1.50 + +[vertex shader] +#version 150 + +in vec4 vertex; +out vec4 vertex_to_gs; + +void main() +{ + vertex_to_gs = vertex; +} + +[geometry shader] +#version 150 + +layout(triangles) in; +layout(triangle_strip, max_vertices = 3) out; + +void do_vertex(int i); + +void main() +{ + for (int i = 0; i < 2; i++) + do_vertex(i); +} + +[geometry shader] +#version 150 + +layout(points) out; + +in vec4 vertex_to_gs[1]; </blockquote><div> </div><div>As with the other test, this needs to be "in vec4 vertex_to_gs[3];". </div><div>With those 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"> + +void do_vertex(int i) +{ + gl_Position = vertex_to_gs[i]; + EmitVertex(); +} + +[fragment shader] +#version 150 + +out vec4 color; + +void main() +{ + color = vec4(0.0, 1.0, 0.0, 1.0); +} + +[test] +link error -- 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>