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

Author: Yiwei Zhang <[email protected]>
Date:   Mon Jul 10 16:15:06 2023 -0700

venus: avoid redundant tracking of render pass

Signed-off-by: Yiwei Zhang <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24103>

---

 src/virtio/vulkan/vn_command_buffer.c | 5 +----
 src/virtio/vulkan/vn_command_buffer.h | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/virtio/vulkan/vn_command_buffer.c 
b/src/virtio/vulkan/vn_command_buffer.c
index e045f822c8e..b60454608d5 100644
--- a/src/virtio/vulkan/vn_command_buffer.c
+++ b/src/virtio/vulkan/vn_command_buffer.c
@@ -589,7 +589,6 @@ vn_cmd_begin_render_pass(struct vn_command_buffer *cmd,
    cmd->builder.render_pass = pass;
 
    cmd->in_render_pass = true;
-   cmd->render_pass = pass;
    cmd->subpass_index = 0;
    cmd->view_mask = vn_render_pass_get_subpass_view_mask(pass, 0);
 
@@ -643,7 +642,6 @@ vn_cmd_end_render_pass(struct vn_command_buffer *cmd)
 
    vn_cmd_record_batched_query_feedback(cmd);
    cmd->in_render_pass = false;
-   cmd->render_pass = NULL;
    cmd->subpass_index = 0;
    cmd->view_mask = 0;
 
@@ -666,7 +664,7 @@ static inline void
 vn_cmd_next_subpass(struct vn_command_buffer *cmd)
 {
    cmd->view_mask = vn_render_pass_get_subpass_view_mask(
-      cmd->render_pass, ++cmd->subpass_index);
+      cmd->builder.render_pass, ++cmd->subpass_index);
 }
 
 /* command pool commands */
@@ -769,7 +767,6 @@ vn_cmd_reset(struct vn_command_buffer *cmd)
 
    cmd->in_render_pass = false;
    cmd->suspends = false;
-   cmd->render_pass = NULL;
    cmd->subpass_index = 0;
    cmd->view_mask = 0;
    list_for_each_entry_safe(struct vn_command_buffer_query_batch, batch,
diff --git a/src/virtio/vulkan/vn_command_buffer.h 
b/src/virtio/vulkan/vn_command_buffer.h
index e568d8e8a77..49a94613509 100644
--- a/src/virtio/vulkan/vn_command_buffer.h
+++ b/src/virtio/vulkan/vn_command_buffer.h
@@ -74,7 +74,6 @@ struct vn_command_buffer {
    bool in_render_pass;
    bool suspends;
    /* viewMask is stored per subpass for legacy render pass */
-   const struct vn_render_pass *render_pass;
    uint32_t subpass_index;
    /* view_mask is set when passed in by dynamic rendering/secondary cmd
     * buffers or on each subpass iteration for legacy render pass with

Reply via email to