v2: Fix comments, add test for passing invalid sync to IsSync(), change variable types.
v3: Minor fixes and add to all.tests --- tests/all.tests | 1 + tests/spec/arb_sync/CMakeLists.gl.txt | 1 + tests/spec/arb_sync/DeleteSync.c | 78 +++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 tests/spec/arb_sync/DeleteSync.c diff --git a/tests/all.tests b/tests/all.tests index 0118cc9..1572088 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -1101,6 +1101,7 @@ arb_sync = Group() spec['ARB_sync'] = arb_sync arb_sync['ClientWaitSync-errors'] = concurrent_test('arb_sync-ClientWaitSync-errors') arb_sync['ClientWaitSync-returns'] = concurrent_test('arb_sync-ClientWaitSync-returns') +arb_sync['DeleteSync'] = concurrent_test('arb_sync-DeleteSync') arb_sync['repeat-wait'] = concurrent_test('arb_sync-repeat-wait') arb_sync['timeout-zero'] = concurrent_test('arb_sync-timeout-zero') add_plain_test(arb_sync, 'sync_api') diff --git a/tests/spec/arb_sync/CMakeLists.gl.txt b/tests/spec/arb_sync/CMakeLists.gl.txt index ff8ca85..54637eb 100644 --- a/tests/spec/arb_sync/CMakeLists.gl.txt +++ b/tests/spec/arb_sync/CMakeLists.gl.txt @@ -12,5 +12,6 @@ link_libraries ( piglit_add_executable (arb_sync-client-wait-errors ClientWaitSync-errors.c) piglit_add_executable (arb_sync-client-wait-returns ClientWaitSync-returns.c) +piglit_add_executable (arb_sync-delete-sync DeleteSync.c) piglit_add_executable (arb_sync-repeat-wait repeat-wait.c) piglit_add_executable (arb_sync-timeout-zero timeout-zero.c) diff --git a/tests/spec/arb_sync/DeleteSync.c b/tests/spec/arb_sync/DeleteSync.c new file mode 100644 index 0000000..7e4be41 --- /dev/null +++ b/tests/spec/arb_sync/DeleteSync.c @@ -0,0 +1,78 @@ +/** + * Copyright © 2013 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 + * Test DeleteSync() returns correct error messages + * + * Section 5.2(Sync Objects and Fences) on p243 of OpenGL 3.2 Core says: + * "DeleteSync will silently ignore a sync value of zero. An INVALID_VALUE + * error is generated if sync is neither zero nor the name of a sync object." + * + */ + +#include "piglit-util-gl-common.h" + +PIGLIT_GL_TEST_CONFIG_BEGIN + + config.supports_gl_compat_version = 10; + config.supports_gl_core_version = 31; + +PIGLIT_GL_TEST_CONFIG_END + +enum piglit_result +piglit_display(void) +{ + /* UNREACHED */ + return PIGLIT_FAIL; +} + +void +piglit_init(int argc, char **argv) +{ + bool pass = true; + GLsync sync; + GLsync invalid = (GLsync) GL_FRONT; + + if (piglit_get_gl_version() < 32) { + piglit_require_extension("GL_ARB_sync"); + } + + /* Test for successful function calls + * DeleteSync will silently ignore a sync value of zero + */ + glDeleteSync(0); + pass = piglit_check_gl_error(GL_NO_ERROR) && pass; + + sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0); + glDeleteSync(sync); + pass = piglit_check_gl_error(GL_NO_ERROR) && pass; + /* Check if sync was deleted */ + pass = !glIsSync(sync) && pass; + + /* Test for unsuccessful function calls */ + glDeleteSync(invalid); + pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass; + + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); +} -- 1.8.3.1 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit