<div dir="ltr">On 30 September 2013 15:38, 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:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">v2: Tests check against list of valid layouts instead of invalid layouts </blockquote><div> </div> <div>Last time I reviewed this patch I pointed out that it's not necessary to have vertex and fragment shaders in the test, since the error is supposed to be detected at compile time. It looks like you've removed the fragment shader but not the vertex shader. Can you please also remove the vertex shader (and the linking step)? Other comments below. </div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> --- tests/all.tests | 12 ++ .../glsl-1.50/execution/geometry/CMakeLists.gl.txt | 2 + .../geometry/gs-input-layout-qualifiers.c | 128 +++++++++++++++++++++ .../geometry/gs-output-layout-qualifiers.c | 125 ++++++++++++++++++++ 4 files changed, 267 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 d0085d3..f66d9f9 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -999,6 +999,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 f168f0a..6fc1986 100644 --- a/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt +++ b/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt @@ -18,3 +18,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..82ec9c5 --- /dev/null +++ b/tests/spec/glsl-1.50/execution/geometry/gs-input-layout-qualifiers.c @@ -0,0 +1,128 @@ +/** + * 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" + "void main() {\n" + " gl_Position = 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" + "void main() {\n" + "}\n"; + +static GLuint prog; + +char *valids[] = {"points", + "lines", + "lines_adjacency", + "triangles", + "triangles_adjacency"}; + +const char *layout; + +void +piglit_init(int argc, char **argv) +{ + GLuint vs = 0, gs = 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); + } </blockquote><div> </div><div>The printfs above shouldn't say "...failed"--that makes it sound like a test was run, and the test failed. They should say something like "invalid arguments". Or, even better, make a print_usage_and_exit() function that prints a short description of what would constitute valid arguments (see for example tests/spec/glsl-1.50/execution/geometry/end-primitive.c). </div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> + + prog = glCreateProgram(); + vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vstext); + asprintf(&gstext, gstemplate, layout); + gs = piglit_compile_shader_text(GL_GEOMETRY_SHADER, gstext); </blockquote><div> </div><div>Using piglit_compile_shader_text doesn't work, because piglit_compile_shader_text causes an immediate PIGLIT_FAIL if there is a compilation error (see tests/util/piglit-shader.c). Since a compilation error sometimes means that the test passes, we can't do this. I would recommend just calling glCreateShader(), glShaderSource(), and glCompileShader() directly. </div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> + glAttachShader(prog, vs); + glAttachShader(prog, gs); + free(gstext); + + glLinkProgram(prog); + if(!piglit_link_check_status(prog)){ + glDeleteProgram(prog); + piglit_report_result(PIGLIT_FAIL); + } + else { + for(i = 0; i < ARRAY_SIZE(valids); i++) { + if(strcmp(layout, valids[i]) == 0) { + pass = piglit_check_gl_error(GL_NO_ERROR) + && pass; + piglit_report_result(pass ? PIGLIT_PASS : + PIGLIT_FAIL); </blockquote><div> </div><div>It's not sufficient to check for a GL error, because a compile error doesn't lead to a GL error. You need to check for a compilation error using glGetShaderiv(..., GL_COMPILE_STATUS, ...). </div><div>Similar comments apply to the other file in this patch. </div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> + } + } + + printf("\"%s\" is an invalid input qualifier " + "but geometry shader still compiled.\n", + layout); + piglit_report_result(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..6ae5968 --- /dev/null +++ b/tests/spec/glsl-1.50/execution/geometry/gs-output-layout-qualifiers.c @@ -0,0 +1,125 @@ +/** + * 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" + "void main() {\n" + " gl_Position = vertex;\n" + "}\n"; + +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; + +void +piglit_init(int argc, char **argv) +{ + GLuint vs = 0, gs = 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); + glAttachShader(prog, vs); + glAttachShader(prog, gs); + free(gstext); + + glLinkProgram(prog); + if(!piglit_link_check_status(prog)){ + glDeleteProgram(prog); + piglit_report_result(PIGLIT_FAIL); + } + else { + for(i = 0; i < ARRAY_SIZE(valids); i++) { + if(strcmp(layout, valids[i]) == 0) { + pass = piglit_check_gl_error(GL_NO_ERROR) + && pass; + piglit_report_result(pass ? PIGLIT_PASS : + PIGLIT_FAIL); + } + } + + 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 <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>