[Piglit] [PATCH 8/8] GL_ARB_ubo: New test for glGetUniformLocation() on a UBO.

[Eric Anholt]

---
 tests/all.tests                                    |    1 +
 .../arb_uniform_buffer_object/CMakeLists.gl.txt    |    1 +
 .../arb_uniform_buffer_object/getuniformlocation.c |  100 ++++++++++++++++++++
 3 files changed, 102 insertions(+)
 create mode 100644 tests/spec/arb_uniform_buffer_object/getuniformlocation.c

diff --git a/tests/all.tests b/tests/all.tests
index bf4dd4f..4694817 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1617,6 +1617,7 @@ import_glsl_parser_tests(spec['ARB_uniform_buffer_object'],
 			 [''])
 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')
 arb_uniform_buffer_object['layout-std140'] = concurrent_test('arb_uniform_buffer_object-layout-std140')
 
 ati_draw_buffers = Group()
diff --git a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
index 0f7be76..c70e340 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 @@ link_libraries (
 
 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)
 add_executable (arb_uniform_buffer_object-layout-std140 layout-std140.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_uniform_buffer_object/getuniformlocation.c b/tests/spec/arb_uniform_buffer_object/getuniformlocation.c
new file mode 100644
index 0000000..4e47b4a
--- /dev/null
+++ b/tests/spec/arb_uniform_buffer_object/getuniformlocation.c
@@ -0,0 +1,100 @@
+/*
+ * 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 getuniformlocation.c
+ *
+ * Tests that glGetUniformLocation() returns no location for UBO variables.
+ *
+ * From the GL_ARB_uniform_buffer_object spec:
+ *
+ *      To find the location within a program object of an active uniform
+ *      variable associated with the default uniform block, use the command
+ *
+ *          int GetUniformLocation(uint program, const char *name);
+ *
+ *      ... The value -1 will be returned if <name> does not
+ *      correspond to an active uniform variable name in <program>, if
+ *      <name> is associated with a named uniform block..."
+ */
+
+#include "piglit-util.h"
+
+int piglit_width = 100;
+int piglit_height = 100;
+int piglit_window_mode = GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA;
+static GLuint prog;
+
+static const char fs_source[] =
+	"#extension GL_ARB_uniform_buffer_object : require\n"
+	"\n"
+	"uniform ub_a { vec4 a; };\n"
+	"uniform vec4 b;\n"
+	"\n"
+	"void main()\n"
+	"{\n"
+	"	gl_FragColor = a + b;\n"
+	"}\n";
+
+void
+piglit_init(int argc, char **argv)
+{
+	bool pass = true;
+	GLuint fs;
+	int location;
+
+	piglit_require_extension("GL_ARB_uniform_buffer_object");
+
+	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(0, fs);
+	if (!prog)
+		piglit_report_result(PIGLIT_FAIL);
+
+
+	location = glGetUniformLocation(prog, "a");
+	if (location != -1) {
+		printf("Uniform \"a\" had location %d, expected -1\n", location);
+		pass = false;
+	}
+
+	location = glGetUniformLocation(prog, "b");
+	if (location == -1) {
+		printf("Uniform \"b\" had location %d\n", location);
+		pass = false;
+	}
+
+	if (!pass)
+		printf("Source:\n%s", fs_source);
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
+
+enum piglit_result piglit_display(void)
+{
+	/* UNREACHED */
+	return PIGLIT_FAIL;
+}
-- 
1.7.10