GL_ARB_ubo/getprogramiv: New test for API behavior on linked programs.

3 files changed, 152 insertions, 0 deletions

diff --git a/tests/all.tests b/tests/all.tests
index 65d67c1f8..e05eaf6f4 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1886,6 +1886,7 @@ import_glsl_parser_tests(spec['ARB_uniform_buffer_object'],
 arb_uniform_buffer_object['bindbuffer-general-point'] = concurrent_test('arb_uniform_buffer_object-bindbuffer-general-point')
 arb_uniform_buffer_object['buffer-targets'] = concurrent_test('arb_uniform_buffer_object-buffer-targets')
 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')
 arb_uniform_buffer_object['getuniformindices'] = concurrent_test('arb_uniform_buffer_object-getuniformindices')
 arb_uniform_buffer_object['getuniformlocation'] = concurrent_test('arb_uniform_buffer_object-getuniformlocation')
diff --git a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
index cdd5f143d..10dd5525c 100644
--- a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
@@ -13,6 +13,7 @@ link_libraries (
 add_executable (arb_uniform_buffer_object-bindbuffer-general-point bindbuffer-general-point.c)
 add_executable (arb_uniform_buffer_object-buffer-targets buffer-targets.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)
 add_executable (arb_uniform_buffer_object-getuniformindices getuniformindices.c)
 add_executable (arb_uniform_buffer_object-getuniformlocation getuniformlocation.c)
diff --git a/tests/spec/arb_uniform_buffer_object/getprogramiv.c b/tests/spec/arb_uniform_buffer_object/getprogramiv.c
new file mode 100644
index 000000000..a5c5f24c9
--- /dev/null
+++ b/tests/spec/arb_uniform_buffer_object/getprogramiv.c
@@ -0,0 +1,150 @@
+/*
+ * 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 getprogramiv.c
+ *
+ * From the GL_ARB_uniform_buffer_object spec:
+ *
+ *     "If <pname> is ACTIVE_UNIFORM_BLOCKS the number of uniform
+ *      blocks for <program> containing active uniforms is returned.
+ *
+ *      If <pname> is ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH, the length
+ *      of the longest active uniform block name, including the null
+ *      terminator, is returned."
+ */
+
+#include "piglit-util-gl-common.h"
+
+PIGLIT_GL_TEST_MAIN(
+    10 /*window_width*/,
+    10 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA)
+
+struct {
+	const char *source;
+	int blocks;
+	int namelen;
+} tests[] = {
+	{
+		"#extension GL_ARB_uniform_buffer_object : enable\n"
+		"uniform a { float u1; };\n"
+		"void main() {\n"
+		"	gl_FragColor = vec4(u1);\n"
+		"}\n",
+		1, 2,
+	},
+	{
+		"#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",
+		2, 2,
+	},
+	{
+		"#extension GL_ARB_uniform_buffer_object : enable\n"
+		"uniform a { float u1; };\n"
+		"uniform bb { float u2; };\n"
+		"void main() {\n"
+		"	gl_FragColor = vec4(u1 + u2);\n"
+		"}\n",
+		2, 3,
+	},
+	{
+		"#extension GL_ARB_uniform_buffer_object : enable\n"
+		"uniform aa { float u1; };\n"
+		"uniform b { float u2; };\n"
+		"void main() {\n"
+		"	gl_FragColor = vec4(u1 + u2);\n"
+		"}\n",
+		2, 3,
+	},
+};
+
+static bool
+test_shader(int test)
+{
+	GLuint fs, prog;
+	const char *source = tests[test].source;
+	int namelen = 9999, blocks = 9999;
+
+	fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, source);
+	if (!fs) {
+		fprintf(stderr, "%d: Failed to compile shader:\n%s",
+			test, source);
+		return false;
+	}
+
+	prog = piglit_link_simple_program(fs, 0);
+	if (!prog) {
+		fprintf(stderr, "%d: Failed to link shader:\n%s", test, source);
+		glDeleteShader(fs);
+		return false;
+	}
+
+	glGetProgramiv(prog, GL_ACTIVE_UNIFORM_BLOCKS, &blocks);
+	if (blocks != tests[test].blocks) {
+		fprintf(stderr,
+			"%d: Bad GL_ACTIVE_UNIFORM_BLOCKS "
+			"%d, expected %d.  Source:\n%s",
+			test, blocks, tests[test].blocks, source);
+		return false;
+	}
+
+	glGetProgramiv(prog, GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH, &namelen);
+	if (namelen != tests[test].namelen) {
+		fprintf(stderr,
+			"%d: Bad GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH "
+			"%d, expected %d.  Source:\n%s",
+			test, namelen, tests[test].namelen, source);
+		return false;
+	}
+
+	glDeleteProgram(prog);
+	glDeleteShader(fs);
+
+	return true;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+	bool pass = true;
+	int i;
+
+	piglit_require_extension("GL_ARB_uniform_buffer_object");
+
+	for (i = 0; i < ARRAY_SIZE(tests); i++) {
+		pass = test_shader(i) && pass;
+	}
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
+
+enum piglit_result piglit_display(void)
+{
+	/* UNREACHED */
+	return PIGLIT_FAIL;
+}
+