On 08/20/2013 11:26 AM, Nicholas Mack wrote:
v2: Fix comments, remove unnecessary tests. --- tests/spec/arb_sync/CMakeLists.gl.txt | 1 + tests/spec/arb_sync/FenceSync-errors.c | 71 ++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 tests/spec/arb_sync/FenceSync-errors.cdiff --git a/tests/spec/arb_sync/CMakeLists.gl.txt b/tests/spec/arb_sync/CMakeLists.gl.txt index 54637eb..bbeab54 100644 --- a/tests/spec/arb_sync/CMakeLists.gl.txt +++ b/tests/spec/arb_sync/CMakeLists.gl.txt @@ -13,5 +13,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-fence-errors FenceSync-errors.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/FenceSync-errors.c b/tests/spec/arb_sync/FenceSync-errors.c new file mode 100644 index 0000000..a5d4d78 --- /dev/null +++ b/tests/spec/arb_sync/FenceSync-errors.c @@ -0,0 +1,71 @@ +/** + * 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. + */ + +/** + * Test FenceSync() returns correct error messages for invalid input + * + * Section 5.2(Sync Objects and Fences) of OpenGL 3.2 Core says: + * "An INVALID_ENUM error is generated if condition is not + * SYNC_GPU_COMMANDS_COMPLETE. If flags is not zero, an INVALID_VALUE + * error is generated." + * + */ + +#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 a, b; + + if (piglit_get_gl_version() < 32) { + piglit_require_extension("GL_ARB_sync"); + } + + /* test that an invalid condition results in INVALID_ENUM */ + a = glFenceSync(GL_NONE, 0); + pass = piglit_check_gl_error(GL_INVALID_ENUM) && pass; + glDeleteSync(a); + + /* test that invalid flag value results in INVALID_VALUE */ + b = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 1); + pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass; + glDeleteSync(b); + + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); +}
This test looks correct, but the patch needs to to add it to all.tests. Do that and patch 5 is Reviewed-by: Chad Versace <[email protected]> I'm done reviewing today, since it's a Friday afternoon. I'll pick the series back up on Monday. _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
