From 6d822fd6805d185f6b8d85baf23a50192e30810a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 19 Jun 2012 13:29:23 -0700 Subject: GL_ARB_ubo/uniformblockbinding: New test for setting/getting block bindings. --- tests/all.tests | 1 + .../arb_uniform_buffer_object/CMakeLists.gl.txt | 1 + .../uniformblockbinding.c | 159 +++++++++++++++++++++ 3 files changed, 161 insertions(+) create mode 100644 tests/spec/arb_uniform_buffer_object/uniformblockbinding.c diff --git a/tests/all.tests b/tests/all.tests index e05eaf6f4..201065b5f 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -1896,6 +1896,7 @@ arb_uniform_buffer_object['negative-bindbuffer-buffer'] = concurrent_test('arb_u arb_uniform_buffer_object['negative-bindbuffer-index'] = concurrent_test('arb_uniform_buffer_object-negative-bindbuffer-index') arb_uniform_buffer_object['negative-bindbuffer-target'] = concurrent_test('arb_uniform_buffer_object-negative-bindbuffer-target') arb_uniform_buffer_object['negative-bindbufferrange-range'] = concurrent_test('arb_uniform_buffer_object-negative-bindbufferrange-range') +arb_uniform_buffer_object['uniformblockbinding'] = concurrent_test('arb_uniform_buffer_object-uniformblockbinding') ati_draw_buffers = Group() spec['ATI_draw_buffers'] = ati_draw_buffers diff --git a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt index 10dd5525c..e2e8b6318 100644 --- a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt +++ b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt @@ -23,5 +23,6 @@ add_executable (arb_uniform_buffer_object-negative-bindbuffer-index negative-bin add_executable (arb_uniform_buffer_object-negative-bindbuffer-buffer negative-bindbuffer-buffer.c) add_executable (arb_uniform_buffer_object-negative-bindbuffer-target negative-bindbuffer-target.c) add_executable (arb_uniform_buffer_object-negative-bindbufferrange-range negative-bindbufferrange-range.c) +add_executable (arb_uniform_buffer_object-uniformblockbinding uniformblockbinding.c) # vim: ft=cmake: diff --git a/tests/spec/arb_uniform_buffer_object/uniformblockbinding.c b/tests/spec/arb_uniform_buffer_object/uniformblockbinding.c new file mode 100644 index 000000000..12c673424 --- /dev/null +++ b/tests/spec/arb_uniform_buffer_object/uniformblockbinding.c @@ -0,0 +1,159 @@ +/* + * Copyright © 2012 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 uniformblockbinding.c + * + * From the GL_ARB_uniform_buffer_object spec: + * + * "Each of a program's active uniform blocks has a corresponding + * uniform buffer object binding point. This binding point can be + * assigned by calling: + * + * void UniformBlockBinding(uint program, + * uint uniformBlockIndex, + * uint uniformBlockBinding); + * + * is a name of a program object for which the command + * LinkProgram has been issued in the past. + * + * must be an active uniform block index of + * the program . Otherwise, INVALID_VALUE is generated. + * + * must be less than MAX_UNIFORM_BUFFER_BINDINGS. + * Otherwise, INVALID_VALUE is generated. + * + * ... + * + * When a program object is linked or re-linked, the uniform + * buffer object binding point assigned to each of its active + * uniform blocks is reset to zero. + + * ... + * + * The error INVALID_VALUE is generated by GetActiveUniformsiv, + * GetActiveUniformName, GetActiveUniformBlockiv, + * GetActiveUniformBlockName, and UniformBlockBinding if + * is not a value generated by GL." + */ + +#include "piglit-util-gl-common.h" + +PIGLIT_GL_TEST_MAIN( + 10 /*window_width*/, + 10 /*window_height*/, + GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + +void +piglit_init(int argc, char **argv) +{ + int i; + GLuint fs, prog; + const char *source = + "#extension GL_ARB_uniform_buffer_object : enable\n" + "uniform a { float u1; };\n" + "uniform b { float u2; };\n" + "void main() {\n" + " gl_FragColor = vec4(u1 + u2);\n" + "}\n"; + int blocks; + int binding, max_bindings; + bool pass = true; + + piglit_require_extension("GL_ARB_uniform_buffer_object"); + + fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, source); + prog = piglit_link_simple_program(fs, 0); + if (!fs || !prog) { + fprintf(stderr, "Failed to compile shader:\n%s", source); + piglit_report_result(PIGLIT_FAIL); + } + + glGetProgramiv(prog, GL_ACTIVE_UNIFORM_BLOCKS, &blocks); + assert(blocks == 2); + + for (i = 0; i < blocks; i++) { + glGetActiveUniformBlockiv(prog, i, GL_UNIFORM_BLOCK_BINDING, + &binding); + + if (binding != 0) { + fprintf(stderr, + "Linked program should have binding[%d] = %d, " + "saw %d\n", + i, 0, binding); + pass = false; + } + } + + for (i = 0; i < blocks; i++) { + glUniformBlockBinding(prog, i, blocks - i); + } + + for (i = 0; i < blocks; i++) { + glGetActiveUniformBlockiv(prog, i, GL_UNIFORM_BLOCK_BINDING, + &binding); + + if (binding != blocks - i) { + fprintf(stderr, + "Updated binding[%d] to %d, but got %d\n", + i, blocks - i, binding); + pass = false; + } + } + + glLinkProgram(prog); + + for (i = 0; i < blocks; i++) { + glGetActiveUniformBlockiv(prog, i, GL_UNIFORM_BLOCK_BINDING, + &binding); + + if (binding != 0) { + fprintf(stderr, + "Relinked program should have binding[%d] = %d, " + "saw %d\n", + i, 0, binding); + pass = false; + } + } + + glUniformBlockBinding(prog, blocks, 0); + pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass; + + glGetIntegerv(GL_MAX_UNIFORM_BUFFER_BINDINGS, &max_bindings); + glUniformBlockBinding(prog, 0, max_bindings); + pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass; + + glUniformBlockBinding(0xd0d0, 0, 0); + pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass; + + glDeleteProgram(prog); + glDeleteShader(fs); + + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); +} + +enum piglit_result piglit_display(void) +{ + /* UNREACHED */ + return PIGLIT_FAIL; +} + -- cgit v1.2.3