diff --git a/.pick_status.json b/.pick_status.json index 22c4cf03740..ac2e69f371a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1930,7 +1930,7 @@ "description": "pvr: Fix barrier insertion on merged subpasses", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "6d672e0336836bdbf3d444f7febc74f5c91e7de1" }, diff --git a/src/imagination/vulkan/pvr_cmd_buffer.c b/src/imagination/vulkan/pvr_cmd_buffer.c index 72c5da861ae..dd04990f5b8 100644 --- a/src/imagination/vulkan/pvr_cmd_buffer.c +++ b/src/imagination/vulkan/pvr_cmd_buffer.c @@ -7298,9 +7298,9 @@ void pvr_CmdPipelineBarrier2(VkCommandBuffer commandBuffer, switch (src_stage_mask) { case PVR_PIPELINE_STAGE_FRAG_BIT: - is_barrier_needed = true; + is_barrier_needed = !render_pass; - if (!render_pass) + if (is_barrier_needed) break; assert(current_sub_cmd->type == PVR_SUB_CMD_TYPE_GRAPHICS);