---
 tests/all.tests                                    |    1 +
 .../arb_uniform_buffer_object/CMakeLists.gl.txt    |    1 +
 .../negative-getactiveuniformblockiv.c             |  110 ++++++++++++++++++++
 3 files changed, 112 insertions(+)
 create mode 100644 
tests/spec/arb_uniform_buffer_object/negative-getactiveuniformblockiv.c

diff --git a/tests/all.tests b/tests/all.tests
index 788dd33..2d803f8 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1920,6 +1920,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['negative-getactiveuniformblockiv'] = 
concurrent_test('arb_uniform_buffer_object-negative-getactiveuniformblockiv')
 arb_uniform_buffer_object['referenced-by-shader'] = 
concurrent_test('arb_uniform_buffer_object-referenced-by-shader')
 arb_uniform_buffer_object['row-major'] = 
concurrent_test('arb_uniform_buffer_object-row-major')
 arb_uniform_buffer_object['uniformblockbinding'] = 
concurrent_test('arb_uniform_buffer_object-uniformblockbinding')
diff --git a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt 
b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
index d989022..b559683 100644
--- a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
@@ -31,6 +31,7 @@ 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-negative-getactiveuniformblockiv 
negative-getactiveuniformblockiv.c)
 add_executable (arb_uniform_buffer_object-referenced-by-shader 
referenced-by-shader.c)
 add_executable (arb_uniform_buffer_object-row-major row-major.c)
 add_executable (arb_uniform_buffer_object-uniformblockbinding 
uniformblockbinding.c)
diff --git 
a/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformblockiv.c 
b/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformblockiv.c
new file mode 100644
index 0000000..0f1e5f7
--- /dev/null
+++ b/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformblockiv.c
@@ -0,0 +1,110 @@
+/*
+ * 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 negative-getactiveuniformblockiv.c
+ *
+ * From the GL_ARB_uniform_buffer_object spec:
+ *
+ *     "<uniformBlockIndex> is an active uniform block index of
+ *      <program>.  If <uniformBlockIndex> is greater than or equal to
+ *      the value of ACTIVE_UNIFORM_BLOCKS, or is not the index of an
+ *      active uniform block in <program>, the error INVALID_VALUE is
+ *      generated.
+ *
+ *      If no error occurs, the uniform block parameter(s) specified
+ *      by <pname> are returned in <params>. Otherwise, nothing will
+ *      be written to <params>.
+ *
+ *      The error INVALID_VALUE is generated by GetUniformIndices,
+ *      GetActiveUniformsiv, GetActiveUniformName,
+ *      GetUniformBlockIndex, GetActiveUniformBlockiv,
+ *      GetActiveUniformBlockName, and UniformBlockBinding if
+ *      <program> is not a value generated by GL.
+ *
+ *      The error INVALID_ENUM is generated by GetActiveUniformsiv and
+ *      GetActiveUniformBlockiv if <pname> is not one of the accepted
+ *      values."
+ */
+
+#define _GNU_SOURCE
+#include "piglit-util-gl-common.h"
+#include "uniform-types.h"
+
+PIGLIT_GL_TEST_MAIN(
+    10 /*window_width*/,
+    10 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA)
+
+void
+piglit_init(int argc, char **argv)
+{
+       bool pass = true;
+       const char *fs_source =
+               "#extension GL_ARB_uniform_buffer_object : require\n"
+               "uniform ubo {\n"
+               "       float u;\n"
+               "};\n"
+               "\n"
+               "void main() {\n"
+               "       gl_FragColor = vec4(u);\n"
+               "}\n";
+       GLuint fs, prog;
+       GLint junk = 0xd0d0, unwritten_junk = junk;
+
+       piglit_require_extension("GL_ARB_uniform_buffer_object");
+
+       fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fs_source);
+       prog = piglit_link_simple_program(0, fs);
+       if (!fs || !prog) {
+               fprintf(stderr, "Failed to compile shader:\n%s", fs_source);
+               piglit_report_result(PIGLIT_FAIL);
+       }
+
+       /* Test a bad pname (it's one for glActiveUniformsiv). */
+       glGetActiveUniformBlockiv(prog, 0, GL_UNIFORM_TYPE, &junk);
+       if (!piglit_check_gl_error(GL_INVALID_ENUM) || junk != unwritten_junk)
+               pass = false;
+
+       /* Bad active uniform block index.  "The indices of the active
+        * uniform blocks of a program are assigned in consecutive
+        * order, beginning with zero."
+       */
+       glGetActiveUniformBlockiv(prog, 1, GL_UNIFORM_BLOCK_BINDING, &junk);
+       if (!piglit_check_gl_error(GL_INVALID_VALUE) || junk != unwritten_junk)
+               pass = false;
+
+       /* Test bad program name by deleting ours */
+       glDeleteProgram(prog);
+       glGetActiveUniformBlockiv(prog, 0, GL_UNIFORM_BLOCK_BINDING, &junk);
+       if (!piglit_check_gl_error(GL_INVALID_VALUE) || junk != unwritten_junk)
+               pass = false;
+
+       piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
+
+enum piglit_result piglit_display(void)
+{
+       /* UNREACHED */
+       return PIGLIT_FAIL;
+}
+
-- 
1.7.10.4

_______________________________________________
Piglit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/piglit

Reply via email to