[Piglit] [PATCH 1/2] GL_ARB_ubo: Add new test for glDeleteBuffers() behavior.

[Eric Anholt]

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

diff --git a/tests/all.tests b/tests/all.tests
index c238028..0bb9452 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1905,6 +1905,7 @@ add_shader_test_dir(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['bindbuffer-gen-name'] = concurrent_test('arb_uniform_buffer_object-bindbuffer-gen-name')
 arb_uniform_buffer_object['buffer-targets'] = concurrent_test('arb_uniform_buffer_object-buffer-targets')
+arb_uniform_buffer_object['deletebuffers'] = concurrent_test('arb_uniform_buffer_object-deletebuffers')
 arb_uniform_buffer_object['getactiveuniformblockiv-uniform-block-data-size'] = concurrent_test('arb_uniform_buffer_object-getactiveuniformblockiv-uniform-block-data-size')
 arb_uniform_buffer_object['getactiveuniformblockname'] = concurrent_test('arb_uniform_buffer_object-getactiveuniformblockname')
 arb_uniform_buffer_object['getactiveuniformname'] = concurrent_test('arb_uniform_buffer_object-getactiveuniformname')
diff --git a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
index 314b0b4..65ab2dc 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-bindbuffer-gen-name bindbuffer-gen-name.c)
 add_executable (arb_uniform_buffer_object-buffer-targets buffer-targets.c)
+add_executable (arb_uniform_buffer_object-deletebuffers deletebuffers.c)
 add_executable (arb_uniform_buffer_object-getactiveuniformblockiv-uniform-block-data-size getactiveuniformblockiv-uniform-block-data-size.c uniform-types.c)
 add_executable (arb_uniform_buffer_object-getactiveuniformblockname getactiveuniformblockname.c)
 add_executable (arb_uniform_buffer_object-getactiveuniformname getactiveuniformname.c)
diff --git a/tests/spec/arb_uniform_buffer_object/deletebuffers.c b/tests/spec/arb_uniform_buffer_object/deletebuffers.c
new file mode 100644
index 0000000..cc788dc
--- /dev/null
+++ b/tests/spec/arb_uniform_buffer_object/deletebuffers.c
@@ -0,0 +1,103 @@
+/*
+ * 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 deletebuffers.c
+ *
+ * Tests that glDeleteBuffers() also removes the
+ * glBindBufferBase()/glBindBufferRange() bindings along with the
+ * usual glBindBuffer() binding.
+ */
+
+#include "piglit-util-gl-common.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;
+	GLuint bo[2];
+	GLint binding;
+
+	glGetIntegeri_v(GL_UNIFORM_BUFFER_BINDING, 0, &binding);
+	if (binding != 0) {
+		fprintf(stderr, "Default UBO binding should be 0, was %d\n",
+			binding);
+		piglit_report_result(PIGLIT_FAIL);
+	}
+
+	piglit_require_extension("GL_ARB_uniform_buffer_object");
+
+	glGenBuffers(2, bo);
+
+	glBindBuffer(GL_UNIFORM_BUFFER, bo[0]);
+	glBufferData(GL_UNIFORM_BUFFER, 4, NULL, GL_STATIC_DRAW);
+	glBindBufferBase(GL_UNIFORM_BUFFER, 0, bo[0]);
+
+	glBindBuffer(GL_UNIFORM_BUFFER, bo[1]);
+	glBufferData(GL_UNIFORM_BUFFER, 4, NULL, GL_STATIC_DRAW);
+	glBindBufferRange(GL_UNIFORM_BUFFER, 1, bo[1], 0, 4);
+
+	glDeleteBuffers(2, bo);
+
+	if (glIsBuffer(bo[0]) || glIsBuffer(bo[1])) {
+		fprintf(stderr, "Failed to delete buffers\n");
+		pass = false;
+	}
+
+	glGetIntegerv(GL_UNIFORM_BUFFER_BINDING, &binding);
+	if (binding != 0) {
+		printf("Failed to unbind glBindBuffer() buffer %d:\n"
+		       "  binding set to %d, should be 0\n",
+		       bo[1], binding);
+		pass = false;
+	}
+
+	glGetIntegeri_v(GL_UNIFORM_BUFFER_BINDING, 0, &binding);
+	if (binding != 0) {
+		printf("Failed to unbind glBindBufferBase() buffer %d:\n"
+		       "  binding set to %d, should be 0\n",
+		       bo[0], binding);
+		pass = false;
+	}
+
+	glGetIntegeri_v(GL_UNIFORM_BUFFER_BINDING, 1, &binding);
+	if (binding != 0) {
+		printf("Failed to unbind glBindBufferRange() buffer %d:\n"
+		       "  binding set to %d, should be 0\n",
+		       bo[1], binding);
+		pass = false;
+	}
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
+
+enum piglit_result piglit_display(void)
+{
+	/* UNREACHED */
+	return PIGLIT_FAIL;
+}
+
-- 
1.7.10.4