On 4 November 2011 16:34, Ian Romanick <<a href="mailto:idr@freedesktop.org">idr@freedesktop.org</a>> wrote: <div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"> From: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com">ian.d.romanick@intel.com</a>> This test passes on AMD's closed-source driver. It fails on NVIDIA's closed-source driver because after the second glLinkProgram call, glGetFragDataLocation always returns -1. Signed-off-by: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com">ian.d.romanick@intel.com</a>> --- tests/all.tests | 1 + tests/spec/gl-3.0/api/CMakeLists.gl.txt | 1 + tests/spec/gl-3.0/api/getfragdatalocation.c | 172 +++++++++++++++++++++++++++ 3 files changed, 174 insertions(+), 0 deletions(-) create mode 100644 tests/spec/gl-3.0/api/getfragdatalocation.c diff --git a/tests/all.tests b/tests/all.tests index 9641281..0f712bd 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -795,6 +795,7 @@ add_concurrent_test(gl30, 'clearbuffer-invalid-drawbuffer') add_concurrent_test(gl30, 'clearbuffer-invalid-buffer') add_concurrent_test(gl30, 'clearbuffer-depth') add_concurrent_test(gl30, 'clearbuffer-stencil') +add_concurrent_test(gl30, 'getfragdatalocation') # Group spec/glsl-1.00 spec['glsl-1.00'] = Group() diff --git a/tests/spec/gl-3.0/api/CMakeLists.gl.txt b/tests/spec/gl-3.0/api/CMakeLists.gl.txt index 51fbce4..f1b7a45 100644 --- a/tests/spec/gl-3.0/api/CMakeLists.gl.txt +++ b/tests/spec/gl-3.0/api/CMakeLists.gl.txt @@ -19,5 +19,6 @@ add_executable (clearbuffer-depth-stencil clearbuffer-common.c clearbuffer-depth add_executable (clearbuffer-invalid-drawbuffer clearbuffer-invalid-drawbuffer.c) add_executable (clearbuffer-invalid-buffer clearbuffer-invalid-buffer.c) add_executable (clearbuffer-stencil clearbuffer-common.c clearbuffer-stencil.c) +add_executable (getfragdatalocation getfragdatalocation.c) # vim: ft=cmake: diff --git a/tests/spec/gl-3.0/api/getfragdatalocation.c b/tests/spec/gl-3.0/api/getfragdatalocation.c new file mode 100644 index 0000000..b091238 --- /dev/null +++ b/tests/spec/gl-3.0/api/getfragdatalocation.c @@ -0,0 +1,172 @@ +/* Copyright © 2011 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. + */ + +/** + * \file getfragdatalocation.c + * + * \author Ian Romanick + */ +#include "piglit-util.h" + +int piglit_width = 100, piglit_height = 100; +int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE; + +static const char *vs_text = + "#version 130\n" + "in vec4 vertex;\n" + "void main() { gl_Position = vertex; }\n" + ; + +static const char *fs_text = + "#version 130\n" + "out vec4 v;\n" + "out vec4 a[2];\n" + "void main() {\n" + " v = vec4(0.0);\n" + " a[0] = vec4(1.0);\n" + " a[1] = vec4(2.0);\n" + "}\n" + ; + +enum piglit_result +piglit_display(void) +{ + return PIGLIT_FAIL; +} + +void piglit_init(int argc, char **argv) +{ + GLint max_draw_buffers; + GLuint prog; + GLuint vs; + GLuint fs; + GLint loc; + + piglit_require_gl_version(30); + + /* This test needs some number of draw buffers, so make sure the + * implementation isn't broken. This enables the test to generate a + * useful failure message. + */ + glGetIntegerv(GL_MAX_DRAW_BUFFERS, &max_draw_buffers); + if (max_draw_buffers < 8) { + fprintf(stderr, + "OpenGL 3.0 requires GL_MAX_DRAW_BUFFERS >= 8. " + "Only got %d!\n", + max_draw_buffers); + piglit_report_result(PIGLIT_FAIL); + } + + prog = glCreateProgram(); + vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vs_text); + fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fs_text); + glAttachShader(prog, vs); + glAttachShader(prog, fs); + piglit_check_gl_error(GL_NO_ERROR, PIGLIT_FAIL); + + /* Page 237 (page 253 of the PDF) of the OpenGL 3.0 spec says: + * + * "If program has not been successfully linked, the error INVALID + * OPERATION is generated. If name is not a varying out variable, + * or if an error occurs, -1 will be returned." + */ + printf("Querying location before linking...\n"); + loc = glGetFragDataLocation(prog, "v"); + piglit_check_gl_error(GL_INVALID_OPERATION, PIGLIT_FAIL); + + if (loc != -1) { + fprintf(stderr, "Expected location = -1, got %d\n", loc); + piglit_report_result(PIGLIT_FAIL); + } + + glLinkProgram(prog); + piglit_check_gl_error(GL_NO_ERROR, PIGLIT_FAIL); + + if (!piglit_link_check_status(prog)) { + piglit_report_result(PIGLIT_FAIL); + } + + printf("Querying location of nonexistent variable...\n"); + loc = glGetFragDataLocation(prog, "waldo"); + piglit_check_gl_error(GL_NO_ERROR, PIGLIT_FAIL); + + if (loc != -1) { + fprintf(stderr, "Expected location = -1, got %d\n", loc); + piglit_report_result(PIGLIT_FAIL); + } + + /* Page 236 (page 252 of the PDF) of the OpenGL 3.0 spec says: + * + * "BindFragDataLocation has no effect until the program is + * linked. In particular, it doesn’t modify the bindings of + * varying out variables in a program that has already been + * linked." + */ + glBindFragDataLocation(prog, 0, "v"); + glBindFragDataLocation(prog, 1, "a"); + glLinkProgram(prog); + piglit_check_gl_error(GL_NO_ERROR, PIGLIT_FAIL); + + if (!piglit_link_check_status(prog)) { + piglit_report_result(PIGLIT_FAIL); + } + + printf("Querying locations after binding and linking...\n"); + loc = glGetFragDataLocation(prog, "v"); + piglit_check_gl_error(GL_NO_ERROR, PIGLIT_FAIL); + + if (loc != 0) { + fprintf(stderr, "Expected location = 0, got %d\n", loc); + piglit_report_result(PIGLIT_FAIL); + } + + loc = glGetFragDataLocation(prog, "a"); + piglit_check_gl_error(GL_NO_ERROR, PIGLIT_FAIL); + + if (loc != 1) { + fprintf(stderr, "Expected location = 1, got %d\n", loc); + piglit_report_result(PIGLIT_FAIL); + } + + printf("Querying locations after just binding...\n"); + glBindFragDataLocation(prog, 2, "v"); + glBindFragDataLocation(prog, 0, "a"); + piglit_check_gl_error(GL_NO_ERROR, PIGLIT_FAIL); + + loc = glGetFragDataLocation(prog, "v"); + piglit_check_gl_error(GL_NO_ERROR, PIGLIT_FAIL); + + if (loc != 0) { + fprintf(stderr, "Expected location = 0, got %d\n", loc); + piglit_report_result(PIGLIT_FAIL); + } + + loc = glGetFragDataLocation(prog, "a"); + piglit_check_gl_error(GL_NO_ERROR, PIGLIT_FAIL); + + if (loc != 1) { + fprintf(stderr, "Expected location = 1, got %d\n", loc); + piglit_report_result(PIGLIT_FAIL); + } + + piglit_report_result(PIGLIT_PASS); +} -- 1.7.6.4 </blockquote><div> The spec mentions one other behavior that would probably be worth testing, either in this test or elsewhere (emphasis mine): "BindFragDataLocation may be issued before any shader objects are attached to a program object. Hence it is allowed to bind any name (except a name starting with gl_) to a color number, including a name that is never used as a varying out variable in any fragment shader object. *Assigned bindings for variables that do not exist are ignored*." Other than that, this patch is: Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>> </div></div>