[Piglit] [PATCH 2/7] GL_ARB_ubo/bindbuffer-general-point: New test for API behavior.

[Eric Anholt]

---
 tests/all.tests                                    |    1 +
 .../arb_uniform_buffer_object/CMakeLists.gl.txt    |    1 +
 .../bindbuffer-general-point.c                     |   93 ++++++++++++++++++++
 3 files changed, 95 insertions(+)
 create mode 100644 tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c

diff --git a/tests/all.tests b/tests/all.tests
index 6cc7d5c..f81a53c 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1697,6 +1697,7 @@ spec['ARB_uniform_buffer_object'] = arb_uniform_buffer_object
 import_glsl_parser_tests(spec['ARB_uniform_buffer_object'],
 			 os.path.join(testsDir, '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['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 900e683..4339d3d 100644
--- a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
@@ -10,6 +10,7 @@ link_libraries (
 	${OPENGL_glu_LIBRARY}
 )
 
+add_executable (arb_uniform_buffer_object-bindbuffer-general-point bindbuffer-general-point.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/bindbuffer-general-point.c b/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c
new file mode 100644
index 0000000..faea239
--- /dev/null
+++ b/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c
@@ -0,0 +1,93 @@
+/*
+ * 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 bindbuffer-general-point.c
+ *
+ * Tests that the glBindBuffer* entrypoints also bind to the general
+ * binding point.
+ */
+
+#include "piglit-util.h"
+
+int piglit_width = 100;
+int piglit_height = 100;
+int piglit_window_mode = GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA;
+
+void
+piglit_init(int argc, char **argv)
+{
+	bool pass = true;
+	GLuint bo[2];
+	GLint binding;
+
+	piglit_require_extension("GL_ARB_uniform_buffer_object");
+
+	glGenBuffers(2, bo);
+	glBindBuffer(GL_UNIFORM_BUFFER, bo[0]);
+	glBufferData(GL_UNIFORM_BUFFER, 1, NULL, GL_STATIC_READ);
+	glBindBuffer(GL_UNIFORM_BUFFER, bo[1]);
+	glBufferData(GL_UNIFORM_BUFFER, 1, NULL, GL_STATIC_READ);
+
+	/* From the GL_ARB_uniform_buffer_object spec:
+	 *
+	 *     "Buffer objects are bound to uniform block binding
+	 *     points by calling one of the commands
+	 *
+	 *     void BindBufferRange(...)
+	 *     void BindBufferBase(...)
+	 *
+	 *      There is an array of buffer object binding points with
+	 *      which uniform blocks can be associated via
+	 *      UniformBlockBinding, plus a single general binding
+	 *      point that can be used by other buffer object
+	 *      manipulation functions (e.g. BindBuffer,
+	 *      MapBuffer). Both commands bind the buffer object named
+	 *      by <buffer> to the general binding point, and
+	 *      additionally bind the buffer object to the binding
+	 *      point in the array given by <index>."
+	 */
+	glBindBufferBase(GL_UNIFORM_BUFFER, 0, bo[0]);
+	glGetIntegerv(GL_UNIFORM_BUFFER_BINDING, &binding);
+	if (binding != bo[0]) {
+		fprintf(stderr, "GL_UNIFORM_BUFFER_BINDING[0] was %d, expected %d\n",
+			binding, bo[0]);
+		pass = false;
+	}
+
+	glBindBufferRange(GL_UNIFORM_BUFFER, 1, bo[1], 0, 1);
+	glGetIntegerv(GL_UNIFORM_BUFFER_BINDING, &binding);
+	if (binding != bo[1]) {
+		fprintf(stderr, "GL_UNIFORM_BUFFER_BINDING[1] was %d, expected %d\n",
+			binding, bo[1]);
+		pass = false;
+	}
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
+
+enum piglit_result piglit_display(void)
+{
+	/* UNREACHED */
+	return PIGLIT_FAIL;
+}
+
-- 
1.7.10