summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Rodriguez <andresx7@gmail.com>2017-12-21 14:54:11 -0500
committerAndres Rodriguez <andresx7@gmail.com>2018-01-30 15:23:47 -0500
commita4098680b7396990a1d31e935a3d362dba163b47 (patch)
tree41f9e0da24f633e931ac489fc5075260f80e701e
parent58c0e877eb323d4d3876b73ddbcf2ef14ff626eb (diff)
ext_semaphore: add basic api error checking
Signed-off-by: Andres Rodriguez <andresx7@gmail.com>
-rw-r--r--tests/all.py6
-rw-r--r--tests/spec/CMakeLists.txt1
-rw-r--r--tests/spec/ext_semaphore/CMakeLists.gl.txt14
-rw-r--r--tests/spec/ext_semaphore/CMakeLists.txt1
-rw-r--r--tests/spec/ext_semaphore/api-errors.c158
5 files changed, 180 insertions, 0 deletions
diff --git a/tests/all.py b/tests/all.py
index 2a2c31aee..538e9c493 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -2289,6 +2289,12 @@ with profile.test_list.group_manager(
grouptools.join('spec', 'EXT_memory_object')) as g:
g(['ext_memory_object-api-errors'], 'api-errors')
+# Group EXT_semaphore tests
+with profile.test_list.group_manager(
+ PiglitGLTest,
+ grouptools.join('spec', 'EXT_semaphore')) as g:
+ g(['ext_semaphore-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 360d0157b..d3f0c1e5a 100644
--- a/tests/spec/CMakeLists.txt
+++ b/tests/spec/CMakeLists.txt
@@ -92,6 +92,7 @@ add_subdirectory (ext_framebuffer_object)
add_subdirectory (ext_memory_object)
add_subdirectory (ext_packed_depth_stencil)
add_subdirectory (ext_packed_float)
+add_subdirectory (ext_semaphore)
add_subdirectory (ext_shader_samples_identical)
add_subdirectory (ext_texture_env_combine)
add_subdirectory (ext_texture_swizzle)
diff --git a/tests/spec/ext_semaphore/CMakeLists.gl.txt b/tests/spec/ext_semaphore/CMakeLists.gl.txt
new file mode 100644
index 000000000..a57db7d3e
--- /dev/null
+++ b/tests/spec/ext_semaphore/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-api-errors api-errors.c)
+
+
+# vim: ft=cmake:
diff --git a/tests/spec/ext_semaphore/CMakeLists.txt b/tests/spec/ext_semaphore/CMakeLists.txt
new file mode 100644
index 000000000..144a306f4
--- /dev/null
+++ b/tests/spec/ext_semaphore/CMakeLists.txt
@@ -0,0 +1 @@
+piglit_include_target_api()
diff --git a/tests/spec/ext_semaphore/api-errors.c b/tests/spec/ext_semaphore/api-errors.c
new file mode 100644
index 000000000..a7fd93ade
--- /dev/null
+++ b/tests/spec/ext_semaphore/api-errors.c
@@ -0,0 +1,158 @@
+/*
+ * 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 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_get_unsigned_byte_v_enum_errors()
+{
+ GLubyte data[GL_UUID_SIZE_EXT];
+
+ glGetUnsignedBytevEXT(UINT32_MAX, data);
+
+ return piglit_check_gl_error(GL_INVALID_ENUM);
+}
+
+static bool
+test_get_unsigned_byte_i_v_enum_errors()
+{
+ GLubyte data[GL_UUID_SIZE_EXT];
+
+ glGetUnsignedBytei_vEXT(UINT32_MAX, 0, data);
+
+ return piglit_check_gl_error(GL_INVALID_ENUM);
+}
+
+static bool
+test_get_unsigned_byte_i_v_value_errors()
+{
+ GLubyte data[GL_UUID_SIZE_EXT];
+ GLint numDevices;
+
+ glGetIntegerv(GL_NUM_DEVICE_UUIDS_EXT, &numDevices);
+
+ glGetUnsignedBytei_vEXT(GL_DEVICE_UUID_EXT, numDevices + 1, data);
+
+ return piglit_check_gl_error(GL_INVALID_VALUE);
+}
+
+static bool
+test_gen_semaphores_value_errors()
+{
+ GLuint sem;
+
+ glGenSemaphoresEXT(-1, &sem);
+
+ return piglit_check_gl_error(GL_INVALID_VALUE);
+}
+
+static bool
+test_delete_semaphores_value_errors()
+{
+ GLuint sem;
+
+ glDeleteSemaphoresEXT(-1, &sem);
+
+ return piglit_check_gl_error(GL_INVALID_VALUE);
+}
+
+static bool
+test_semaphore_parameter_enum_errors()
+{
+ GLuint sem;
+ GLuint64 param;
+
+ glGenSemaphoresEXT(1, &sem);
+
+ /**
+ * The spec does not define any valid parameters
+ * in EXT_external_objects or in EXT_external_objects_fd
+ */
+ glSemaphoreParameterui64vEXT(0, sem, &param);
+
+ return piglit_check_gl_error(GL_INVALID_ENUM);
+}
+
+static bool
+test_get_semaphore_parameter_enum_errors()
+{
+ GLuint sem;
+ GLuint64 param;
+
+ glGenSemaphoresEXT(1, &sem);
+ glGetSemaphoreParameterui64vEXT(0, sem, &param);
+
+ 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_get_unsigned_byte_v_enum_errors(), "usigned-byte-v-bad-enum");
+ X(test_get_unsigned_byte_i_v_enum_errors(), "usigned-byte-i-v-bad-enum");
+ X(test_get_unsigned_byte_i_v_value_errors(), "usigned-byte-i-v-bad-value");
+
+ X(test_gen_semaphores_value_errors(), "gen-semaphores-bad-value");
+ X(test_delete_semaphores_value_errors(), "gen-semaphores-bad-value");
+ X(test_delete_semaphores_value_errors(), "gen-semaphores-bad-value");
+
+ X(test_semaphore_parameter_enum_errors(), "semaphore-parameter-bad-enum");
+ X(test_get_semaphore_parameter_enum_errors(), "get-semaphore-parameter-bad-enum");
+
+ return pass ? PIGLIT_PASS : PIGLIT_FAIL;
+}
+
+
+void
+piglit_init(int argc, char **argv)
+{
+ /* From the EXT_external_objects spec:
+ *
+ * "GL_EXT_semaphore requires OpenGL 1.0."
+ */
+ piglit_require_extension("GL_EXT_semaphore");
+}