[Piglit] [PATCH 08/11] arb_clear_buffer_object: Clear partially mapped buffer.
Fabian Bieler
fabianbieler at fastmail.fm
Tue Feb 18 14:31:14 PST 2014
>From the spec:
"An INVALID_OPERATION error is generated if any part of the specified
range of the buffer bound to <target> is currently mapped."
This allows to clear a range of a buffer even if another, non-overlapping range
of that buffer is currently mapped.
Signed-off-by: Fabian Bieler <fabianbieler at fastmail.fm>
---
tests/all.py | 1 +
.../spec/arb_clear_buffer_object/CMakeLists.gl.txt | 1 +
tests/spec/arb_clear_buffer_object/sub-mapped.c | 103 +++++++++++++++++++++
3 files changed, 105 insertions(+)
create mode 100644 tests/spec/arb_clear_buffer_object/sub-mapped.c
diff --git a/tests/all.py b/tests/all.py
index e6cff7b..6448148 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -3053,6 +3053,7 @@ add_concurrent_test(arb_clear_buffer_object, 'arb_clear_buffer_object-mapped')
add_concurrent_test(arb_clear_buffer_object, 'arb_clear_buffer_object-no-bound-buffer')
add_concurrent_test(arb_clear_buffer_object, 'arb_clear_buffer_object-null-data')
add_concurrent_test(arb_clear_buffer_object, 'arb_clear_buffer_object-sub-invalid-size')
+add_concurrent_test(arb_clear_buffer_object, 'arb_clear_buffer_object-sub-mapped')
arb_copy_buffer = Group()
spec['ARB_copy_buffer'] = arb_copy_buffer
diff --git a/tests/spec/arb_clear_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_clear_buffer_object/CMakeLists.gl.txt
index 49a622a..cd2b31f 100644
--- a/tests/spec/arb_clear_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_clear_buffer_object/CMakeLists.gl.txt
@@ -15,5 +15,6 @@ piglit_add_executable (arb_clear_buffer_object-mapped mapped.c)
piglit_add_executable (arb_clear_buffer_object-no-bound-buffer no-bound-buffer.c)
piglit_add_executable (arb_clear_buffer_object-null-data null-data.c common.c)
piglit_add_executable (arb_clear_buffer_object-sub-invalid-size sub-invalid-size.c)
+piglit_add_executable (arb_clear_buffer_object-sub-mapped sub-mapped.c common.c)
# vim: ft=cmake:
diff --git a/tests/spec/arb_clear_buffer_object/sub-mapped.c b/tests/spec/arb_clear_buffer_object/sub-mapped.c
new file mode 100644
index 0000000..5cb3c69
--- /dev/null
+++ b/tests/spec/arb_clear_buffer_object/sub-mapped.c
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2014 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 sub-mapped.c
+ *
+ * From the GL_ARB_clear_buffer_object spec:
+ * "An INVALID_OPERATION error is generated if any part of the specified range
+ * of the buffer bound to <target> is currently mapped."
+ *
+ * This implies that it is allowed e.g. clear the upper half of a buffer
+ * while the lower half is mapped.
+ */
+
+#include "piglit-util-gl-common.h"
+#include "common.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_compat_version = 15;
+ config.supports_gl_core_version = 31;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+enum piglit_result
+piglit_display(void)
+{
+ return PIGLIT_PASS;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+ bool pass = true;
+ const int buffer_size = 1<<20;
+ unsigned int buffer;
+ char *mapped_data;
+ static const char *const data_zero = "\x00\x00\x00\x00";
+ static const char *const data_one = "\xff\xff\xff\xff";
+ static const char *const data_init = "\xff\xff\xff\xff"
+ "\xff\xff\xff\xff"
+ "\x00\x00\x00\x00"
+ "\x00\x00\x00\x00"
+ "\x55\x55\x55\x55"
+ "\x55\x55\x55\x55"
+ "\xaa\xaa\xaa\xaa"
+ "\xaa\xaa\xaa\xaa"
+ "\xff\x00\xff\x00"
+ "\xff\x00\xff\x00"
+ "\x00\xff\x00\xff"
+ "\x00\xff\x00\xff"
+ "\x91\xcc\x45\x36"
+ "\xd3\xe4\xe3\x5b"
+ "\x79\x1e\x21\x39"
+ "\xa8\xfa\x69\x6a";
+
+
+ piglit_require_extension("GL_ARB_clear_buffer_object");
+
+ glGenBuffers(1, &buffer);
+ glBindBuffer(GL_ARRAY_BUFFER, buffer);
+ glBufferData(GL_ARRAY_BUFFER, buffer_size, NULL, GL_STREAM_READ);
+ fill_array_buffer(64, data_init);
+
+ mapped_data = glMapBufferRange(GL_ARRAY_BUFFER, 0, buffer_size/2,
+ GL_MAP_WRITE_BIT);
+ memset(mapped_data, '\x00', buffer_size/2);
+ glClearBufferSubData(GL_ARRAY_BUFFER, GL_RGBA8, buffer_size/2,
+ buffer_size/2, GL_RGBA, GL_UNSIGNED_BYTE, data_one);
+ glUnmapBuffer(GL_ARRAY_BUFFER);
+
+ pass = check_array_buffer_sub_data(0, buffer_size/2,
+ 4, data_zero) && pass;
+ pass = check_array_buffer_sub_data(buffer_size/2, buffer_size/2,
+ 4, data_one) && pass;
+
+ glBindBuffer(GL_ARRAY_BUFFER, 0);
+ glDeleteBuffers(1, &buffer);
+
+ pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
+
+ piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
--
1.8.3.2
More information about the Piglit
mailing list