From 407e692c3c779fd0df40aa25c385788a3d7a2b19 Mon Sep 17 00:00:00 2001
From: Luigi Santivetti <luigi.santivetti@imgtec.com>
Date: Mon, 2 Feb 2026 14:25:21 +0200
Subject: [PATCH] pvr: fix logic for setting DSMERGE and PICKD

In order to set DSMERGE, and eventually PICKD-epth, both the source and
the destination have to be combined D/S formats.
Removed tests that now currently pass

Fix for deqp:
  dEQP-VK.renderpass2.depth_stencil_resolve.*.*.d32_sfloat_s8_uint.*
  dEQP-VK.renderpass2.depth_stencil_resolve.*.*.d24_unorm_s8_uint.*

Signed-off-by: Luigi Santivetti <luigi.santivetti@imgtec.com>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39654>
---
 src/imagination/ci/bxs-4-64-fails.txt   | 104 ------------------------
 src/imagination/vulkan/pvr_formats.h    |   6 ++
 src/imagination/vulkan/rogue/pvr_blit.c |   3 +-
 3 files changed, 8 insertions(+), 105 deletions(-)

diff --git a/src/imagination/ci/bxs-4-64-fails.txt b/src/imagination/ci/bxs-4-64-fails.txt
index c4a3cc72952..5c64c311dfb 100644
--- a/src/imagination/ci/bxs-4-64-fails.txt
+++ b/src/imagination/ci/bxs-4-64-fails.txt
@@ -255,119 +255,15 @@ dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed9_multiview,F
 dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.suballocation.attachment.4.568,Fail
 dEQP-VK.renderpasses.renderpass1.dedicated_allocation.attachment_allocation.input_output.71,Fail
 dEQP-VK.renderpasses.renderpass1.suballocation.attachment_allocation.input_output.71,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_2.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_2.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_2.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_2.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_2.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil_samplemask,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil_samplemask,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_4.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_4.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_4.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_4.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_4.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil_samplemask,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_17_1.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil_samplemask,Fail
 dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d24_unorm_s8_uint.compatibility_depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d24_unorm_s8_uint.compatibility_depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d24_unorm_s8_uint.compatibility_depth_zero_stencil_zero_testing_depth,Fail
 dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d24_unorm_s8_uint.compatibility_depth_zero_stencil_zero_testing_stencil,Crash
 dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d24_unorm_s8_uint_separate_layouts.compatibility_depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d24_unorm_s8_uint_separate_layouts.compatibility_depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d24_unorm_s8_uint_separate_layouts.compatibility_depth_zero_stencil_zero_testing_depth,Fail
 dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d24_unorm_s8_uint_separate_layouts.compatibility_depth_zero_stencil_zero_testing_stencil,Fail
 dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint.compatibility_depth_none_stencil_zero_testing_stencil,Fail
 dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint.compatibility_depth_zero_stencil_none_testing_depth,Fail
 dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint.compatibility_depth_zero_stencil_zero_testing_depth,Fail
 dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint.compatibility_depth_zero_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil_samplemask,Fail
 dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint_separate_layouts.compatibility_depth_none_stencil_zero_testing_stencil,Fail
 dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint_separate_layouts.compatibility_depth_zero_stencil_none_testing_depth,Fail
 dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint_separate_layouts.compatibility_depth_zero_stencil_zero_testing_depth,Fail
 dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint_separate_layouts.compatibility_depth_zero_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil_samplemask,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_4.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_4.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_4.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_4.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_4.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil_samplemask,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil_samplemask,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_2.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_2.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_2.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_2.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_2.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil_samplemask,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil_samplemask,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_4.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_4.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_4.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_4.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_4.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil_samplemask,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil_samplemask,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_2.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_2.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_2.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_2.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_2.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil_samplemask,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil_samplemask,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_4.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_4.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_4.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_4.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_4.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil_samplemask,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil_samplemask,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_2.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_2.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_2.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_2.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_2.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil_samplemask,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil_samplemask,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_4.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_4.d32_sfloat_s8_uint.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_4.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_4.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_4.d32_sfloat_s8_uint.depth_zero_stencil_none_testing_stencil_samplemask,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_4.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_none_testing_stencil_samplemask,Fail
diff --git a/src/imagination/vulkan/pvr_formats.h b/src/imagination/vulkan/pvr_formats.h
index 23da3571189..131785a7b55 100644
--- a/src/imagination/vulkan/pvr_formats.h
+++ b/src/imagination/vulkan/pvr_formats.h
@@ -273,6 +273,12 @@ static inline bool pvr_vk_format_is_fully_normalized(VkFormat vk_format)
    return true;
 }
 
+static inline bool
+pvr_vk_format_is_combined_ds(VkFormat format)
+{
+   return vk_format_has_depth(format) && vk_format_has_stencil(format);
+}
+
 static inline uint32_t
 pvr_vk_format_get_common_color_channel_count(VkFormat src_format,
                                              VkFormat dst_format)
diff --git a/src/imagination/vulkan/rogue/pvr_blit.c b/src/imagination/vulkan/rogue/pvr_blit.c
index 91bdeb00593..00a859ab200 100644
--- a/src/imagination/vulkan/rogue/pvr_blit.c
+++ b/src/imagination/vulkan/rogue/pvr_blit.c
@@ -549,7 +549,8 @@ pvr_copy_or_resolve_image_region(struct pvr_cmd_buffer *cmd_buffer,
    uint32_t max_slices;
    uint32_t flags = 0U;
 
-   if (src->vk.format == VK_FORMAT_D24_UNORM_S8_UINT &&
+   if (pvr_vk_format_is_combined_ds(src->vk.format) &&
+       pvr_vk_format_is_combined_ds(dst->vk.format) &&
        region->srcSubresource.aspectMask !=
           (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) {
       /* Takes the stencil of the source and the depth of the destination and