diff --git a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt index 10e9a57b829..304527fccf2 100644 --- a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt @@ -113,7 +113,6 @@ glx@glx-buffer-age,Fail glx@glx-buffer-age vblank_mode=0,Fail glx@glx-swap-pixmap-bad,Fail -glx@glx-tfp,Crash # ../src/gallium/drivers/zink/zink_kopper.c:859: zink_kopper_update: Assertion `pres->bind & PIPE_BIND_DISPLAY_TARGET' failed. glx@glx-visuals-depth -pixmap,Crash diff --git a/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt index f67cb486f42..d6fed4ed63d 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt @@ -125,7 +125,6 @@ spec@ext_framebuffer_multisample@sample-alpha-to-one 2,Fail spec@ext_framebuffer_multisample@sample-alpha-to-one 4,Fail spec@ext_framebuffer_multisample@sample-alpha-to-one 6,Fail spec@ext_framebuffer_multisample@sample-alpha-to-one 8,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_nv12,Fail spec@ext_packed_float@query-rgba-signed-components,Fail spec@glsl-1.10@execution@glsl-fs-inline-explosion,Crash @@ -270,9 +269,6 @@ spec@!opengl 1.1@teximage-colors gl_sluminance8_alpha8@GL_SLUMINANCE8_ALPHA8 tex spec@!opengl 1.1@teximage-colors gl_sluminance8_alpha8@GL_SLUMINANCE8_ALPHA8 texture with GL_RGBA and GL_UNSIGNED_SHORT,Fail spec@!opengl 1.1@teximage-colors gl_sluminance8_alpha8@GL_SLUMINANCE8_ALPHA8 texture with GL_RGBA and GL_UNSIGNED_SHORT_4_4_4_4,Fail spec@!opengl 1.1@teximage-colors gl_sluminance8_alpha8@GL_SLUMINANCE8_ALPHA8 texture with GL_RGBA and GL_UNSIGNED_SHORT_4_4_4_4_REV,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuv420,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvu420,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-transcode-nv12-as-r8-gr88,Fail spec@ext_texture_srgb@fbo-generatemipmap-formats,Fail spec@ext_texture_srgb@fbo-generatemipmap-formats-s3tc,Fail spec@ext_texture_srgb@fbo-generatemipmap-formats-s3tc@GL_COMPRESSED_SLUMINANCE_ALPHA,Fail diff --git a/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt index 8b01e7e7edd..3452a633eb3 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt @@ -124,7 +124,6 @@ spec@ext_framebuffer_multisample@sample-alpha-to-one 2,Fail spec@ext_framebuffer_multisample@sample-alpha-to-one 4,Fail spec@ext_framebuffer_multisample@sample-alpha-to-one 6,Fail spec@ext_framebuffer_multisample@sample-alpha-to-one 8,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_nv12,Fail spec@ext_packed_float@query-rgba-signed-components,Fail spec@glsl-1.10@execution@glsl-fs-inline-explosion,Crash @@ -269,9 +268,6 @@ spec@!opengl 1.1@teximage-colors gl_sluminance8_alpha8@GL_SLUMINANCE8_ALPHA8 tex spec@!opengl 1.1@teximage-colors gl_sluminance8_alpha8@GL_SLUMINANCE8_ALPHA8 texture with GL_RGBA and GL_UNSIGNED_SHORT,Fail spec@!opengl 1.1@teximage-colors gl_sluminance8_alpha8@GL_SLUMINANCE8_ALPHA8 texture with GL_RGBA and GL_UNSIGNED_SHORT_4_4_4_4,Fail spec@!opengl 1.1@teximage-colors gl_sluminance8_alpha8@GL_SLUMINANCE8_ALPHA8 texture with GL_RGBA and GL_UNSIGNED_SHORT_4_4_4_4_REV,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuv420,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvu420,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-transcode-nv12-as-r8-gr88,Fail spec@ext_texture_srgb@fbo-generatemipmap-formats,Fail spec@ext_texture_srgb@fbo-generatemipmap-formats-s3tc,Fail spec@ext_texture_srgb@fbo-generatemipmap-formats-s3tc@GL_COMPRESSED_SLUMINANCE_ALPHA,Fail diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index 4f6a09679d6..53696d647fa 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -1796,12 +1796,13 @@ zink_resource_from_handle(struct pipe_screen *pscreen, if (templ->format == PIPE_FORMAT_NONE) templ2.format = whandle->format; - uint64_t modifier = DRM_FORMAT_MOD_INVALID; - int modifier_count = 0; - if (whandle->modifier != DRM_FORMAT_MOD_INVALID) { + uint64_t modifier = DRM_FORMAT_MOD_LINEAR; + int modifier_count = 1; + if (whandle->modifier != DRM_FORMAT_MOD_INVALID) modifier = whandle->modifier; - modifier_count = 1; - } + else + whandle->modifier = modifier; + templ2.bind |= ZINK_BIND_DMABUF; struct pipe_resource *pres = resource_create(pscreen, &templ2, whandle, usage, &modifier, modifier_count, NULL, NULL); if (pres) { struct zink_resource *res = zink_resource(pres);