[Piglit] [PATCH piglit 2/2] ext_image_dma_buf_import/unsupported_format has no reason to be intel-only

[Lionel Landwerlin]

On 30/11/2018 13:59, Eric Engestrom wrote:
> Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>


Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>


> ---
>   tests/opengl.py                                       |  3 +--
>   .../ext_image_dma_buf_import/CMakeLists.gles1.txt     |  2 +-
>   ...ntel_unsupported_format.c => unsupported_format.c} | 11 +----------
>   3 files changed, 3 insertions(+), 13 deletions(-)
>   rename tests/spec/ext_image_dma_buf_import/{intel_unsupported_format.c => unsupported_format.c} (90%)
>
> diff --git a/tests/opengl.py b/tests/opengl.py
> index e4e37148613858c806b4..96e92ae7b642d58ba523 100644
> --- a/tests/opengl.py
> +++ b/tests/opengl.py
> @@ -3013,8 +3013,7 @@ def f(name, format, p1=None, p2=None):
>       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 39a2b292dbb612ea653b..0099f5bece34b9e1ca0d 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
> similarity index 90%
> rename from tests/spec/ext_image_dma_buf_import/intel_unsupported_format.c
> rename to tests/spec/ext_image_dma_buf_import/unsupported_format.c
> index 448274a48aa765a9ee98..408999a14f6f601bfc6d 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:
>    *
> @@ -102,17 +102,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);
> -	}
>   }