From 2bd2df1aec76940cdc455a218f54bc5b5b1e5c92 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 13 Jun 2022 16:10:52 +0200 Subject: [PATCH] dzn: handle stencil-attachment-optimal layout We missed this one, whoops. Fixes: a012b219640 ("microsoft: Initial vulkan-on-12 driver") Reviewed-by: Boris Brezillon Reviewed-by: Jesse Natalie Part-of: (cherry picked from commit 4ab49e2530a0dfde64235ed63b38d909dba60213) --- .pick_status.json | 2 +- src/microsoft/vulkan/dzn_image.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 3041b7466f1..17a874aa197 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1633,7 +1633,7 @@ "description": "dzn: handle stencil-attachment-optimal layout", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "a012b219640e875aa552b37dfdaf69336d5863c7" }, diff --git a/src/microsoft/vulkan/dzn_image.cpp b/src/microsoft/vulkan/dzn_image.cpp index f2b1d9f0092..44e7f22615e 100644 --- a/src/microsoft/vulkan/dzn_image.cpp +++ b/src/microsoft/vulkan/dzn_image.cpp @@ -530,6 +530,7 @@ dzn_image_layout_to_state(VkImageLayout layout, VkImageAspectFlagBits aspect) case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: case VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL: + case VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL: return D3D12_RESOURCE_STATE_DEPTH_WRITE; case VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL: