From 175c92890dc2d7d8d82cb7331c095869671dc393 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Tue, 13 Feb 2024 22:35:50 -0600 Subject: [PATCH] vulkan/wsi: Bind memory planes, not YCbCr planes. Reviewed-by: Joshua Ashton Fixes: f5433e4d6ce2 ("vulkan/wsi: Add modifiers support to wsi_create_native_image") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10176 Reviewed-by: Dave Airlie Part-of: (cherry picked from commit 28342a581f926777f9923835525fd2f267edfd53) --- .pick_status.json | 2 +- src/vulkan/wsi/wsi_common_drm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0535a009623..f0527e3c371 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1424,7 +1424,7 @@ "description": "vulkan/wsi: Bind memory planes, not YCbCr planes.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "f5433e4d6ce247b86daed741c07aa99f2bd02c0d", "notes": null diff --git a/src/vulkan/wsi/wsi_common_drm.c b/src/vulkan/wsi/wsi_common_drm.c index 474e59f88bd..b80c1ba4f91 100644 --- a/src/vulkan/wsi/wsi_common_drm.c +++ b/src/vulkan/wsi/wsi_common_drm.c @@ -718,7 +718,7 @@ wsi_create_native_image_mem(const struct wsi_swapchain *chain, for (uint32_t p = 0; p < image->num_planes; p++) { const VkImageSubresource image_subresource = { - .aspectMask = VK_IMAGE_ASPECT_PLANE_0_BIT << p, + .aspectMask = VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT << p, .mipLevel = 0, .arrayLayer = 0, };