[Intel-gfx] [PATCH] spec: add on to Yuanhan's arb_map_buffer_range

[Ben Widawsky]

Yuanhan recently added tests which check for conformance on the API.
This patch goes on top of his to help make a dent in testing
functionality.

Cc: Yuanhan Liu <yuanhan.liu at linux.intel.com>
Cc: Piglit Devs <piglit at lists.freedesktop.org>
Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
---
 tests/all.tests                                    |    1 +
 tests/spec/arb_map_buffer_range/CMakeLists.gl.txt  |    1 +
 .../arb_map_buffer_range/map_buffer_range_test.c   |  131 ++++++++++++++++++++
 3 files changed, 133 insertions(+), 0 deletions(-)
 create mode 100644 tests/spec/arb_map_buffer_range/map_buffer_range_test.c

diff --git a/tests/all.tests b/tests/all.tests
index b24f8e8..667bb34 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1250,6 +1250,7 @@ add_plain_test(arb_instanced_arrays, 'instanced_arrays')
 arb_map_buffer_range = Group()
 spec['ARB_map_buffer_range'] = arb_map_buffer_range
 add_plain_test(arb_map_buffer_range, 'map_buffer_range_error_check')
+add_plain_test(arb_map_buffer_range, 'map_buffer_range_test')
 
 arb_seamless_cube_map = Group()
 spec['ARB_seamless_cube_map'] = arb_seamless_cube_map
diff --git a/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt b/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
index a44d0ca..c595d47 100644
--- a/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
+++ b/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
@@ -12,5 +12,6 @@ link_libraries (
 )
 
 add_executable (map_buffer_range_error_check map_buffer_range_error_check.c)
+add_executable (map_buffer_range_test map_buffer_range_test.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_map_buffer_range/map_buffer_range_test.c b/tests/spec/arb_map_buffer_range/map_buffer_range_test.c
new file mode 100644
index 0000000..12b1839
--- /dev/null
+++ b/tests/spec/arb_map_buffer_range/map_buffer_range_test.c
@@ -0,0 +1,131 @@
+/*
+ * 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"
+
+int piglit_width = 100, piglit_height = 100;
+int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+uint8_t data[1 << 20];
+
+enum piglit_result
+piglit_display(void)
+{
+	return PIGLIT_FAIL;
+}
+
+static bool
+verify_buffer(GLenum target, int offset, int length, void const *compare) {
+	int ret;
+	const void *ptr = glMapBufferRange(target, offset, length, GL_MAP_READ_BIT);
+	ret = memcmp(ptr, compare, length);
+	glUnmapBuffer(target);
+
+	return ret == 0;
+}
+
+/* This test relies on simple patterns, so using offets which are multiples of
+ * 0x100 is bad
+ */
+void
+piglit_init(int argc, char *argv[])
+{
+	uint8_t *ptr;
+	uint8_t temp_data[100];
+	GLenum target = GL_ARRAY_BUFFER;
+	GLenum verify = GL_COPY_WRITE_BUFFER;
+	GLuint handles[2];
+	int i;
+	bool ret;
+
+	piglit_require_extension("GL_ARB_map_buffer_range");
+
+	for (i = 0; i < sizeof(data); i++) {
+		data[i] = i & 0xff;
+	}
+
+	for (i = 0; i < 100; i++) {
+		temp_data[i] = i;
+	}
+
+	glGenBuffersARB(2, handles);
+	glBindBufferARB(target, handles[0]);
+	glBindBufferARB(verify, handles[1]);
+	glBufferData(target, sizeof(data), data, GL_STATIC_DRAW);
+	glBufferData(verify, 0x1000, NULL, GL_STREAM_READ);
+
+	glGetError();
+
+	/* Validate that reads work, this is required for remaining ops */
+	ret = verify_buffer(target, 0x201, 100, &data[0x201]);
+	if (!ret)
+		piglit_report_result(PIGLIT_FAIL);
+
+	/* Test 1: test the invalidate range */
+	ptr = glMapBufferRange(target, 0x10004, 100, GL_MAP_WRITE_BIT |
+						     GL_MAP_INVALIDATE_RANGE_BIT);
+	memcpy(ptr, temp_data, 100);
+	glUnmapBuffer(target);
+	ret = verify_buffer(target, 0x10004, 100, temp_data);
+	if (!ret)
+		piglit_report_result(PIGLIT_FAIL);
+
+	/* Test 2: test unsynchronized writes */
+	ptr = glMapBufferRange(target, 0x50f, 100, GL_MAP_WRITE_BIT |
+						   GL_MAP_UNSYNCHRONIZED_BIT);
+	memcpy(ptr, temp_data, 100);
+	glUnmapBuffer(target);
+	ret = verify_buffer(target, 0x50f, 100, temp_data);
+	if (!ret)
+		piglit_report_result(PIGLIT_FAIL);
+
+	/* Test 3: test explicitly flushed unsynchronized writes 
+	 * 3a: Check if things are magically coherent (unmap doing more than it
+	 * should */
+	ptr = glMapBufferRange(target, 0xa000, 100, GL_MAP_WRITE_BIT |
+						    GL_MAP_FLUSH_EXPLICIT_BIT |
+						    GL_MAP_UNSYNCHRONIZED_BIT);
+	memcpy(ptr, temp_data, 100);
+	glUnmapBuffer(target);
+	glCopyBufferSubData(target, verify, 0xa002, 0, 100);
+	ret = verify_buffer(verify, 0, 100, temp_data);
+	if (ret)
+		fprintf(stderr, "Coherent without flush\n");
+
+	/* 3b: test with flushed range */
+	ptr = glMapBufferRange(target, 0xa002, 100, GL_MAP_WRITE_BIT |
+						    GL_MAP_FLUSH_EXPLICIT_BIT |
+						    GL_MAP_UNSYNCHRONIZED_BIT);
+	memcpy(ptr, temp_data, 100);
+	glFlushMappedBufferRange(target, 0x0, 100);
+	glUnmapBuffer(target);
+	glCopyBufferSubData(target, verify, 0xa002, 100, 100);
+	ret = verify_buffer(verify, 100, 100, temp_data);
+	if (!ret)
+		piglit_report_result(PIGLIT_FAIL);
+
+	piglit_report_result(PIGLIT_PASS);
+}
-- 
1.7.6.4