[Piglit] [PATCH 1/4] GS: Test that geometry shader input/output layout qualifiers only compile if valid
Paul Berry
stereotype441 at gmail.com
Mon Sep 30 13:41:13 PDT 2013
Sorry for the slow responses, Nick. I got behind in patch review in the
last two weeks and I'm only just now catching up.
On 16 September 2013 09:35, Nicholas Mack <nichmack at gmail.com> wrote:
> ---
> tests/all.tests | 12 ++
> .../glsl-1.50/execution/geometry/CMakeLists.gl.txt | 2 +
> .../geometry/gs-input-layout-qualifiers.c | 137
> ++++++++++++++++++++
> .../geometry/gs-output-layout-qualifiers.c | 139
> +++++++++++++++++++++
> 4 files changed, 290 insertions(+)
> create mode 100644
> tests/spec/glsl-1.50/execution/geometry/gs-input-layout-qualifiers.c
> create mode 100644
> tests/spec/glsl-1.50/execution/geometry/gs-output-layout-qualifiers.c
>
> diff --git a/tests/all.tests b/tests/all.tests
> index dc36841..9db40af 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -981,6 +981,18 @@ for layout_type in ['points', 'lines',
> 'lines_adjacency', 'triangles',
> 'glsl-1.50-gs-mismatch-prim-type {0}'.format(
> layout_type))
>
> +for input_layout in ['points', 'lines', 'lines_adjacency', 'triangles',
> + 'triangles_adjacency', 'line_strip',
> 'triangle_strip']:
> + add_concurrent_test(spec['glsl-1.50'],
> + 'glsl-1.50-gs-input-layout-qualifiers {0}'.format(
> + input_layout))
> +
> +for output_layout in ['points', 'lines', 'lines_adjacency', 'triangles',
> + 'triangles_adjacency', 'line_strip',
> 'triangle_strip']:
> + add_concurrent_test(spec['glsl-1.50'],
> + 'glsl-1.50-gs-output-layout-qualifiers
> {0}'.format(
> + output_layout))
> +
> spec['glsl-3.30'] = Group()
> import_glsl_parser_tests(spec['glsl-3.30'],
> os.path.join(testsDir, 'spec', 'glsl-3.30'),
> diff --git a/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt
> b/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt
> index f01dc1c..012663d 100644
> --- a/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt
> +++ b/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt
> @@ -16,3 +16,5 @@ piglit_add_executable
> (glsl-1.50-geometry-primitive-types primitive-types.c)
> piglit_add_executable (glsl-1.50-gs-emits-too-few-verts
> gs-emits-too-few-verts.c)
> piglit_add_executable (glsl-1.50-getshaderiv-may-return-GS
> getshaderiv-may-return-GS.c)
> piglit_add_executable (glsl-1.50-gs-mismatch-prim-type
> gs-mismatch-prim-type.c)
> +piglit_add_executable (glsl-1.50-gs-input-layout-qualifiers
> gs-input-layout-qualifiers.c)
> +piglit_add_executable (glsl-1.50-gs-output-layout-qualifiers
> gs-output-layout-qualifiers.c)
> diff --git
> a/tests/spec/glsl-1.50/execution/geometry/gs-input-layout-qualifiers.c
> b/tests/spec/glsl-1.50/execution/geometry/gs-input-layout-qualifiers.c
> new file mode 100644
> index 0000000..ff95f00
> --- /dev/null
> +++ b/tests/spec/glsl-1.50/execution/geometry/gs-input-layout-qualifiers.c
> @@ -0,0 +1,137 @@
> +/**
> + * Copyright © 2013 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the
> "Software"),
> + * to deal in the Software without restriction, including without
> limitation
> + * the rights to use, copy, modify, merge, publish, distribute,
> sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the
> next
> + * paragraph) shall be included in all copies or substantial portions of
> the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
> SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
> OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> DEALINGS
> + * IN THE SOFTWARE.
> + */
> +
> +/**
> + * Test that geometry shaders only compile with valid input layout
> qualifiers
> + *
> + * Section 4.3.8.1(Input Layout Qualifiers) of the GLSL 1.50 spec says:
> + * "Geometry shaders allow input layout qualifiers only on the interface
> + * qualifier in, not on an input block, block member, or variable. The
> layout
> + * qualifier identifiers for geometry shader inputs are
> + * points
> + * lines
> + * lines_adjacency
> + * triangles
> + * triangles_adjacency"
> + */
> +
> +#include "piglit-util-gl-common.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> + config.supports_gl_compat_version = 32;
> + config.supports_gl_core_version = 32;
> +
> + config.window_visual = PIGLIT_GL_VISUAL_RGB |
> PIGLIT_GL_VISUAL_DOUBLE;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +static const char *vstext =
> + "#version 150\n"
> + "in vec4 vertex;\n"
> + "out vec4 pos;\n"
> + "void main() {\n"
> + " pos = vertex;\n"
> + "}\n";
> +
> +static const char *gstemplate =
> + "#version 150\n"
> + "#define LAYOUT_IN %s\n"
> + "layout(LAYOUT_IN) in;\n"
> + "layout(triangle_strip, max_vertices = 3) out;\n"
> + "in vec4 pos[];\n"
> + "void main() {\n"
> + " for(int i = 0; i < pos.length(); i++) {\n"
> + " gl_Position = pos[i];\n"
> + " EmitVertex();\n"
> + " }\n"
> + "}\n";
> +static const char *fstext =
> + "#version 150\n"
> + "out vec4 color;\n"
> + "void main() {\n"
> + " color = vec4(1.);\n"
> + "}\n";
>
The implementation should check at compile time whether the given layout
qualifier is valid, so I don't think it's necessary to include vertex and
fragment shaders. It should be enough to just compile a geometry shader
and see if it succeeds. Also I don't think it's necessary for it to be a
"realistic" geometry shader--you can just make the main function empty.
> +
> +static GLuint prog;
> +
> +char *invalids[] = {"line_strip",
> + "triangle_strip"};
>
+
> +const char *layout;
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + GLuint vs = 0, gs = 0, fs = 0;
> + char* gstext = NULL;
> + int i = 0;
> + bool pass = true;
> +
> + /* Parse params */
> + if (argc != 2) {
> + printf("%s failed\n", argv[0]);
> + piglit_report_result(PIGLIT_FAIL);
> + }
> +
> + layout = argv[1];
> + if (layout == NULL) {
> + printf("%s failed\n", argv[0]);
> + piglit_report_result(PIGLIT_FAIL);
> + }
> +
> + prog = glCreateProgram();
> + vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vstext);
> + asprintf(&gstext, gstemplate, layout);
> + gs = piglit_compile_shader_text(GL_GEOMETRY_SHADER, gstext);
> + fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fstext);
> + glAttachShader(prog, vs);
> + glAttachShader(prog, gs);
> + glAttachShader(prog, fs);
> + free(gstext);
> +
> + glLinkProgram(prog);
> + if(!piglit_link_check_status(prog)){
> + glDeleteProgram(prog);
> + piglit_report_result(PIGLIT_FAIL);
> + }
> + else {
> + for(i = 0; i < ARRAY_SIZE(invalids); i++) {
> + if(strcmp(layout, invalids[i]) == 0) {
>
I'm a little bothered by this logic, since it relies for correctness on the
fact that all.tests only ever executes it with points, lines, line_strip,
lines_adjacency, triangles, triangle_strip, or triangles_adjaency. If
someone ever tried to run the test with an argument of
"triangle_ham_sandwich", it would assume that it was valid (because it's
not in the "invalids" array), and do the wrong test.
Can we replace the "invalids" array with a "valids" array, and invert the
logic?
> + printf("\"%s\" is an invalid input
> qualifier "
> + "but geometry shader still
> compiled.\n",
> + layout);
> + piglit_report_result(PIGLIT_FAIL);
> + }
> + }
> + }
> +
> + pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + return PIGLIT_FAIL;
> +}
> diff --git
> a/tests/spec/glsl-1.50/execution/geometry/gs-output-layout-qualifiers.c
> b/tests/spec/glsl-1.50/execution/geometry/gs-output-layout-qualifiers.c
> new file mode 100644
> index 0000000..ba4f67c
> --- /dev/null
> +++ b/tests/spec/glsl-1.50/execution/geometry/gs-output-layout-qualifiers.c
>
Similar comments apply to gs-output-layout-qualifiers.c as well.
> @@ -0,0 +1,139 @@
> +/**
> + * Copyright © 2013 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the
> "Software"),
> + * to deal in the Software without restriction, including without
> limitation
> + * the rights to use, copy, modify, merge, publish, distribute,
> sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the
> next
> + * paragraph) shall be included in all copies or substantial portions of
> the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
> SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
> OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> DEALINGS
> + * IN THE SOFTWARE.
> + */
> +
> +/**
> + * Test that geometry shaders only compile with valid output layout
> qualifiers
> + *
> + * Section 4.3.8.2(Output Layout Qualifiers) of the GLSL 1.50 spec says:
> + * "Geometry shaders can have output layout qualifiers only on the
> interface
> + * qualifier out, not on an output block or variable declaration. The
> layout
> + * qualifier identifiers for geometry shader outputs are
> + * points
> + * line_strip
> + * triangle_strip
> + * max_vertices = integer-constant"
> + */
> +
> +#include "piglit-util-gl-common.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> + config.supports_gl_compat_version = 32;
> + config.supports_gl_core_version = 32;
> +
> + config.window_visual = PIGLIT_GL_VISUAL_RGB |
> PIGLIT_GL_VISUAL_DOUBLE;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +static const char *vstext =
> + "#version 150\n"
> + "in vec4 vertex;\n"
> + "out vec4 pos;\n"
> + "void main() {\n"
> + " pos = vertex;\n"
> + "}\n";
> +
> +static const char *gstemplate =
> + "#version 150\n"
> + "#define LAYOUT_OUT %s\n"
> + "layout(triangles) in;\n"
> + "layout(LAYOUT_OUT, max_vertices = 3) out;\n"
> + "in vec4 pos[];\n"
> + "void main() {\n"
> + " for(int i = 0; i < pos.length(); i++) {\n"
> + " gl_Position = pos[i];\n"
> + " EmitVertex();\n"
> + " }\n"
> + "}\n";
> +
> +static const char *fstext =
> + "#version 150\n"
> + "out vec4 color;\n"
> + "void main() {\n"
> + " color = vec4(1.);\n"
> + "}\n";
> +
> +static GLuint prog;
> +
> +char *invalids[] = {"lines",
> + "lines_adjacency",
> + "triangles",
> + "triangles_adjacency"};
> +
> +const char *layout;
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + GLuint vs = 0, gs = 0, fs = 0;
> + char* gstext = NULL;
> + int i = 0;
> + bool pass = true;
> +
> + /* Parse params */
> + if (argc != 2) {
> + printf("%s failed\n", argv[0]);
> + piglit_report_result(PIGLIT_FAIL);
> + }
> +
> + layout = argv[1];
> + if (layout == NULL) {
> + printf("%s failed\n", argv[0]);
> + piglit_report_result(PIGLIT_FAIL);
> + }
> +
> + prog = glCreateProgram();
> + vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vstext);
> + asprintf(&gstext, gstemplate, layout);
> + gs = piglit_compile_shader_text(GL_GEOMETRY_SHADER, gstext);
> + fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fstext);
> + glAttachShader(prog, vs);
> + glAttachShader(prog, gs);
> + glAttachShader(prog, fs);
> + free(gstext);
> +
> + glLinkProgram(prog);
> + if(!piglit_link_check_status(prog)){
> + glDeleteProgram(prog);
> + piglit_report_result(PIGLIT_FAIL);
> + }
> + else {
> + for(i = 0; i < ARRAY_SIZE(invalids); i++) {
> + if(strcmp(layout, invalids[i]) == 0) {
> + printf("\"%s\" is an invalid output
> qualifier "
> + "but geometry shader still
> compiled.\n",
> + layout);
> + piglit_report_result(PIGLIT_FAIL);
> + }
> + }
> + }
> +
> + pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + return PIGLIT_FAIL;
> +}
> --
> 1.8.3.1
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20130930/ec22f4dc/attachment-0001.html>
More information about the Piglit
mailing list