From 339a838b46cd79487bd82c0b46fb6df86b3836bc Mon Sep 17 00:00:00 2001 From: Luigi Santivetti Date: Fri, 6 Feb 2026 13:38:50 +0000 Subject: [PATCH] pvr: fix ds merge logic for blit image to image Fixes: 407e692c3 ("pvr: fix logic for setting DSMERGE and PICKD") Signed-off-by: Luigi Santivetti Reviewed-by: Frank Binns Part-of: --- src/imagination/vulkan/rogue/pvr_blit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/imagination/vulkan/rogue/pvr_blit.c b/src/imagination/vulkan/rogue/pvr_blit.c index 8cb3eb7a582..8db1287f128 100644 --- a/src/imagination/vulkan/rogue/pvr_blit.c +++ b/src/imagination/vulkan/rogue/pvr_blit.c @@ -790,8 +790,8 @@ void pvr_rogue_CmdCopyImage2(VkCommandBuffer commandBuffer, VK_FROM_HANDLE(pvr_image, src, pCopyImageInfo->srcImage); VK_FROM_HANDLE(pvr_image, dst, pCopyImageInfo->dstImage); - const bool can_merge_ds = src->vk.format == VK_FORMAT_D24_UNORM_S8_UINT && - dst->vk.format == VK_FORMAT_D24_UNORM_S8_UINT; + const bool can_merge_ds = pvr_vk_format_is_combined_ds(src->vk.format) && + pvr_vk_format_is_combined_ds(dst->vk.format); PVR_CHECK_COMMAND_BUFFER_BUILDING_STATE(cmd_buffer);