<div dir="ltr"><div class="gmail_quote"><div dir="ltr">On Fri, Nov 9, 2018 at 11:18 AM Lionel Landwerlin <<a href="mailto:lionel.g.landwerlin@intel.com">lionel.g.landwerlin@intel.com</a>> wrote: </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Commit a5c39ed974402c ("i965: Lift restriction in external textures for EGLImage support") from Mesa lifted the restriction that this test was checking. Easy fix! Signed-off-by: Lionel Landwerlin <<a href="mailto:lionel.g.landwerlin@intel.com" target="_blank">lionel.g.landwerlin@intel.com</a>> --- tests/opengl.py | 2 - .../CMakeLists.gles2.txt | 1 - .../intel_external_sampler_with_dma_only.c | 104 ------------------ 3 files changed, 107 deletions(-) delete mode 100644 tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_dma_only.c diff --git a/tests/opengl.py b/tests/opengl.py index b74606be1..83cc18fe0 100644 --- a/tests/opengl.py +++ b/tests/opengl.py @@ -3016,8 +3016,6 @@ with profile.test_list.group_manager( 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_dma_only'], - 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 93f43fad9..f99a5d800 100644 --- a/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt +++ b/tests/spec/ext_image_dma_buf_import/CMakeLists.gles2.txt @@ -19,7 +19,6 @@ 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_dma_only intel_external_sampler_with_dma_only.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_dma_only.c b/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_dma_only.c deleted file mode 100644 index 6b5c7a1e7..000000000 --- a/tests/spec/ext_image_dma_buf_import/intel_external_sampler_with_dma_only.c +++ /dev/null @@ -1,104 +0,0 @@ -/* - * 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_dma_only.c - * - * Intel driver allows image external sampler to be used only with 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 expects to fail with - * GL_INVALID_OPERATION. - */ - -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_INVALID_OPERATION)) - 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_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"); </blockquote><div> </div><div>Any test that does this is bogus. We tests specs, not Intel's interpretation of specs.</div><div> </div><div>Acked-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> - piglit_report_result(PIGLIT_SKIP); - } -} -- 2.19.1 _______________________________________________ Piglit mailing list <a href="mailto:Piglit@lists.freedesktop.org" target="_blank">Piglit@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/piglit" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/piglit</a> </blockquote></div></div>