From 58441d014e0337749ed3dab2be035fc244691452 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 9 Mar 2026 13:14:24 +0100 Subject: [PATCH] radv: stop checking whether HTILE is compressed with the UNDEFINED layout This doesn't make sense. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index ea413da0be5..96d8b81461d 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -5595,15 +5595,25 @@ radv_emit_framebuffer_state(struct radv_cmd_buffer *cmd_buffer) cmd_buffer->state.last_subpass_color_count = render->color_att_count; if (render->ds_att.iview) { + bool depth_compressed = false, stencil_compressed = false; struct radv_image_view *iview = render->ds_att.iview; const struct radv_image *image = iview->image; + radv_cs_add_buffer(device->ws, cs->b, image->bindings[0].bo); uint32_t qf_mask = radv_image_queue_family_mask(image, cmd_buffer->qf, cmd_buffer->qf); - bool depth_compressed = - radv_layout_is_htile_compressed(device, image, iview->vk.base_mip_level, render->ds_att.layout, qf_mask); - bool stencil_compressed = radv_layout_is_htile_compressed(device, image, iview->vk.base_mip_level, - render->ds_att.stencil_layout, qf_mask); + + if (render->ds_att_aspects & VK_IMAGE_ASPECT_DEPTH_BIT) { + assert(render->ds_att.layout); + depth_compressed = + radv_layout_is_htile_compressed(device, image, iview->vk.base_mip_level, render->ds_att.layout, qf_mask); + } + + if (render->ds_att_aspects & VK_IMAGE_ASPECT_STENCIL_BIT) { + assert(render->ds_att.stencil_layout); + stencil_compressed = radv_layout_is_htile_compressed(device, image, iview->vk.base_mip_level, + render->ds_att.stencil_layout, qf_mask); + } if (pdev->info.gfx_level >= GFX12) { radv_gfx12_emit_fb_ds_state(cmd_buffer, &render->ds_att.ds);