The offset and size parameters of glClearBufferSubData have to oblige to some restrictions. Violate these and check for errors.
Signed-off-by: Fabian Bieler <[email protected]> --- tests/all.py | 3 + .../spec/arb_clear_buffer_object/CMakeLists.gl.txt | 3 + .../arb_clear_buffer_object/sub-invalid-size.c | 90 ++++++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 tests/spec/arb_clear_buffer_object/sub-invalid-size.c diff --git a/tests/all.py b/tests/all.py index b9b5b3e..e6cff7b 100644 --- a/tests/all.py +++ b/tests/all.py @@ -3050,6 +3050,9 @@ add_concurrent_test(arb_clear_buffer_object, 'arb_clear_buffer_object-formats') add_concurrent_test(arb_clear_buffer_object, 'arb_clear_buffer_object-invalid-internal-format') add_concurrent_test(arb_clear_buffer_object, 'arb_clear_buffer_object-invalid-size') 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') 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 7eb6bd4..49a622a 100644 --- a/tests/spec/arb_clear_buffer_object/CMakeLists.gl.txt +++ b/tests/spec/arb_clear_buffer_object/CMakeLists.gl.txt @@ -12,5 +12,8 @@ piglit_add_executable (arb_clear_buffer_object-formats formats.c common.c) piglit_add_executable (arb_clear_buffer_object-invalid-internal-format invalid-internal-format.c) piglit_add_executable (arb_clear_buffer_object-invalid-size invalid-size.c) 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) # vim: ft=cmake: diff --git a/tests/spec/arb_clear_buffer_object/sub-invalid-size.c b/tests/spec/arb_clear_buffer_object/sub-invalid-size.c new file mode 100644 index 0000000..c5c244f --- /dev/null +++ b/tests/spec/arb_clear_buffer_object/sub-invalid-size.c @@ -0,0 +1,90 @@ +/* + * 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-invalid-size.c + * + * From the GL_ARB_clear_buffer_object spec: + * "If <offset> or <size> is less than zero, or if <offset> + <size> is greater + * than the value of BUFFER_SIZE for the buffer bound to <target> then the + * error INVALID_VALUE is generated." + * and + * "Both <offset> and <range> must be multiples of the number of basic machine + * units per-element for that internal format specified by <internalformat>, + * otherwise the error INVALID_VALUE is generated." + */ + +#include "piglit-util-gl-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; + int i; + const int buffer_size = 1<<20; + unsigned int buffer; + static const char *const data_zero = "\x00\x00\x00\x00\x00\x00\x00\x00"; + ptrdiff_t ranges[][2] = { + {-8, buffer_size}, + {16, -8}, + {buffer_size - 8, 16}, + + /* We're using GL_RGBA16 which is 8 bytes wide. */ + {4, 8}, + {8, 12}, + }; + + 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); + + for (i = 0; i < ARRAY_SIZE(ranges); ++i) { + pass = piglit_check_gl_error(GL_NO_ERROR) && pass; + glClearBufferSubData(GL_ARRAY_BUFFER, GL_RGBA16, ranges[i][0], + ranges[i][1], GL_RGBA, GL_UNSIGNED_SHORT, + data_zero); + pass = piglit_check_gl_error(GL_INVALID_VALUE) && 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 _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
