From c5195a67b84a6eb71c29abe9114073e6ec21a1fc Mon Sep 17 00:00:00 2001 From: Matt Coster Date: Thu, 11 May 2023 14:59:45 +0100 Subject: [PATCH] pvr: Remove bad assert in pvr_clear_attachments() Fixes: dEQP-VK.renderpass.suballocation.formats.d16_unorm.input .dont_care.dont_care.clear Fixes: dEQP-VK.renderpass.suballocation.formats.d32_sfloat.input .dont_care.dont_care.clear Signed-off-by: Matt Coster Reported-by: James Glanville Reviewed-by: Frank Binns Part-of: --- src/imagination/vulkan/pvr_blit.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/imagination/vulkan/pvr_blit.c b/src/imagination/vulkan/pvr_blit.c index bb4a43c9564..9d936960f78 100644 --- a/src/imagination/vulkan/pvr_blit.c +++ b/src/imagination/vulkan/pvr_blit.c @@ -1786,7 +1786,6 @@ static void pvr_clear_attachments(struct pvr_cmd_buffer *cmd_buffer, struct pvr_sub_cmd_gfx *sub_cmd = &cmd_buffer->state.current_sub_cmd->gfx; struct pvr_device_info *dev_info = &cmd_buffer->device->pdevice->dev_info; struct pvr_render_subpass *sub_pass = &pass->subpasses[hw_pass->index]; - bool z_replicate = hw_pass->z_replicate != -1; uint32_t vs_output_size_in_bytes; bool vs_has_rt_id_output; @@ -1868,7 +1867,7 @@ static void pvr_clear_attachments(struct pvr_cmd_buffer *cmd_buffer, vs_has_rt_id_output); if (result != VK_SUCCESS) return; - } else if (z_replicate && + } else if (hw_pass->z_replicate != -1 && attachment->aspectMask & VK_IMAGE_ASPECT_DEPTH_BIT) { const VkClearColorValue clear_color = { .float32 = { [0] = attachment->clearValue.depthStencil.depth, }, @@ -1879,7 +1878,6 @@ static void pvr_clear_attachments(struct pvr_cmd_buffer *cmd_buffer, uint32_t packed_clear_color[PVR_CLEAR_COLOR_ARRAY_SIZE]; const struct usc_mrt_resource *mrt_resource; - assert(hw_pass->z_replicate > 0); mrt_resource = &hw_pass->setup.mrt_resources[hw_pass->z_replicate]; pvr_get_hw_clear_color(VK_FORMAT_R32_SFLOAT,