[Piglit] [PATCH 1/4 v3] GS: Test that geometry shader input/output layout qualifiers only compile if valid
Paul Berry
stereotype441 at gmail.com
Tue Oct 22 19:14:24 CEST 2013
On 21 October 2013 09:51, Nicholas Mack <nichmack at gmail.com> wrote:
> v2: Tests check against list of valid layouts instead of invalid layouts
>
> v3: Remove vertex shader info, remove linking, check compile status,
> rewrite error messages
> ---
> tests/all.tests | 12 ++
> .../glsl-1.50/execution/geometry/CMakeLists.gl.txt | 2 +
> .../geometry/gs-input-layout-qualifiers.c | 133
> +++++++++++++++++++++
> .../geometry/gs-output-layout-qualifiers.c | 130
> ++++++++++++++++++++
> 4 files changed, 277 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 c919f19..2485b39 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -1017,6 +1017,18 @@ for prim_type in ['GL_TRIANGLE_STRIP',
> 'GL_TRIANGLE_STRIP_ADJACENCY']:
>
> 'glsl-1.50-geometry-tri-strip-ordering-with-prim-restart {0} {1}'.format(
> prim_type, restart_index))
>
> +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 3e6bc4b..d759c6b 100644
> --- a/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt
> +++ b/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt
> @@ -19,3 +19,5 @@ 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-query-gs-prim-types
> query-gs-prim-types.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..0afc4e8
> --- /dev/null
> +++ b/tests/spec/glsl-1.50/execution/geometry/gs-input-layout-qualifiers.c
> @@ -0,0 +1,133 @@
> +/**
> + * 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 *gstemplate =
> + "#version 150\n"
> + "#define LAYOUT_IN %s\n"
> + "layout(LAYOUT_IN) in;\n"
> + "layout(triangle_strip, max_vertices = 3) out;\n"
> + "void main() {\n"
> + "}\n";
> +
> +static GLuint prog;
>
Since the test isn't trying to link the program anymore, you should be able
to drop this variable entirely (as well as the calls to glCreateProgram()
and glAttachShader() below).
> +
> +char *valids[] = {"points",
> + "lines",
> + "lines_adjacency",
> + "triangles",
> + "triangles_adjacency"};
> +
> +const char *layout;
> +
> +static void
> +print_usage_and_exit(const char *prog_name)
> +{
> + printf("Usage: %s <input_layout>\n"
> + " where <input_layout> is the qualifier to test to see if
> it\n"
> + " is a valid geometry shader input layout qualifier\n",
> + prog_name);
> + piglit_report_result(PIGLIT_FAIL);
> +}
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + GLuint gs = 0;
> + GLint gsCompiled = GL_TRUE;
> + char* gstext = NULL;
> + int i = 0;
> + bool pass = true;
> +
> + /* Parse params */
> + if (argc != 2) {
> + print_usage_and_exit(argv[0]);
> + }
> +
> + layout = argv[1];
> + if (layout == NULL) {
> + printf("%s failed\n", argv[0]);
> + piglit_report_result(PIGLIT_FAIL);
> + }
>
You can drop this if-block. Since you've already checked that argc is 2,
it's impossible for argv[1] to be NULL.
> +
> + prog = glCreateProgram();
>
+ asprintf(&gstext, gstemplate, layout);
> + gs = glCreateShader(GL_GEOMETRY_SHADER);
> + glShaderSource(gs, 1, (const GLchar **) &gstext, NULL);
> + glCompileShader(gs);
> + glAttachShader(prog, gs);
> + free(gstext);
> +
>
+ /* check if the current layout is valid */
> + for(i = 0; i < ARRAY_SIZE(valids); i++) {
> + if(strcmp(layout, valids[i]) == 0) {
> + glGetShaderiv(gs, GL_COMPILE_STATUS,
> + &gsCompiled);
> + if(gsCompiled != GL_TRUE) {
> + printf("Failed to compile.\n");
> + pass = false;
> + }
> +
> + pass = piglit_check_gl_error(GL_NO_ERROR)
> + && pass;
> + piglit_report_result(pass ? PIGLIT_PASS :
> + PIGLIT_FAIL);
> + }
> + }
> +
> + /* if the layout was not valid... */
> + printf("\"%s\" is an invalid input qualifier "
> + "but geometry shader still compiled.\n",
> + layout);
> + piglit_report_result(PIGLIT_FAIL);
>
If the command-line argument doesn't match any of the strings in the
"valids" array, then we can't just fail. We need to verify that a compile
error occurred. I've sent out a suggested fix.
> +}
> +
> +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..232b8f3
> --- /dev/null
> +++ b/tests/spec/glsl-1.50/execution/geometry/gs-output-layout-qualifiers.c
> @@ -0,0 +1,130 @@
> +/**
> + * 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 *gstemplate =
> + "#version 150\n"
> + "#define LAYOUT_OUT %s\n"
> + "layout(points) in;\n"
> + "layout(LAYOUT_OUT, max_vertices = 3) out;\n"
> + "void main() {\n"
> + "}\n";
> +
> +static GLuint prog;
> +
> +char *valids[] = {"points",
> + "line_strip",
> + "triangle_strip"};
> +
> +const char *layout;
> +
> +static void
> +print_usage_and_exit(const char *prog_name)
> +{
> + printf("Usage: %s <output_layout>\n"
> + " where <output_layout> is the qualifier to test to see if
> it\n"
> + " is a valid geometry shader output layout qualifier\n",
> + prog_name);
> + piglit_report_result(PIGLIT_FAIL);
> +}
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + GLuint gs = 0;
> + GLint gsCompiled = GL_TRUE;
> + char* gstext = NULL;
> + int i = 0;
> + bool pass = true;
> +
> + /* Parse params */
> + if (argc != 2) {
> + print_usage_and_exit(argv[0]);
> + }
> +
> + layout = argv[1];
> + if (layout == NULL) {
> + printf("%s failed\n", argv[0]);
> + piglit_report_result(PIGLIT_FAIL);
> + }
> +
> + prog = glCreateProgram();
> + asprintf(&gstext, gstemplate, layout);
> + gs = glCreateShader(GL_GEOMETRY_SHADER);
> + glShaderSource(gs, 1, (const GLchar **) &gstext, NULL);
> + glCompileShader(gs);
> + glAttachShader(prog, gs);
> + free(gstext);
> +
> + /* check if the current layout is valid */
> + for(i = 0; i < ARRAY_SIZE(valids); i++) {
> + if(strcmp(layout, valids[i]) == 0) {
> + glGetShaderiv(gs, GL_COMPILE_STATUS,
> + &gsCompiled);
> + if(gsCompiled != GL_TRUE) {
> + printf("Failed to compile.\n");
> + pass = false;
> + }
> +
> + pass = piglit_check_gl_error(GL_NO_ERROR)
> + && pass;
> + piglit_report_result(pass ? PIGLIT_PASS :
> + PIGLIT_FAIL);
> + }
> + }
> +
> + /* if the layout was not valid... */
> + printf("\"%s\" is an invalid output qualifier "
> + "but geometry shader still compiled.\n",
> + layout);
> + piglit_report_result(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/20131022/38a49002/attachment-0001.html>
More information about the Piglit
mailing list