[Piglit] [PATCH] spec/arb_copy_buffer: Add a new test for copy_buffer.

[Ben Widawsky]

This is failing on Intel pre-GEN6, but will be fixed shortly.

Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
---
 tests/all.tests                                    |    4 +
 tests/spec/CMakeLists.txt                          |    1 +
 tests/spec/arb_copy_buffer/CMakeLists.gl.txt       |   16 ++++
 tests/spec/arb_copy_buffer/CMakeLists.txt          |    1 +
 tests/spec/arb_copy_buffer/copy_buffer_coherency.c |   95 ++++++++++++++++++++
 5 files changed, 117 insertions(+), 0 deletions(-)
 create mode 100644 tests/spec/arb_copy_buffer/CMakeLists.gl.txt
 create mode 100644 tests/spec/arb_copy_buffer/CMakeLists.txt
 create mode 100644 tests/spec/arb_copy_buffer/copy_buffer_coherency.c

diff --git a/tests/all.tests b/tests/all.tests
index 530fc5f..8154cb8 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1045,6 +1045,10 @@ nv_conditional_render['drawpixels'] = PlainExecTest(['nv_conditional_render-draw
 nv_conditional_render['generatemipmap'] = PlainExecTest(['nv_conditional_render-generatemipmap', '-auto'])
 nv_conditional_render['vertex_array'] = PlainExecTest(['nv_conditional_render-vertex_array', '-auto'])
 
+arb_copy_buffer = Group()
+spec['ARB_copy_buffer'] = arb_copy_buffer
+add_plain_test(arb_copy_buffer, 'copy_buffer_coherency')
+
 # group glslparsertest ------------------------------------------------------
 glslparsertest = Group()
 # Add all shader source files in the directories below.
diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
index 253544a..f269d8e 100644
--- a/tests/spec/CMakeLists.txt
+++ b/tests/spec/CMakeLists.txt
@@ -13,3 +13,4 @@ add_subdirectory (ext_fog_coord)
 add_subdirectory (nv_conditional_render)
 add_subdirectory (nv_texture_barrier)
 add_subdirectory (arb_draw_elements_base_vertex)
+add_subdirectory (arb_copy_buffer)
diff --git a/tests/spec/arb_copy_buffer/CMakeLists.gl.txt b/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
new file mode 100644
index 0000000..190a131
--- /dev/null
+++ b/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
@@ -0,0 +1,16 @@
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${piglit_SOURCE_DIR}/tests/util
+)
+
+link_libraries (
+	piglitutil
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${GLUT_glut_LIBRARY}
+)
+
+add_executable (copy_buffer_coherency copy_buffer_coherency.c)
+
+# vim: ft=cmake:
diff --git a/tests/spec/arb_copy_buffer/CMakeLists.txt b/tests/spec/arb_copy_buffer/CMakeLists.txt
new file mode 100644
index 0000000..144a306
--- /dev/null
+++ b/tests/spec/arb_copy_buffer/CMakeLists.txt
@@ -0,0 +1 @@
+piglit_include_target_api()
diff --git a/tests/spec/arb_copy_buffer/copy_buffer_coherency.c b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c
new file mode 100644
index 0000000..14ff414
--- /dev/null
+++ b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c
@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2011 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.
+ *
+ * Authors:
+ *    Ben Widawsky <ben at bwidawsk.net>
+ *
+ */
+
+#include "piglit-util.h"
+
+#define CATCH_ERROR \
+	do {\
+		if (glGetError()) \
+			return PIGLIT_FAIL; \
+	} while(0)
+
+#define COPY_BUFFER_SIZE (4<<20)
+uint8_t src_data[COPY_BUFFER_SIZE];
+uint8_t dest_data[COPY_BUFFER_SIZE];
+
+int piglit_width = 400, piglit_height = 300;
+int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+
+enum piglit_result
+piglit_display(void)
+{
+	return PIGLIT_PASS;
+}
+
+static enum piglit_result
+do_copy()
+{
+	GLuint buffer_handles[2];
+
+	glGenBuffersARB(2, buffer_handles);
+	CATCH_ERROR;
+
+	glBindBufferARB(GL_COPY_READ_BUFFER, buffer_handles[0]);
+	CATCH_ERROR;
+	glBindBufferARB(GL_COPY_WRITE_BUFFER, buffer_handles[1]);
+	CATCH_ERROR;
+	glBufferData(GL_COPY_READ_BUFFER, COPY_BUFFER_SIZE, NULL,
+		     GL_STREAM_COPY);
+	CATCH_ERROR;
+	glBufferData(GL_COPY_WRITE_BUFFER, COPY_BUFFER_SIZE, NULL,
+		     GL_STREAM_READ);
+	CATCH_ERROR;
+
+	glBufferSubDataARB(GL_COPY_READ_BUFFER, 0, COPY_BUFFER_SIZE, src_data);
+	CATCH_ERROR;
+
+	glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, 0, 0,
+			    COPY_BUFFER_SIZE);
+	CATCH_ERROR;
+
+	glGetBufferSubDataARB(GL_COPY_WRITE_BUFFER, 0, COPY_BUFFER_SIZE,
+			      dest_data);
+	CATCH_ERROR;
+
+	if (memcmp(src_data, dest_data, COPY_BUFFER_SIZE) != 0)
+		return PIGLIT_FAIL;
+
+	return PIGLIT_PASS;
+}
+
+void
+piglit_init(int argc, char *argv[])
+{
+
+	piglit_require_extension("GL_ARB_vertex_buffer_object");
+	piglit_require_extension("GL_ARB_copy_buffer");
+
+	memset(src_data, 0xff, COPY_BUFFER_SIZE);
+
+	piglit_report_result(do_copy());
+}
-- 
1.7.6