[Piglit] [PATCH 5/7] ARB_copy_buffer/dlist: New test for spec behavior.

Eric Anholt eric at anholt.net
Wed Jan 25 17:36:13 PST 2012


---
 tests/all.tests                              |    1 +
 tests/spec/arb_copy_buffer/CMakeLists.gl.txt |    1 +
 tests/spec/arb_copy_buffer/dlist.c           |  102 ++++++++++++++++++++++++++
 3 files changed, 104 insertions(+), 0 deletions(-)
 create mode 100644 tests/spec/arb_copy_buffer/dlist.c

diff --git a/tests/all.tests b/tests/all.tests
index 1288912..e9fb993 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1607,6 +1607,7 @@ arb_copy_buffer = Group()
 spec['ARB_copy_buffer'] = arb_copy_buffer
 add_plain_test(arb_copy_buffer, 'copy_buffer_coherency')
 add_plain_test(arb_copy_buffer, 'copybuffersubdata')
+arb_copy_buffer['dlist'] = concurrent_test('arb_copy_buffer-dlist')
 arb_copy_buffer['negative-bound-zero'] = concurrent_test('arb_copy_buffer-negative-bound-zero')
 arb_copy_buffer['negative-bounds'] = concurrent_test('arb_copy_buffer-negative-bounds')
 arb_copy_buffer['negative-mapped'] = concurrent_test('arb_copy_buffer-negative-mapped')
diff --git a/tests/spec/arb_copy_buffer/CMakeLists.gl.txt b/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
index 9b683db..7a63435 100644
--- a/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
+++ b/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
@@ -13,6 +13,7 @@ link_libraries (
 
 add_executable (copy_buffer_coherency copy_buffer_coherency.c)
 add_executable (copybuffersubdata copybuffersubdata.c)
+add_executable (arb_copy_buffer-dlist dlist.c)
 add_executable (arb_copy_buffer-overlap overlap.c)
 add_executable (arb_copy_buffer-negative-bound-zero negative-bound-zero.c)
 add_executable (arb_copy_buffer-negative-bounds negative-bounds.c)
diff --git a/tests/spec/arb_copy_buffer/dlist.c b/tests/spec/arb_copy_buffer/dlist.c
new file mode 100644
index 0000000..8caf340
--- /dev/null
+++ b/tests/spec/arb_copy_buffer/dlist.c
@@ -0,0 +1,102 @@
+/*
+ * 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 dlist.c
+ *
+ * Tests the following piece of the GL_ARB_copy_buffer spec:
+ *
+ *     "Add to the list (page 310) of "Vertex Buffer Objects" commands "not
+ *      compiled into the display list but are executed immediately":
+ *
+ *          CopyBufferSubData"
+ */
+
+#include "piglit-util.h"
+
+int piglit_width = 100, piglit_height = 100;
+int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+
+enum piglit_result
+piglit_display(void)
+{
+	/* uncreached */
+	return PIGLIT_FAIL;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+	GLuint bufs[2], list;
+	uint8_t data[8];
+	uint8_t bad_data[8];
+	int i;
+	void *ptr;
+
+	piglit_require_extension("GL_ARB_copy_buffer");
+
+	glGenBuffers(2, bufs);
+
+	for (i = 0; i < ARRAY_SIZE(data); i++)
+		data[i] = i;
+
+	memset(bad_data, 0xd0, sizeof(bad_data));
+
+	glBindBuffer(GL_COPY_READ_BUFFER, bufs[0]);
+	glBufferData(GL_COPY_READ_BUFFER, sizeof(data), data,
+		     GL_DYNAMIC_DRAW);
+	glBindBuffer(GL_COPY_WRITE_BUFFER, bufs[1]);
+	glBufferData(GL_COPY_WRITE_BUFFER, sizeof(bad_data), bad_data,
+		     GL_DYNAMIC_DRAW);
+
+	list = glGenLists(1);
+	glNewList(list, GL_COMPILE);
+	glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER,
+			    0, 0, sizeof(data));
+	glEndList();
+
+	/* Make sure that it immediately executed. */
+	ptr = glMapBuffer(GL_COPY_WRITE_BUFFER, GL_READ_ONLY);
+	if (memcmp(ptr, data, sizeof(data))) {
+		fprintf(stderr,
+			"data not copied during display list compile\n");
+		piglit_report_result(PIGLIT_FAIL);
+	}
+	glUnmapBuffer(GL_COPY_WRITE_BUFFER);
+
+	/* Now, make sure that it isn't in the list. */
+	glBufferData(GL_COPY_WRITE_BUFFER, sizeof(bad_data), bad_data,
+		     GL_DYNAMIC_DRAW);
+	glCallList(list);
+
+	ptr = glMapBuffer(GL_COPY_WRITE_BUFFER, GL_READ_ONLY);
+	if (memcmp(ptr, bad_data, sizeof(bad_data))) {
+		fprintf(stderr,
+			"data copied during display list execute\n");
+		piglit_report_result(PIGLIT_FAIL);
+	}
+	glUnmapBuffer(GL_COPY_WRITE_BUFFER);
+
+	glDeleteBuffers(2, bufs);
+
+	piglit_report_result(PIGLIT_PASS);
+}
-- 
1.7.7.3



More information about the Piglit mailing list