Mesa (main): zink: break out renderpass attachment load op calc

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Jul 20 17:47:07 UTC 2022


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

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

zink: break out renderpass attachment load op calc

no functional changes

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 | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_render_pass.c b/src/gallium/drivers/zink/zink_render_pass.c
index b7cec650bce..c574c9ea8a5 100644
--- a/src/gallium/drivers/zink/zink_render_pass.c
+++ b/src/gallium/drivers/zink/zink_render_pass.c
@@ -33,6 +33,16 @@
 #include "util/u_string.h"
 #include "util/u_blitter.h"
 
+static VkAttachmentLoadOp
+get_rt_loadop(const struct zink_rt_attrib *rt, bool clear)
+{
+   return clear ? VK_ATTACHMENT_LOAD_OP_CLEAR :
+                  /* TODO: need replicate EXT */
+                  //rt->resolve || rt->invalid ?
+                  rt->invalid ?
+                  VK_ATTACHMENT_LOAD_OP_DONT_CARE :
+                  VK_ATTACHMENT_LOAD_OP_LOAD;
+}
 
 static VkRenderPass
 create_render_pass2(struct zink_screen *screen, struct zink_render_pass_state *state, struct zink_render_pass_pipeline_state *pstate)
@@ -58,12 +68,7 @@ create_render_pass2(struct zink_screen *screen, struct zink_render_pass_state *s
       attachments[i].flags = 0;
       pstate->attachments[i].format = attachments[i].format = rt->format;
       pstate->attachments[i].samples = attachments[i].samples = rt->samples;
-      attachments[i].loadOp = rt->clear_color ? VK_ATTACHMENT_LOAD_OP_CLEAR :
-                                                /* TODO: need replicate EXT */
-                                                //rt->resolve || rt->invalid ?
-                                                rt->invalid ?
-                                                VK_ATTACHMENT_LOAD_OP_DONT_CARE :
-                                                VK_ATTACHMENT_LOAD_OP_LOAD;
+      attachments[i].loadOp = get_rt_loadop(rt, rt->clear_color);
 
       /* TODO: need replicate EXT */
       //attachments[i].storeOp = rt->resolve ? VK_ATTACHMENT_STORE_OP_DONT_CARE : VK_ATTACHMENT_STORE_OP_STORE;



More information about the mesa-commit mailing list