<div dir="ltr"><div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>></div><div> </div><div>Thanks for writing this! </div></div><div class="gmail_extra"> <div class="gmail_quote">On Thu, Jun 7, 2018 at 11:58 AM, Lionel Landwerlin <<a href="mailto:lionel.g.landwerlin@intel.com" target="_blank">lionel.g.landwerlin@intel.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">We've been running into crashes in i965 because of a number of issue throughout the driver stack. This is a really basic tests that list the formats and their associated modifiers to just catch any regressions. v2: by Jason Â Â Use piglit_egl_get_default_display Â Â Drop printf Â Â Properly check the required EGL version <div><div class="h5"> Signed-off-by: Lionel Landwerlin <<a href="mailto:lionel.g.landwerlin@intel.com">lionel.g.landwerlin@intel.com</a>> Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=106642" rel="noreferrer" target="_blank">https://bugs.freedesktop.org/show_bug.cgi?id=106642</a> --- Â tests/egl/spec/CMakeLists.txtÂ Â Â Â Â Â Â Â Â |Â Â 1 + Â .../CMakeLists.no_api.txtÂ Â Â Â Â Â Â Â Â Â Â |Â Â 7 + Â .../CMakeLists.txtÂ Â Â Â Â Â Â Â Â Â Â Â Â Â |Â Â 1 + Â .../query_format_modifiers.cÂ Â Â Â Â Â Â Â Â | 148 ++++++++++++++++++ Â tests/opengl.pyÂ Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â |Â Â 6 + Â 5 files changed, 163 insertions(+) Â create mode 100644 tests/egl/spec/egl_ext_image_dma_buf_import_modifiers/CMakeLists.no_api.txt Â create mode 100644 tests/egl/spec/egl_ext_image_dma_buf_import_modifiers/CMakeLists.txt Â create mode 100644 tests/egl/spec/egl_ext_image_dma_buf_import_modifiers/query_format_modifiers.c diff --git a/tests/egl/spec/CMakeLists.txt b/tests/egl/spec/CMakeLists.txt index 66d76db60..772f8258a 100644 --- a/tests/egl/spec/CMakeLists.txt +++ b/tests/egl/spec/CMakeLists.txt @@ -2,6 +2,7 @@ add_subdirectory (egl-1.4) Â add_subdirectory (egl_ext_client_extensions) Â add_subdirectory (egl_ext_device_query) Â add_subdirectory (egl_ext_device_enumeration) +add_subdirectory (egl_ext_image_dma_buf_import_modifiers) Â add_subdirectory (egl_khr_create_context) Â add_subdirectory (egl_khr_get_all_proc_addresses) Â add_subdirectory (egl_khr_gl_image) diff --git a/tests/egl/spec/egl_ext_image_dma_buf_import_modifiers/CMakeLists.no_api.txt b/tests/egl/spec/egl_ext_image_dma_buf_import_modifiers/CMakeLists.no_api.txt new file mode 100644 index 000000000..f6b672e44 --- /dev/null +++ b/tests/egl/spec/egl_ext_image_dma_buf_import_modifiers/CMakeLists.no_api.txt @@ -0,0 +1,7 @@ +link_libraries( +Â Â Â Â piglitutil +) + +piglit_add_executable(egl_ext_image_dma_buf_import_modifiers-query query_format_modifiers.c) + +# vim: ft=cmake: diff --git a/tests/egl/spec/egl_ext_image_dma_buf_import_modifiers/CMakeLists.txt b/tests/egl/spec/egl_ext_image_dma_buf_import_modifiers/CMakeLists.txt new file mode 100644 index 000000000..144a306f4 --- /dev/null +++ b/tests/egl/spec/egl_ext_image_dma_buf_import_modifiers/CMakeLists.txt @@ -0,0 +1 @@ +piglit_include_target_api() diff --git a/tests/egl/spec/egl_ext_image_dma_buf_import_modifiers/query_format_modifiers.c b/tests/egl/spec/egl_ext_image_dma_buf_import_modifiers/query_format_modifiers.c new file mode 100644 </div></div>index 000000000..0d4b0e2b4 <div><div class="h5">--- /dev/null +++ b/tests/egl/spec/egl_ext_image_dma_buf_import_modifiers/query_format_modifiers.c @@ -0,0 +1,148 @@ +/* + * Copyright 2018 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 "piglit-util.h" +#include "piglit-util-egl.h" + +int +main(int argc, char *argv[]) +{ +Â Â Â Â EGLDisplay dpy; +Â Â Â Â EGLBoolean (*peglQueryDmaBufFormatsEXT)(EGLDisplay dpy, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â EGLint max_formats, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â EGLint *formats, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â EGLint *num_formats); +Â Â Â Â EGLBoolean (*peglQueryDmaBufModifiersEXT)(EGLDisplay dpy, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â EGLint format, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â EGLint max_modifiers, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â EGLuint64KHR *modifiers, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â EGLBoolean *external_only, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â EGLint *num_modifiers); +Â Â Â Â EGLint f, n_formats, *formats, rand_format, n_modifiers; +Â Â Â Â EGLint egl_major, egl_minor; +Â Â Â Â EGLBoolean ret; +Â Â Â Â bool in_list; + +Â Â Â Â /* Strip common piglit args. */ +Â Â Â Â piglit_strip_arg(&argc, argv, "-fbo"); +Â Â Â Â piglit_strip_arg(&argc, argv, "-auto"); + </div></div>+Â Â Â Â dpy = piglit_egl_get_default_display(EGL_NONE); +Â Â Â Â if (!dpy) { +Â Â Â Â Â Â Â Â piglit_loge("failed to get EGLDisplay\n"); +Â Â Â Â Â Â Â Â piglit_report_result(PIGLIT_SKIP); +Â Â Â Â } + +Â Â Â Â ret = eglInitialize(dpy, &egl_major, &egl_minor); +Â Â Â Â if (!ret) { +Â Â Â Â Â Â Â Â EGLint egl_error = eglGetError(); +Â Â Â Â Â Â Â Â piglit_loge("failed to get EGLConfig: %s(0x%x)", +Â Â Â Â Â Â Â Â Â Â Â Â Â Â piglit_get_egl_error_name(egl_error), egl_error); +Â Â Â Â Â Â Â Â piglit_report_result(PIGLIT_FAIL); +Â Â Â Â } + +Â Â Â Â if (egl_major < 1 || (egl_major == 1 && egl_minor < 2)) { +Â Â Â Â Â Â Â Â piglit_logi("EGL 1.2 required"); +Â Â Â Â Â Â Â Â piglit_report_result(PIGLIT_SKIP); +Â Â Â Â } + +Â Â Â Â piglit_require_egl_extension(dpy, "EGL_EXT_image_dma_buf_import_modifiers"); + +Â Â Â Â peglQueryDmaBufFormatsEXT = +Â Â Â Â Â Â Â Â (void *)eglGetProcAddress("eglQueryDmaBufFormatsEXT"); +Â Â Â Â peglQueryDmaBufModifiersEXT = +Â Â Â Â Â Â Â Â (void *)eglGetProcAddress("eglQueryDmaBufModifiersEXT"); + +Â Â Â Â if (!peglQueryDmaBufFormatsEXT || !peglQueryDmaBufModifiersEXT) { +Â Â Â Â Â Â Â Â piglit_loge("No display query entrypoint\n"); <div class="HOEnZb"><div class="h5">+Â Â Â Â Â Â Â Â piglit_report_result(PIGLIT_FAIL); +Â Â Â Â } + +Â Â Â Â ret = peglQueryDmaBufFormatsEXT(dpy, 0, NULL, &n_formats); +Â Â Â Â if (!ret) +Â Â Â Â Â Â Â Â piglit_report_result(PIGLIT_FAIL); +Â Â Â Â piglit_logd("Found %i format(s):", n_formats); + +Â Â Â Â formats = calloc(n_formats, sizeof(*formats)); +Â Â Â Â peglQueryDmaBufFormatsEXT(dpy, n_formats, formats, &n_formats); + +Â Â Â Â for (f = 0; f < n_formats; f++) { +Â Â Â Â Â Â Â Â EGLBoolean *external; +Â Â Â Â Â Â Â Â EGLuint64KHR *modifiers; +Â Â Â Â Â Â Â Â EGLint m; + +Â Â Â Â Â Â Â Â piglit_logd("Format 0x%x (%c%c%c%c):", +Â Â Â Â Â Â Â Â Â Â Â Â Â Â formats[f], +Â Â Â Â Â Â Â Â Â Â Â Â Â Â formats[f] & 0xff, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â (formats[f] >> 8) & 0xff, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â (formats[f] >> 16) & 0xff, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â (formats[f] >> 24) & 0xff); + +Â Â Â Â Â Â Â Â ret = peglQueryDmaBufModifiersEXT(dpy, formats[f], 0, NULL, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â NULL, &n_modifiers); +Â Â Â Â Â Â Â Â if (!ret) +Â Â Â Â Â Â Â Â Â Â Â Â piglit_report_result(PIGLIT_FAIL); + +Â Â Â Â Â Â Â Â piglit_logd("\t%i modifiers:", n_modifiers); + +Â Â Â Â Â Â Â Â modifiers = calloc(n_modifiers, sizeof(*modifiers)); +Â Â Â Â Â Â Â Â external = calloc(n_modifiers, sizeof(*external)); +Â Â Â Â Â Â Â Â ret = peglQueryDmaBufModifiersEXT(dpy, formats[f], +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â n_modifiers, modifiers, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â external, &n_modifiers); +Â Â Â Â Â Â Â Â if (!ret) +Â Â Â Â Â Â Â Â Â Â Â Â piglit_report_result(PIGLIT_FAIL); + +Â Â Â Â Â Â Â Â for (m = 0; m < n_modifiers; m++) { +Â Â Â Â Â Â Â Â Â Â Â Â piglit_logd("\t0x%016lx external=%i", modifiers[m], external[m]); +Â Â Â Â Â Â Â Â } + +Â Â Â Â Â Â Â Â free(modifiers); +Â Â Â Â Â Â Â Â free(external); +Â Â Â Â } + +Â Â Â Â /* Try to query an invalid format. */ +Â Â Â Â do { +Â Â Â Â Â Â Â Â in_list = false; +Â Â Â Â Â Â Â Â rand_format = rand(); + +Â Â Â Â Â Â Â Â for (f = 0; f < n_formats; f++) { +Â Â Â Â Â Â Â Â Â Â Â Â if (formats[f] == rand_format) { +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â in_list = true; +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â break; +Â Â Â Â Â Â Â Â Â Â Â Â } +Â Â Â Â Â Â Â Â } +Â Â Â Â } while (in_list); + +Â Â Â Â piglit_logd("Trying to query random format 0x%x", rand_format); +Â Â Â Â ret = peglQueryDmaBufModifiersEXT(dpy, rand_format, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â 0, NULL, NULL, &n_modifiers); +Â Â Â Â if (ret) +Â Â Â Â Â Â Â Â piglit_report_result(PIGLIT_FAIL); +Â Â Â Â if (eglGetError() != EGL_BAD_PARAMETER) +Â Â Â Â Â Â Â Â piglit_report_result(PIGLIT_FAIL); + +Â Â Â Â free(formats); + +Â Â Â Â piglit_report_result(PIGLIT_PASS); +} diff --git a/tests/opengl.py b/tests/opengl.py index 6a6d71fb4..751391451 100644 --- a/tests/opengl.py +++ b/tests/opengl.py @@ -4534,6 +4534,12 @@ with profile.test_list.group_manager( Â Â Â Â Â exclude_platforms=['glx']) as g: Â Â Â g(['egl_mesa_platform_surfaceless'], 'conformance') +with profile.test_list.group_manager( +Â Â Â Â PiglitGLTest, +Â Â Â Â grouptools.join('spec', 'egl_ext_image_dma_buf_import_modifiers'), +Â Â Â Â exclude_platforms=['glx']) as g: +Â Â g(['egl_ext_image_dma_buf_import_modifiers-query'], 'conformance') + Â with profile.test_list.group_manager( Â Â Â Â Â PiglitGLTest, grouptools.join('spec', '!opengl ES 2.0')) as g: Â Â Â g(['glsl-fs-pointcoord_gles2'], 'glsl-fs-pointcoord') -- 2.17.1 </div></div></blockquote></div> </div>