Mesa (staging/22.1): dzn: handle stencil-attachment-optimal layout

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: 9cfa40a31f0997f6e0afe360e727b8c6e6f71bed
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9cfa40a31f0997f6e0afe360e727b8c6e6f71bed

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Mon Jun 13 16:10:52 2022 +0200

dzn: handle stencil-attachment-optimal layout

We missed this one, whoops.

Fixes: a012b219640 ("microsoft: Initial vulkan-on-12 driver")
Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16997>
(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 b2964418561..c8e5dd068ef 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: