Add test for external sampler with 2D tex

Submitted by Aditya Swarup on Feb. 2, 2019, 8:42 a.m.

Details

Message ID 20190202084237.22026-1-aditya.swarup@intel.com
State New
Headers show
Series "Add test for external sampler with 2D tex" ( rev: 1 ) in Piglit

Not browsing as part of any series.

Commit Message

Aditya Swarup Feb. 2, 2019, 8:42 a.m.
Commit 649c149dbb96ac367 removed the test for intel external sampler
with dma only because of failure due to commit a5c39ed974402c -
("i965: Lift restriction in external textures for EGLImage support").
Since, there is no test coverage for external sampler with 2D tex,
adding the test with modifications to pass for external sampler using
EGLImage with 2D tex.

Signed-off-by: Aditya Swarup <aditya.swarup@intel.com>
Cc: Tapani Pälli <tapani.palli@intel.com>
Cc: Kenneth Graunke <kenneth@whitecape.org>
---
This test case covers the scenario of binding a texture ID of type GL_TEXTURE_EXTERNAL with EGLImage created using 2D texture. 

This test is not covered in deqp but in CTS SKQP test - CtsSkQPTestCases "#unitTest_EGLImageTest". Explanation in https://bugs.freedesktop.org/show_bug.cgi?id=105301.

It would be nice to have test coverage in piglit as well, so that we come to know if this scenario is broken in near future. 

 tests/opengl.py                               |   2 +
 .../CMakeLists.gles2.txt                      |   1 +
 .../intel_external_sampler_with_2D_tex.c      | 103 ++++++++++++++++++
 3 files changed, 106 insertions(+)
 create mode 100644 tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_2D_tex.c

Patch hide | download patch | download mbox

diff --git a/tests/opengl.py b/tests/opengl.py
index af68560bf..926af2036 100644
--- a/tests/opengl.py
+++ b/tests/opengl.py
@@ -3017,6 +3017,8 @@  with profile.test_list.group_manager(
     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-intel_external_sampler_with_2D_tex'],
+      run_concurrent=False)
     g(['ext_image_dma_buf_import-refcount'])
     g(['ext_image_dma_buf_import-sample_rgb', '-fmt=AR24'],
       'ext_image_dma_buf_import-sample_argb8888', run_concurrent=False)
diff --git a/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
index f99a5d800..c22aeed73 100644
--- a/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
+++ b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
@@ -19,6 +19,7 @@  if(PIGLIT_BUILD_DMA_BUF_TESTS)
 	piglit_add_executable(ext_image_dma_buf_import-refcount refcount.c sample_common.c image_common.c)
 	piglit_add_executable(ext_image_dma_buf_import-sample_yuv sample_yuv.c sample_common.c image_common.c)
 	piglit_add_executable(ext_image_dma_buf_import-sample_rgb sample_rgb.c sample_common.c image_common.c)
+	piglit_add_executable(ext_image_dma_buf_import-intel_external_sampler_with_2D_tex intel_external_sampler_with_2D_tex.c image_common.c)
 	piglit_add_executable(ext_image_dma_buf_import-transcode-nv12-as-r8-gr88 transcode-nv12-as-r8-gr88.c image_common.c)
 endif()
 
diff --git a/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_2D_tex.c b/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_2D_tex.c
new file mode 100644
index 000000000..82e6a201e
--- /dev/null
+++ b/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_2D_tex.c
@@ -0,0 +1,103 @@ 
+/*
+ * 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.
+ */
+
+#include "image_common.h"
+
+/**
+ * @file intel_external_sampler_with_2D_tex.c
+ *
+ * Intel driver allows image external sampler to be used with regular 2D-texutre
+ * and imported dma buffers. This test creates an egl image based on a 2D-texture,
+ * attempts to use the image as target for an external texture, and should pass.
+ *
+ */
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+	config.supports_gl_es_version = 10;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+static EGLImageKHR
+create_tex_based_egl_image(unsigned w, unsigned h, const unsigned char *pixels)
+{
+	GLuint tex;
+	EGLImageKHR img;
+
+	glGenTextures(1, &tex);
+	glBindTexture(GL_TEXTURE_2D, tex);
+
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA,
+	       GL_UNSIGNED_BYTE, pixels);
+
+	img = eglCreateImageKHR(eglGetCurrentDisplay(), eglGetCurrentContext(),
+	       EGL_GL_TEXTURE_2D_KHR, (EGLClientBuffer)(intptr_t)tex, 0);
+	if (!img)
+	       printf("failed to create EGL image out of texture\n");
+
+	glDeleteTextures(1, &tex);
+
+	return img;
+}
+
+enum piglit_result
+piglit_display(void)
+{
+	GLuint tex;
+	enum piglit_result result = PIGLIT_FAIL;
+	const unsigned char src[] = { 0x00, 0x00, 0x00, 0x00 };
+	EGLImageKHR img = create_tex_based_egl_image(1, 1, src);
+
+	if (img == EGL_NO_IMAGE_KHR)
+	       return PIGLIT_FAIL;
+
+	glGenTextures(1, &tex);
+	glBindTexture(GL_TEXTURE_EXTERNAL_OES, tex);
+
+	glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES,
+			       (GLeglImageOES)img);
+
+	if (piglit_check_gl_error(GL_NO_ERROR))
+	       result = PIGLIT_PASS;
+
+	glDeleteTextures(1, &tex);
+	eglDestroyImageKHR(eglGetCurrentDisplay(), img);
+
+	return result;
+}
+
+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_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);
+	}
+}

Comments

FWIW, the skqp test is run constantly in mesa ci:

https://mesa-ci.01.org/mesa_master/builds/15138/results/174306816


Aditya Swarup <aditya.swarup@intel.com> writes:

> Commit 649c149dbb96ac367 removed the test for intel external sampler
> with dma only because of failure due to commit a5c39ed974402c -
> ("i965: Lift restriction in external textures for EGLImage support").
> Since, there is no test coverage for external sampler with 2D tex,
> adding the test with modifications to pass for external sampler using
> EGLImage with 2D tex.
>
> Signed-off-by: Aditya Swarup <aditya.swarup@intel.com>
> Cc: Tapani Pälli <tapani.palli@intel.com>
> Cc: Kenneth Graunke <kenneth@whitecape.org>
> ---
> This test case covers the scenario of binding a texture ID of type GL_TEXTURE_EXTERNAL with EGLImage created using 2D texture. 
>
> This test is not covered in deqp but in CTS SKQP test - CtsSkQPTestCases "#unitTest_EGLImageTest". Explanation in https://bugs.freedesktop.org/show_bug.cgi?id=105301.
>
> It would be nice to have test coverage in piglit as well, so that we come to know if this scenario is broken in near future. 
>
>  tests/opengl.py                               |   2 +
>  .../CMakeLists.gles2.txt                      |   1 +
>  .../intel_external_sampler_with_2D_tex.c      | 103 ++++++++++++++++++
>  3 files changed, 106 insertions(+)
>  create mode 100644 tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_2D_tex.c
>
> diff --git a/tests/opengl.py b/tests/opengl.py
> index af68560bf..926af2036 100644
> --- a/tests/opengl.py
> +++ b/tests/opengl.py
> @@ -3017,6 +3017,8 @@ with profile.test_list.group_manager(
>      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-intel_external_sampler_with_2D_tex'],
> +      run_concurrent=False)
>      g(['ext_image_dma_buf_import-refcount'])
>      g(['ext_image_dma_buf_import-sample_rgb', '-fmt=AR24'],
>        'ext_image_dma_buf_import-sample_argb8888', run_concurrent=False)
> diff --git a/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
> index f99a5d800..c22aeed73 100644
> --- a/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
> +++ b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
> @@ -19,6 +19,7 @@ if(PIGLIT_BUILD_DMA_BUF_TESTS)
>  	piglit_add_executable(ext_image_dma_buf_import-refcount refcount.c sample_common.c image_common.c)
>  	piglit_add_executable(ext_image_dma_buf_import-sample_yuv sample_yuv.c sample_common.c image_common.c)
>  	piglit_add_executable(ext_image_dma_buf_import-sample_rgb sample_rgb.c sample_common.c image_common.c)
> +	piglit_add_executable(ext_image_dma_buf_import-intel_external_sampler_with_2D_tex intel_external_sampler_with_2D_tex.c image_common.c)
>  	piglit_add_executable(ext_image_dma_buf_import-transcode-nv12-as-r8-gr88 transcode-nv12-as-r8-gr88.c image_common.c)
>  endif()
>  
> diff --git a/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_2D_tex.c b/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_2D_tex.c
> new file mode 100644
> index 000000000..82e6a201e
> --- /dev/null
> +++ b/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_2D_tex.c
> @@ -0,0 +1,103 @@
> +/*
> + * 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.
> + */
> +
> +#include "image_common.h"
> +
> +/**
> + * @file intel_external_sampler_with_2D_tex.c
> + *
> + * Intel driver allows image external sampler to be used with regular 2D-texutre
> + * and imported dma buffers. This test creates an egl image based on a 2D-texture,
> + * attempts to use the image as target for an external texture, and should pass.
> + *
> + */
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> +	config.supports_gl_es_version = 10;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +static EGLImageKHR
> +create_tex_based_egl_image(unsigned w, unsigned h, const unsigned char *pixels)
> +{
> +	GLuint tex;
> +	EGLImageKHR img;
> +
> +	glGenTextures(1, &tex);
> +	glBindTexture(GL_TEXTURE_2D, tex);
> +
> +	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA,
> +	       GL_UNSIGNED_BYTE, pixels);
> +
> +	img = eglCreateImageKHR(eglGetCurrentDisplay(), eglGetCurrentContext(),
> +	       EGL_GL_TEXTURE_2D_KHR, (EGLClientBuffer)(intptr_t)tex, 0);
> +	if (!img)
> +	       printf("failed to create EGL image out of texture\n");
> +
> +	glDeleteTextures(1, &tex);
> +
> +	return img;
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> +	GLuint tex;
> +	enum piglit_result result = PIGLIT_FAIL;
> +	const unsigned char src[] = { 0x00, 0x00, 0x00, 0x00 };
> +	EGLImageKHR img = create_tex_based_egl_image(1, 1, src);
> +
> +	if (img == EGL_NO_IMAGE_KHR)
> +	       return PIGLIT_FAIL;
> +
> +	glGenTextures(1, &tex);
> +	glBindTexture(GL_TEXTURE_EXTERNAL_OES, tex);
> +
> +	glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES,
> +			       (GLeglImageOES)img);
> +
> +	if (piglit_check_gl_error(GL_NO_ERROR))
> +	       result = PIGLIT_PASS;
> +
> +	glDeleteTextures(1, &tex);
> +	eglDestroyImageKHR(eglGetCurrentDisplay(), img);
> +
> +	return result;
> +}
> +
> +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_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);
> +	}
> +}
> -- 
> 2.17.1
>
> _______________________________________________
> Piglit mailing list
> Piglit@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/piglit
On 02/02/2019 08:42, Aditya Swarup wrote:
> Commit 649c149dbb96ac367 removed the test for intel external sampler
> with dma only because of failure due to commit a5c39ed974402c -
> ("i965: Lift restriction in external textures for EGLImage support").
> Since, there is no test coverage for external sampler with 2D tex,
> adding the test with modifications to pass for external sampler using
> EGLImage with 2D tex.
>
> Signed-off-by: Aditya Swarup <aditya.swarup@intel.com>
> Cc: Tapani Pälli <tapani.palli@intel.com>
> Cc: Kenneth Graunke <kenneth@whitecape.org>
> ---
> This test case covers the scenario of binding a texture ID of type GL_TEXTURE_EXTERNAL with EGLImage created using 2D texture.
>
> This test is not covered in deqp but in CTS SKQP test - CtsSkQPTestCases "#unitTest_EGLImageTest". Explanation in https://bugs.freedesktop.org/show_bug.cgi?id=105301.
>
> It would be nice to have test coverage in piglit as well, so that we come to know if this scenario is broken in near future.
>
>   tests/opengl.py                               |   2 +
>   .../CMakeLists.gles2.txt                      |   1 +
>   .../intel_external_sampler_with_2D_tex.c      | 103 ++++++++++++++++++
>   3 files changed, 106 insertions(+)
>   create mode 100644 tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_2D_tex.c


This test isn't intel specific, so I think that should be dropped from 
the name.


>
> diff --git a/tests/opengl.py b/tests/opengl.py
> index af68560bf..926af2036 100644
> --- a/tests/opengl.py
> +++ b/tests/opengl.py
> @@ -3017,6 +3017,8 @@ with profile.test_list.group_manager(
>       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-intel_external_sampler_with_2D_tex'],
> +      run_concurrent=False)
>       g(['ext_image_dma_buf_import-refcount'])
>       g(['ext_image_dma_buf_import-sample_rgb', '-fmt=AR24'],
>         'ext_image_dma_buf_import-sample_argb8888', run_concurrent=False)
> diff --git a/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
> index f99a5d800..c22aeed73 100644
> --- a/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
> +++ b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
> @@ -19,6 +19,7 @@ if(PIGLIT_BUILD_DMA_BUF_TESTS)
>   	piglit_add_executable(ext_image_dma_buf_import-refcount refcount.c sample_common.c image_common.c)
>   	piglit_add_executable(ext_image_dma_buf_import-sample_yuv sample_yuv.c sample_common.c image_common.c)
>   	piglit_add_executable(ext_image_dma_buf_import-sample_rgb sample_rgb.c sample_common.c image_common.c)
> +	piglit_add_executable(ext_image_dma_buf_import-intel_external_sampler_with_2D_tex intel_external_sampler_with_2D_tex.c image_common.c)




>   	piglit_add_executable(ext_image_dma_buf_import-transcode-nv12-as-r8-gr88 transcode-nv12-as-r8-gr88.c image_common.c)
>   endif()
>   
> diff --git a/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_2D_tex.c b/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_2D_tex.c
> new file mode 100644
> index 000000000..82e6a201e
> --- /dev/null
> +++ b/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_2D_tex.c
> @@ -0,0 +1,103 @@
> +/*
> + * 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.
> + */
> +
> +#include "image_common.h"
> +
> +/**
> + * @file intel_external_sampler_with_2D_tex.c
> + *
> + * Intel driver allows image external sampler to be used with regular 2D-texutre
> + * and imported dma buffers. This test creates an egl image based on a 2D-texture,
> + * attempts to use the image as target for an external texture, and should pass.
> + *
> + */
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> +	config.supports_gl_es_version = 10;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +static EGLImageKHR
> +create_tex_based_egl_image(unsigned w, unsigned h, const unsigned char *pixels)
> +{
> +	GLuint tex;
> +	EGLImageKHR img;
> +
> +	glGenTextures(1, &tex);
> +	glBindTexture(GL_TEXTURE_2D, tex);
> +
> +	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA,
> +	       GL_UNSIGNED_BYTE, pixels);
> +
> +	img = eglCreateImageKHR(eglGetCurrentDisplay(), eglGetCurrentContext(),
> +	       EGL_GL_TEXTURE_2D_KHR, (EGLClientBuffer)(intptr_t)tex, 0);
> +	if (!img)
> +	       printf("failed to create EGL image out of texture\n");
> +
> +	glDeleteTextures(1, &tex);
> +
> +	return img;
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> +	GLuint tex;
> +	enum piglit_result result = PIGLIT_FAIL;
> +	const unsigned char src[] = { 0x00, 0x00, 0x00, 0x00 };
> +	EGLImageKHR img = create_tex_based_egl_image(1, 1, src);
> +
> +	if (img == EGL_NO_IMAGE_KHR)
> +	       return PIGLIT_FAIL;
> +
> +	glGenTextures(1, &tex);
> +	glBindTexture(GL_TEXTURE_EXTERNAL_OES, tex);
> +
> +	glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES,
> +			       (GLeglImageOES)img);
> +
> +	if (piglit_check_gl_error(GL_NO_ERROR))
> +	       result = PIGLIT_PASS;
> +
> +	glDeleteTextures(1, &tex);
> +	eglDestroyImageKHR(eglGetCurrentDisplay(), img);
> +
> +	return result;
> +}
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> +	static const char intel_id[] = "Intel Open Source Technology Center";


You can drop the string comparison here, there is nothing intel specific 
here.


> +	const char *vendor_str;
> +	EGLDisplay egl_dpy = eglGetCurrentDisplay();
> +
> +	piglit_require_egl_extension(egl_dpy, "EGL_KHR_image_base");


You're actually using 2 extensions here :

   - EGL_KHR_gl_texture_2D_image to make an EGLImage out of a GL texture

   - GL_OES_EGL_image_external to bind the EGLImage back into as GL texture


So that should be what is required to run this test.


Maybe upload some data into the initial GL texture and verify that you 
get the same data out of the last GL texture.


Thanks,


-Lionel


> +
> +	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);
> +	}
> +}
Agree, with Lionel, rendering some test pattern and reading back would 
be a good addition (piglit_draw_rect_tex + piglit_probe_texel_rect_rgba 
or similar)

  .. couple of 'nitpicks' below:

On 2/2/19 10:42 AM, Aditya Swarup wrote:
> Commit 649c149dbb96ac367 removed the test for intel external sampler
> with dma only because of failure due to commit a5c39ed974402c -
> ("i965: Lift restriction in external textures for EGLImage support").
> Since, there is no test coverage for external sampler with 2D tex,
> adding the test with modifications to pass for external sampler using
> EGLImage with 2D tex.
> 
> Signed-off-by: Aditya Swarup <aditya.swarup@intel.com>
> Cc: Tapani Pälli <tapani.palli@intel.com>
> Cc: Kenneth Graunke <kenneth@whitecape.org>
> ---
> This test case covers the scenario of binding a texture ID of type GL_TEXTURE_EXTERNAL with EGLImage created using 2D texture.
> 
> This test is not covered in deqp but in CTS SKQP test - CtsSkQPTestCases "#unitTest_EGLImageTest". Explanation in https://bugs.freedesktop.org/show_bug.cgi?id=105301.
> 
> It would be nice to have test coverage in piglit as well, so that we come to know if this scenario is broken in near future.
> 
>   tests/opengl.py                               |   2 +
>   .../CMakeLists.gles2.txt                      |   1 +
>   .../intel_external_sampler_with_2D_tex.c      | 103 ++++++++++++++++++
>   3 files changed, 106 insertions(+)
>   create mode 100644 tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_2D_tex.c
> 
> diff --git a/tests/opengl.py b/tests/opengl.py
> index af68560bf..926af2036 100644
> --- a/tests/opengl.py
> +++ b/tests/opengl.py
> @@ -3017,6 +3017,8 @@ with profile.test_list.group_manager(
>       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-intel_external_sampler_with_2D_tex'],
> +      run_concurrent=False)
>       g(['ext_image_dma_buf_import-refcount'])
>       g(['ext_image_dma_buf_import-sample_rgb', '-fmt=AR24'],
>         'ext_image_dma_buf_import-sample_argb8888', run_concurrent=False)
> diff --git a/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
> index f99a5d800..c22aeed73 100644
> --- a/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
> +++ b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt
> @@ -19,6 +19,7 @@ if(PIGLIT_BUILD_DMA_BUF_TESTS)
>   	piglit_add_executable(ext_image_dma_buf_import-refcount refcount.c sample_common.c image_common.c)
>   	piglit_add_executable(ext_image_dma_buf_import-sample_yuv sample_yuv.c sample_common.c image_common.c)
>   	piglit_add_executable(ext_image_dma_buf_import-sample_rgb sample_rgb.c sample_common.c image_common.c)
> +	piglit_add_executable(ext_image_dma_buf_import-intel_external_sampler_with_2D_tex intel_external_sampler_with_2D_tex.c image_common.c)
>   	piglit_add_executable(ext_image_dma_buf_import-transcode-nv12-as-r8-gr88 transcode-nv12-as-r8-gr88.c image_common.c)
>   endif()
>   
> diff --git a/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_2D_tex.c b/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_2D_tex.c
> new file mode 100644
> index 000000000..82e6a201e
> --- /dev/null
> +++ b/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_2D_tex.c
> @@ -0,0 +1,103 @@
> +/*
> + * Copyright © 2013 Intel Corporation

2019!

> + *
> + * 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.
> + */
> +
> +#include "image_common.h"
> +
> +/**
> + * @file intel_external_sampler_with_2D_tex.c
> + *
> + * Intel driver allows image external sampler to be used with regular 2D-texutre

texutre -> texture

> + * and imported dma buffers. This test creates an egl image based on a 2D-texture,
> + * attempts to use the image as target for an external texture, and should pass.
> + *
> + */
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> +	config.supports_gl_es_version = 10;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +static EGLImageKHR
> +create_tex_based_egl_image(unsigned w, unsigned h, const unsigned char *pixels)
> +{
> +	GLuint tex;
> +	EGLImageKHR img;
> +
> +	glGenTextures(1, &tex);
> +	glBindTexture(GL_TEXTURE_2D, tex);
> +
> +	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA,
> +	       GL_UNSIGNED_BYTE, pixels);
> +
> +	img = eglCreateImageKHR(eglGetCurrentDisplay(), eglGetCurrentContext(),
> +	       EGL_GL_TEXTURE_2D_KHR, (EGLClientBuffer)(intptr_t)tex, 0);
> +	if (!img)
> +	       printf("failed to create EGL image out of texture\n");
> +
> +	glDeleteTextures(1, &tex);
> +
> +	return img;
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> +	GLuint tex;
> +	enum piglit_result result = PIGLIT_FAIL;
> +	const unsigned char src[] = { 0x00, 0x00, 0x00, 0x00 };
> +	EGLImageKHR img = create_tex_based_egl_image(1, 1, src);
> +
> +	if (img == EGL_NO_IMAGE_KHR)
> +	       return PIGLIT_FAIL;
> +
> +	glGenTextures(1, &tex);
> +	glBindTexture(GL_TEXTURE_EXTERNAL_OES, tex);
> +
> +	glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES,
> +			       (GLeglImageOES)img);
> +
> +	if (piglit_check_gl_error(GL_NO_ERROR))
> +	       result = PIGLIT_PASS;
> +
> +	glDeleteTextures(1, &tex);
> +	eglDestroyImageKHR(eglGetCurrentDisplay(), img);
> +
> +	return result;
> +}
> +
> +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_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);
> +	}
> +}
>