diff --git a/src/freedreno/vulkan/tu_clear_blit.c b/src/freedreno/vulkan/tu_clear_blit.c index a645831ed4c..cb70ebd02a9 100644 --- a/src/freedreno/vulkan/tu_clear_blit.c +++ b/src/freedreno/vulkan/tu_clear_blit.c @@ -914,6 +914,24 @@ copy_format(VkFormat format, VkImageAspectFlags aspect_mask, bool copy_buffer) } } +void +tu6_clear_lrz(struct tu_cmd_buffer *cmd, + struct tu_cs *cs, + struct tu_image *image, + const VkClearValue *value) +{ + const struct blit_ops *ops = &r2d_ops; + + ops->setup(cmd, cs, VK_FORMAT_D16_UNORM, VK_IMAGE_ASPECT_DEPTH_BIT, ROTATE_0, true, false); + ops->clear_value(cs, VK_FORMAT_D16_UNORM, value); + ops->dst_buffer(cs, VK_FORMAT_D16_UNORM, + image->bo->iova + image->bo_offset + image->lrz_offset, + image->lrz_pitch * 2); + ops->coords(cs, &(VkOffset2D) {}, NULL, &(VkExtent2D) {image->lrz_pitch, image->lrz_height}); + ops->run(cmd, cs); + ops->teardown(cmd, cs); +} + static void tu_image_view_copy_blit(struct tu_image_view *iview, struct tu_image *image, diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c index d1fb52ea083..16fae66d38e 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.c +++ b/src/freedreno/vulkan/tu_cmd_buffer.c @@ -1205,8 +1205,6 @@ tu6_tile_render_begin(struct tu_cmd_buffer *cmd, struct tu_cs *cs) tu6_emit_event_write(cmd, cs, LRZ_FLUSH); - /* lrz clear? */ - tu_cs_emit_pkt7(cs, CP_SKIP_IB2_ENABLE_GLOBAL, 1); tu_cs_emit(cs, 0x0); @@ -2922,6 +2920,9 @@ tu_CmdBeginRenderPass2(VkCommandBuffer commandBuffer, (att->clear_mask & (VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT))) { cmd->state.lrz.image = image; cmd->state.lrz.valid = true; + + tu6_clear_lrz(cmd, &cmd->cs, image, &pRenderPassBegin->pClearValues[a]); + tu6_emit_event_write(cmd, &cmd->cs, PC_CCU_FLUSH_COLOR_TS); } else { cmd->state.lrz.valid = false; } diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h index 70ec4ac53d0..9e53f131f5b 100644 --- a/src/freedreno/vulkan/tu_private.h +++ b/src/freedreno/vulkan/tu_private.h @@ -1145,6 +1145,9 @@ tu6_emit_viewport(struct tu_cs *cs, const VkViewport *viewport, uint32_t num_vie void tu6_emit_scissor(struct tu_cs *cs, const VkRect2D *scs, uint32_t scissor_count); +void +tu6_clear_lrz(struct tu_cmd_buffer *cmd, struct tu_cs *cs, struct tu_image* image, const VkClearValue *value); + void tu6_emit_sample_locations(struct tu_cs *cs, const VkSampleLocationsInfoEXT *samp_loc);