commit 0e59771339f633760d9b925fe11a7ad3e9a66421
author Iago Toral Quiroga <itoral@igalia.com> Wed Jan 29 10:13:40 2020 +0100
committer Marge Bot <eric+marge@anholt.net> Tue Oct 13 21:21:27 2020 +0000
tree 736abcf936b5779368e03b03c9d67f09eb066bfc
parent df34b8fac64df210caee7447927725f22ece8cf3

v3dv: select the depth/stencil buffer from the attachment aspect mask

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>

src/broadcom/vulkan/v3dv_cmd_buffer.c

diff --git a/src/broadcom/vulkan/v3dv_cmd_buffer.c b/src/broadcom/vulkan/v3dv_cmd_buffer.c
index e07c3d2..f18a88e 100644
--- a/src/broadcom/vulkan/v3dv_cmd_buffer.c
+++ b/src/broadcom/vulkan/v3dv_cmd_buffer.c
@@ -713,6 +713,23 @@
    *rt_clamp = V3D_RENDER_TARGET_CLAMP_NONE;
 }
 
+static uint32_t
+zs_buffer_from_aspect_bits(VkImageAspectFlags aspects)
+{
+   const VkImageAspectFlags zs_aspects =
+      VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT;
+   const VkImageAspectFlags filtered_aspects = aspects & zs_aspects;
+
+   if (filtered_aspects == zs_aspects)
+      return ZSTENCIL;
+   else if (filtered_aspects == VK_IMAGE_ASPECT_DEPTH_BIT)
+      return Z;
+   else if (filtered_aspects == VK_IMAGE_ASPECT_STENCIL_BIT)
+      return STENCIL;
+   else
+      return NONE;
+}
+
 static void
 cmd_buffer_render_pass_emit_load(struct v3dv_cmd_buffer *cmd_buffer,
                                  struct v3dv_cl *cl,
@@ -804,7 +821,9 @@
       if (needs_load) {
          struct v3dv_image_view *iview =
             framebuffer->attachments[ds_attachment_idx];
-         cmd_buffer_render_pass_emit_load(cmd_buffer, cl, iview, layer, Z);
+         const uint32_t zs_buffer = zs_buffer_from_aspect_bits(iview->aspects);
+         cmd_buffer_render_pass_emit_load(cmd_buffer, cl,
+                                          iview, layer, zs_buffer);
       }
    }
 
@@ -929,9 +948,12 @@
          needs_ds_clear;
 
       if (needs_ds_store) {
+         struct v3dv_image_view *iview =
+            state->framebuffer->attachments[ds_attachment_idx];
+         const uint32_t zs_buffer = zs_buffer_from_aspect_bits(iview->aspects);
          cmd_buffer_render_pass_emit_store(cmd_buffer, cl,
                                            ds_attachment_idx, layer,
-                                           Z, needs_ds_clear);
+                                           zs_buffer, needs_ds_clear);
          has_stores = true;
       }
    }