<div dir="ltr">On 9 September 2013 16:28, 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">--- tests/all.tests | 1 + .../glsl-1.50/execution/geometry/CMakeLists.gl.txt | 1 + .../execution/geometry/getshaderiv-may-return-GS.c | 115 +++++++++++++++++++++ 3 files changed, 117 insertions(+) create mode 100644 tests/spec/glsl-1.50/execution/geometry/getshaderiv-may-return-GS.c diff --git a/tests/all.tests b/tests/all.tests index be3340c..6e963ca 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -948,6 +948,7 @@ for draw in ['', 'indexed']: 'core {0} {1}').format(draw, prim)) spec['glsl-1.50']['built-in constants'] = concurrent_test('built-in-constants tests/spec/glsl-1.50/minimum-maximums.txt') spec['glsl-1.50']['gs-emits-too-few-verts'] = concurrent_test('gs-emits-too-few-verts') +spec['glsl-1.50']['getshaderiv-may-return-GS'] = concurrent_test('glsl-1.50-getshaderiv-may-return-GS') spec['glsl-3.30'] = Group() spec['glsl-3.30']['built-in constants'] = concurrent_test('built-in-constants tests/spec/glsl-3.30/minimum-maximums.txt') 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 865595a..a906c36 100644 --- a/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt +++ b/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt @@ -13,4 +13,5 @@ ${OPENGL_glu_LIBRARY} piglit_add_executable (glsl-1.50-geometry-end-primitive end-primitive.c) piglit_add_executable (glsl-1.50-geometry-primitive-id-restart primitive-id-restart.c) piglit_add_executable (glsl-1.50-geometry-primitive-types primitive-types.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) diff --git a/tests/spec/glsl-1.50/execution/geometry/getshaderiv-may-return-GS.c b/tests/spec/glsl-1.50/execution/geometry/getshaderiv-may-return-GS.c new file mode 100644 index 0000000..91cb292 --- /dev/null +++ b/tests/spec/glsl-1.50/execution/geometry/getshaderiv-may-return-GS.c @@ -0,0 +1,115 @@ +/** + * 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 GetShaderiv() may now return GEOMETRY_SHADER if passed SHADER_TYPE + * + * From the GLSL 3.2 spec, section 6.1.10(Shader and Program Queries): + * "The command + * void GetShaderiv( uint shader, enum pname, int *params ); + * returns properties of the shader object named shader in params. The + * parameter value to return is specified by pname. + * If pname is SHADER_TYPE, VERTEX_SHADER, GEOMETRY_SHADER, or + * FRAGMENT_SHADER is returned if shader is a vertex, geometry, or fragment + * shader object respectively." + */ + +#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 piglit_vertex;\n" + "out vec4 pos;\n" + "void main() {\n" + " gl_Position = piglit_vertex;\n" + " pos = piglit_vertex;\n" + "}\n"; + +static const char *gstext = + "#version 150\n" + "layout(triangles) in;\n" + "layout(triangle_strip, max_vertices = 3) out;\n" + "in vec4 pos[];\n" + "void main() {\n" + " for(int i = 0; i < 3; 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; + +void +piglit_init(int argc, char **argv) +{ + bool pass = true; + GLuint vs = 0, gs = 0, fs = 0; + GLint type; + </blockquote><div> </div><div>Almost everything from here... </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); + 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); + + glLinkProgram(prog); + if(!piglit_link_check_status(prog)){ + glDeleteProgram(prog); + piglit_report_result(PIGLIT_FAIL); + } </blockquote><div> </div><div>...to here is tangential to the test, since the test only needs to validate the behaviour of gs, not the entire program. I'd cut it down to just: gs = piglit_compile_shader_text(GL_GEOMETRY_SHADER, gstext); </div><div>Then you should be able to drop the vstext and fstext globals. 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:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> + + glGetShaderiv(gs, GL_SHADER_TYPE, &type); + if(type != GL_GEOMETRY_SHADER) { + printf("Expected shader type GL_GEOMETRY_SHADER" + " but received: %s\n", + piglit_get_gl_enum_name(type)); + pass = false; + } + 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 <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>