GL_ARB_ubo: New test for glGetActiveUniformsiv(GL_UNIFORM_BLOCK_INDEX).

3 files changed, 133 insertions, 0 deletions

diff --git a/tests/all.tests b/tests/all.tests
index 4a449cc5d..d19835da3 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1927,6 +1927,7 @@ arb_uniform_buffer_object['bindbuffer-general-point'] = concurrent_test('arb_uni
 arb_uniform_buffer_object['buffer-targets'] = concurrent_test('arb_uniform_buffer_object-buffer-targets')
 arb_uniform_buffer_object['getactiveuniformblockname'] = concurrent_test('arb_uniform_buffer_object-getactiveuniformblockname')
 arb_uniform_buffer_object['getactiveuniformname'] = concurrent_test('arb_uniform_buffer_object-getactiveuniformname')
+arb_uniform_buffer_object['getactiveuniformsiv-uniform-block-index'] = concurrent_test('arb_uniform_buffer_object-getactiveuniformsiv-uniform-block-index')
 arb_uniform_buffer_object['getintegeri_v'] = concurrent_test('arb_uniform_buffer_object-getintegeri_v')
 arb_uniform_buffer_object['getprogramiv'] = concurrent_test('arb_uniform_buffer_object-getprogramiv')
 arb_uniform_buffer_object['getuniformblockindex'] = concurrent_test('arb_uniform_buffer_object-getuniformblockindex')
diff --git a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
index e207412a3..41d07bbf2 100644
--- a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
@@ -14,6 +14,7 @@ add_executable (arb_uniform_buffer_object-bindbuffer-general-point bindbuffer-ge
 add_executable (arb_uniform_buffer_object-buffer-targets buffer-targets.c)
 add_executable (arb_uniform_buffer_object-getactiveuniformblockname getactiveuniformblockname.c)
 add_executable (arb_uniform_buffer_object-getactiveuniformname getactiveuniformname.c)
+add_executable (arb_uniform_buffer_object-getactiveuniformsiv-uniform-block-index getactiveuniformsiv-uniform-block-index.c)
 add_executable (arb_uniform_buffer_object-getintegeri_v getintegeri_v.c)
 add_executable (arb_uniform_buffer_object-getprogramiv getprogramiv.c)
 add_executable (arb_uniform_buffer_object-getuniformblockindex getuniformblockindex.c)
diff --git a/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-block-index.c b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-block-index.c
new file mode 100644
index 000000000..9fe0ddf4b
--- /dev/null
+++ b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-block-index.c
@@ -0,0 +1,131 @@
+/*
+ * 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 getactiveuniformsiv-uniform-block-index.c
+ *
+ * Tests that glGetActiveUniforms() returns the block index for a
+ * uniform that the uniform block was given by
+ * glGetUniformBlockIndex.()
+ */
+
+#include "piglit-util-gl-common.h"
+
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA)
+
+static const char vs_source[] =
+	"#extension GL_ARB_uniform_buffer_object : require\n"
+	"\n"
+	"uniform ub_a { vec4 a; };\n"
+	"uniform ub_b { vec4 b; };\n"
+	"\n"
+	"void main()\n"
+	"{\n"
+	"	gl_Position = a + b;\n"
+	"}\n";
+
+static const char fs_source[] =
+	"#extension GL_ARB_uniform_buffer_object : require\n"
+	"\n"
+	"uniform ub_b { vec4 b; };\n"
+	"uniform ub_c { vec4 c; };\n"
+	"uniform vec4 d;\n"
+	"\n"
+	"void main()\n"
+	"{\n"
+	"	gl_FragColor = b + c + d;\n"
+	"}\n";
+
+void
+piglit_init(int argc, char **argv)
+{
+	bool pass = true;
+	GLuint fs, vs, prog;
+	const char *uniform_block_names[3] = { "ub_a", "ub_b", "ub_c" };
+	const char *uniform_names[4] = { "a", "b", "c", "d" };
+	GLuint block_indices[3];
+	GLuint uniform_indices[4];
+	GLint uniform_block_indices[4];
+	int i;
+
+	piglit_require_extension("GL_ARB_uniform_buffer_object");
+
+	vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vs_source);
+	if (!vs) {
+		printf("Failed to compile VS:\n%s", vs_source);
+		piglit_report_result(PIGLIT_FAIL);
+	}
+
+	fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fs_source);
+	if (!fs) {
+		printf("Failed to compile FS:\n%s", fs_source);
+		piglit_report_result(PIGLIT_FAIL);
+	}
+
+	prog = piglit_link_simple_program(vs, fs);
+	if (!prog)
+		piglit_report_result(PIGLIT_FAIL);
+
+	for (i = 0; i < 3; i++) {
+		block_indices[i] =
+			glGetUniformBlockIndex(prog, uniform_block_names[i]);
+
+		printf("Uniform block \"%s\" index: 0x%08x\n",
+		       uniform_block_names[i], block_indices[i]);
+	}
+
+	if (block_indices[0] == block_indices[1] ||
+	    block_indices[0] == block_indices[2] ||
+	    block_indices[1] == block_indices[2]) {
+		piglit_report_result(PIGLIT_FAIL);
+	}
+
+	glGetUniformIndices(prog, 4, uniform_names, uniform_indices);
+	glGetActiveUniformsiv(prog, 4, uniform_indices,
+			      GL_UNIFORM_BLOCK_INDEX, uniform_block_indices);
+	for (i = 0; i < 4; i++) {
+		int expected_index = (i == 3) ? -1 : block_indices[i];
+
+		printf("Uniform \"%s\": index %d, block index %d",
+		       uniform_names[i],
+		       uniform_indices[i],
+		       uniform_block_indices[i]);
+
+		if (uniform_block_indices[i] != expected_index) {
+			printf(" FAIL");
+			pass = false;
+		}
+
+		printf("\n");
+	}
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
+
+enum piglit_result piglit_display(void)
+{
+	/* UNREACHED */
+	return PIGLIT_FAIL;
+}