From 90ad5fc6e24e86bb9ad28bb0c8d364250255a5cb Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Wed, 8 May 2024 20:17:00 -0500 Subject: [PATCH] zink: Set workarounds.can_do_invalid_linear_modifier for NVK This fixes most of the egl_image_dma_buf* piglit tests. The remaining fails are YCbCr tests which are likely unrelated to core dma-buf import/export. Reviewed-by: Dave Airlie Part-of: (cherry picked from commit 8bc694223ed9a0bd354139a3b174f13004442591) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_screen.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 97e663a2b79..0a039462739 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1404,7 +1404,7 @@ "description": "zink: Set workarounds.can_do_invalid_linear_modifier for NVK", "nominated": false, "nomination_type": 3, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index ae33ac21f11..9177e856369 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -3031,6 +3031,7 @@ init_driver_workarounds(struct zink_screen *screen) switch (screen->info.driver_props.driverID) { case VK_DRIVER_ID_MESA_TURNIP: case VK_DRIVER_ID_MESA_VENUS: + case VK_DRIVER_ID_MESA_NVK: screen->driver_workarounds.can_do_invalid_linear_modifier = true; break; default: