Mesa (main): zink: break out zs renderpass layout calc

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 903060787e407a0e97c51dc868791fab4ea633fb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=903060787e407a0e97c51dc868791fab4ea633fb

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri Jul 15 16:40:09 2022 -0400

zink: break out zs renderpass layout calc

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17640>

---

 src/gallium/drivers/zink/zink_render_pass.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_render_pass.c b/src/gallium/drivers/zink/zink_render_pass.c
index c574c9ea8a5..1a18ec4fa1c 100644
--- a/src/gallium/drivers/zink/zink_render_pass.c
+++ b/src/gallium/drivers/zink/zink_render_pass.c
@@ -44,6 +44,15 @@ get_rt_loadop(const struct zink_rt_attrib *rt, bool clear)
                   VK_ATTACHMENT_LOAD_OP_LOAD;
 }
 
+static VkImageLayout
+get_zs_rt_layout(const struct zink_rt_attrib *rt)
+{
+   bool has_clear = rt->clear_color || rt->clear_stencil;
+   if (rt->mixed_zs)
+      return VK_IMAGE_LAYOUT_GENERAL;
+   return rt->needs_write || has_clear ? VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL : VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL;
+}
+
 static VkRenderPass
 create_render_pass2(struct zink_screen *screen, struct zink_render_pass_state *state, struct zink_render_pass_pipeline_state *pstate)
 {
@@ -110,12 +119,7 @@ create_render_pass2(struct zink_screen *screen, struct zink_render_pass_state *s
    int num_attachments = state->num_cbufs;
    if (state->have_zsbuf)  {
       struct zink_rt_attrib *rt = state->rts + state->num_cbufs;
-      bool has_clear = rt->clear_color || rt->clear_stencil;
-      VkImageLayout layout;
-      if (rt->mixed_zs)
-         layout = VK_IMAGE_LAYOUT_GENERAL;
-      else
-         layout = rt->needs_write || has_clear ? VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL : VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL;
+      VkImageLayout layout = get_zs_rt_layout(rt);
       attachments[num_attachments].sType = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2;
       attachments[num_attachments].pNext = NULL;
       attachments[num_attachments].flags = 0;