diff options
| author | Eric Engestrom <eric.engestrom@intel.com> | 2018-11-30 13:43:13 +0000 |
|---|---|---|
| committer | Eric Engestrom <eric.engestrom@intel.com> | 2018-12-04 18:03:18 +0000 |
| commit | 6598b9951fb0d914b08c9d55b592a55f4cf96ae8 (patch) | |
| tree | 825da0530ee657e05b35b19718a71265f4af3102 | |
| parent | 816a85654526ac3f317e195aa25764b28cfccf85 (diff) | |
ext_image_dma_buf_import/unsupported_format has no reason to be intel-only
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
| -rw-r--r-- | tests/opengl.py | 3 | ||||
| -rw-r--r-- | tests/spec/ext_image_dma_buf_import/CMakeLists.gles1.txt | 2 | ||||
| -rw-r--r-- | tests/spec/ext_image_dma_buf_import/unsupported_format.c (renamed from tests/spec/ext_image_dma_buf_import/intel_unsupported_format.c) | 11 |
3 files changed, 3 insertions, 13 deletions
diff --git a/tests/opengl.py b/tests/opengl.py index 8b3275399..2771cb2eb 100644 --- a/tests/opengl.py +++ b/tests/opengl.py @@ -3013,8 +3013,7 @@ with profile.test_list.group_manager( g(['ext_image_dma_buf_import-invalid_attributes'], run_concurrent=False) g(['ext_image_dma_buf_import-missing_attributes'], run_concurrent=False) g(['ext_image_dma_buf_import-ownership_transfer'], run_concurrent=False) - g(['ext_image_dma_buf_import-intel_unsupported_format'], - run_concurrent=False) + g(['ext_image_dma_buf_import-unsupported_format'], run_concurrent=False) g(['ext_image_dma_buf_import-intel_external_sampler_only'], run_concurrent=False) g(['ext_image_dma_buf_import-refcount']) diff --git a/tests/spec/ext_image_dma_buf_import/CMakeLists.gles1.txt b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles1.txt index 39a2b292d..0099f5bec 100644 --- a/tests/spec/ext_image_dma_buf_import/CMakeLists.gles1.txt +++ b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles1.txt @@ -21,7 +21,7 @@ if(PIGLIT_BUILD_DMA_BUF_TESTS) piglit_add_executable(ext_image_dma_buf_import-invalid_attributes invalid_attributes.c image_common.c) piglit_add_executable(ext_image_dma_buf_import-missing_attributes missing_attributes.c image_common.c) piglit_add_executable(ext_image_dma_buf_import-ownership_transfer ownership_transfer.c image_common.c) - piglit_add_executable(ext_image_dma_buf_import-intel_unsupported_format intel_unsupported_format.c image_common.c) + piglit_add_executable(ext_image_dma_buf_import-unsupported_format unsupported_format.c image_common.c) piglit_add_executable(ext_image_dma_buf_import-intel_external_sampler_only intel_external_sampler_only.c image_common.c) endif() diff --git a/tests/spec/ext_image_dma_buf_import/intel_unsupported_format.c b/tests/spec/ext_image_dma_buf_import/unsupported_format.c index 077623740..ee1bb36e0 100644 --- a/tests/spec/ext_image_dma_buf_import/intel_unsupported_format.c +++ b/tests/spec/ext_image_dma_buf_import/unsupported_format.c @@ -26,7 +26,7 @@ #include "image_common.h" /** - * @file intel_unsupported_format.c + * @file unsupported_format.c * * From the EXT_image_dma_buf_import spec: * @@ -97,17 +97,8 @@ piglit_display(void) void piglit_init(int argc, char **argv) { - static const char intel_id[] = "Intel Open Source Technology Center"; - const char *vendor_str; EGLDisplay egl_dpy = eglGetCurrentDisplay(); piglit_require_egl_extension(egl_dpy, "EGL_EXT_image_dma_buf_import"); piglit_require_egl_extension(egl_dpy, "EGL_KHR_image_base"); - - vendor_str = (const char *)glGetString(GL_VENDOR); - - if (strncmp(vendor_str, intel_id, sizeof(intel_id) - 1) != 0) { - printf("Test requires intel gpu\n"); - piglit_report_result(PIGLIT_SKIP); - } } |