The spec doesn't define any errors for ext_semaphore_fd, but do at least a basic sanity test.
Signed-off-by: Andres Rodriguez <andre...@gmail.com> --- tests/all.py | 6 ++ tests/spec/CMakeLists.txt | 1 + tests/spec/ext_semaphore_fd/CMakeLists.gl.txt | 14 +++++ tests/spec/ext_semaphore_fd/CMakeLists.txt | 1 + tests/spec/ext_semaphore_fd/api-errors.c | 85 +++++++++++++++++++++++++++ 5 files changed, 107 insertions(+) create mode 100644 tests/spec/ext_semaphore_fd/CMakeLists.gl.txt create mode 100644 tests/spec/ext_semaphore_fd/CMakeLists.txt create mode 100644 tests/spec/ext_semaphore_fd/api-errors.c diff --git a/tests/all.py b/tests/all.py index 6269ea4..91c6dbc 100644 --- a/tests/all.py +++ b/tests/all.py @@ -2257,6 +2257,12 @@ with profile.test_list.group_manager( grouptools.join('spec', 'EXT_semaphore')) as g: g(['ext_semaphore-api-errors'], 'api-errors') +# Group EXT_semaphore_fd tests +with profile.test_list.group_manager( + PiglitGLTest, + grouptools.join('spec', 'EXT_semaphore_fd')) as g: + g(['ext_semaphore_fd-api-errors'], 'api-errors') + # Group EXT_texture_format_BGRA8888 tests with profile.test_list.group_manager( PiglitGLTest, diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt index 4e29a84..a0e4142 100644 --- a/tests/spec/CMakeLists.txt +++ b/tests/spec/CMakeLists.txt @@ -91,6 +91,7 @@ add_subdirectory (ext_memory_object) add_subdirectory (ext_packed_depth_stencil) add_subdirectory (ext_packed_float) add_subdirectory (ext_semaphore) +add_subdirectory (ext_semaphore_fd) add_subdirectory (ext_shader_samples_identical) add_subdirectory (ext_texture_env_combine) add_subdirectory (ext_texture_swizzle) diff --git a/tests/spec/ext_semaphore_fd/CMakeLists.gl.txt b/tests/spec/ext_semaphore_fd/CMakeLists.gl.txt new file mode 100644 index 0000000..d90a2f3 --- /dev/null +++ b/tests/spec/ext_semaphore_fd/CMakeLists.gl.txt @@ -0,0 +1,14 @@ +include_directories( + ${GLEXT_INCLUDE_DIR} + ${OPENGL_INCLUDE_PATH} +) + +link_libraries ( + piglitutil_${piglit_target_api} + ${OPENGL_gl_LIBRARY} +) + +piglit_add_executable (ext_semaphore_fd-api-errors api-errors.c) + + +# vim: ft=cmake: diff --git a/tests/spec/ext_semaphore_fd/CMakeLists.txt b/tests/spec/ext_semaphore_fd/CMakeLists.txt new file mode 100644 index 0000000..144a306 --- /dev/null +++ b/tests/spec/ext_semaphore_fd/CMakeLists.txt @@ -0,0 +1 @@ +piglit_include_target_api() diff --git a/tests/spec/ext_semaphore_fd/api-errors.c b/tests/spec/ext_semaphore_fd/api-errors.c new file mode 100644 index 0000000..b0e14b6 --- /dev/null +++ b/tests/spec/ext_semaphore_fd/api-errors.c @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2017 Valve 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 on + * the rights to use, copy, modify, merge, publish, distribute, sub license, + * 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 NON-INFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS AND/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. + */ + +/** + * Tests that api errors are thrown where expected for the + * GL_EXT_semaphore_fd extension. + */ + +#include "piglit-util-gl.h" + +PIGLIT_GL_TEST_CONFIG_BEGIN + + config.supports_gl_compat_version = 10; + config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; + +PIGLIT_GL_TEST_CONFIG_END + +static bool +test_import_semaphore_fd_enum_errors() +{ + GLuint sem; + int fd = -1; + + glGenSemaphoresEXT(1, &sem); + + /** + * The spec does not define any errors for ImportSemaphoreFdEXT, + * but we should at least make sure this doesn't succeed. + */ + glImportSemaphoreFdEXT(sem, GL_NONE, fd); + + return piglit_check_gl_error(GL_INVALID_ENUM); +} + +#define X(f, desc) \ + do { \ + const bool subtest_pass = (f); \ + piglit_report_subtest_result(subtest_pass \ + ? PIGLIT_PASS : PIGLIT_FAIL, \ + (desc)); \ + pass = pass && subtest_pass; \ + } while (0) + +enum piglit_result +piglit_display(void) +{ + bool pass = true; + + X(test_import_semaphore_fd_enum_errors(), "import-semaphore-fd-bad-enum"); + + return pass ? PIGLIT_PASS : PIGLIT_FAIL; +} + + +void +piglit_init(int argc, char **argv) +{ + /* From the EXT_external_objects_fd spec: + * + * "GL_EXT_semaphore_fd requires GL_EXT_semaphore" + */ + piglit_require_extension("GL_EXT_semaphore"); + piglit_require_extension("GL_EXT_semaphore_fd"); +} -- 2.9.3 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit