[Piglit] [PATCH 7/7] GL_ARB_ubo/buffer-targets: New test for GL_UNIFORM_BUFFER api.

[Eric Anholt]

---
 tests/all.tests                                    |    1 +
 .../arb_uniform_buffer_object/CMakeLists.gl.txt    |    1 +
 .../arb_uniform_buffer_object/buffer-targets.c     |   88 ++++++++++++++++++++
 3 files changed, 90 insertions(+)
 create mode 100644 tests/spec/arb_uniform_buffer_object/buffer-targets.c

diff --git a/tests/all.tests b/tests/all.tests
index 4127bda..844df65 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1698,6 +1698,7 @@ 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['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['getuniformblockindex'] = concurrent_test('arb_uniform_buffer_object-getuniformblockindex')
 arb_uniform_buffer_object['getuniformindices'] = concurrent_test('arb_uniform_buffer_object-getuniformindices')
diff --git a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
index fe28c41..71aa96b 100644
--- a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
@@ -11,6 +11,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-getuniformblockindex getuniformblockindex.c)
 add_executable (arb_uniform_buffer_object-getuniformindices getuniformindices.c)
diff --git a/tests/spec/arb_uniform_buffer_object/buffer-targets.c b/tests/spec/arb_uniform_buffer_object/buffer-targets.c
new file mode 100644
index 0000000..9ecb369
--- /dev/null
+++ b/tests/spec/arb_uniform_buffer_object/buffer-targets.c
@@ -0,0 +1,88 @@
+/*
+ * 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 buffer-targets.c
+ *
+ * Tests that the GL_UNIFORM_BUFFER target is accepted by other gl
+ * entrypoints.
+ *
+ * From the GL_ARB_uniform_buffer_object spec:
+ *
+ *     "Accepted by the <target> parameters of BindBuffer, BufferData,
+ *      BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData, and
+ *      GetBufferPointerv:
+ *
+ *          UNIFORM_BUFFER"
+ */
+
+#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;
+	uint8_t in_data[1] = {0xaa};
+	uint8_t out_data[1] = {0xd0};
+	void *ptr1, *ptr2;
+
+	piglit_require_extension("GL_ARB_uniform_buffer_object");
+
+	glGenBuffers(1, &bo);
+
+	glBindBuffer(GL_UNIFORM_BUFFER, bo);
+	pass = pass && piglit_check_gl_error(0);
+
+	glBufferData(GL_UNIFORM_BUFFER, 1, NULL, GL_STATIC_READ);
+	pass = pass && piglit_check_gl_error(0);
+
+	glBufferSubData(GL_UNIFORM_BUFFER, 0, 1, in_data);
+	pass = pass && piglit_check_gl_error(0);
+
+	ptr1 = glMapBuffer(GL_UNIFORM_BUFFER, GL_READ_ONLY);
+	pass = pass && piglit_check_gl_error(0);
+
+	glGetBufferPointerv(GL_UNIFORM_BUFFER, GL_BUFFER_MAP_POINTER, &ptr2);
+	pass = pass && piglit_check_gl_error(0);
+	assert(ptr1 == ptr2);
+
+	glUnmapBuffer(GL_UNIFORM_BUFFER);
+	pass = pass && piglit_check_gl_error(0);
+
+	glGetBufferSubData(GL_UNIFORM_BUFFER, 0, 1, out_data);
+	pass = pass && piglit_check_gl_error(0);
+	assert(memcmp(in_data, out_data, sizeof(in_data)) == 0);
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
+
+enum piglit_result piglit_display(void)
+{
+	/* UNREACHED */
+	return PIGLIT_FAIL;
+}
+
-- 
1.7.10