From 3df9ec7ae31092ab4a51b1df02ec8048c51c72aa Mon Sep 17 00:00:00 2001 From: Arjob Mukherjee Date: Wed, 11 Mar 2026 08:19:29 +0000 Subject: [PATCH] pvr: Fixup for deqp-vk.api 2d.optimal.* conformance Its no longer an error for depth and stencil formats to have invalid accumulator format. Fixes the following tests: * dEQP-VK.api.info.image_format_properties.2d.optimal.d16_unorm * dEQP-VK.api.info.image_format_properties.2d.optimal.d24_unorm_s8_uint * dEQP-VK.api.info.image_format_properties.2d.optimal.d32_sfloat * dEQP-VK.api.info.image_format_properties.2d.optimal.d32_sfloat_s8_uint * dEQP-VK.api.info.image_format_properties.2d.optimal.s8_uint * dEQP-VK.api.info.image_format_properties.2d.optimal.x8_d24_unorm_pack3 Signed-off-by: Nick Hamilton Acked-by: Frank Binns Part-of: --- src/imagination/ci/bxs-4-64-fails.txt | 6 ------ src/imagination/vulkan/pvr_formats.c | 4 +++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/imagination/ci/bxs-4-64-fails.txt b/src/imagination/ci/bxs-4-64-fails.txt index 601f3fee0b9..da5fcc2d28a 100644 --- a/src/imagination/ci/bxs-4-64-fails.txt +++ b/src/imagination/ci/bxs-4-64-fails.txt @@ -1,9 +1,3 @@ -dEQP-VK.api.info.image_format_properties.2d.optimal.d16_unorm,Fail -dEQP-VK.api.info.image_format_properties.2d.optimal.d24_unorm_s8_uint,Fail -dEQP-VK.api.info.image_format_properties.2d.optimal.d32_sfloat,Fail -dEQP-VK.api.info.image_format_properties.2d.optimal.d32_sfloat_s8_uint,Fail -dEQP-VK.api.info.image_format_properties.2d.optimal.s8_uint,Fail -dEQP-VK.api.info.image_format_properties.2d.optimal.x8_d24_unorm_pack32,Fail dEQP-VK.binding_model.unused_invalid_descriptor.copy.combined_image_sampler,Crash dEQP-VK.binding_model.unused_invalid_descriptor.copy.sampled_image,Crash dEQP-VK.binding_model.unused_invalid_descriptor.copy.storage_buffer,Crash diff --git a/src/imagination/vulkan/pvr_formats.c b/src/imagination/vulkan/pvr_formats.c index 12399637bfa..b46a8454b79 100644 --- a/src/imagination/vulkan/pvr_formats.c +++ b/src/imagination/vulkan/pvr_formats.c @@ -635,7 +635,9 @@ pvr_get_image_format_properties(struct pvr_physical_device *pdevice, if ((info->flags & VK_IMAGE_CREATE_EXTENDED_USAGE_BIT) == 0) { if (usage & (VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) && - !(pvr_format->bind & PVR_BIND_RENDER_TARGET)) { + !vk_format_is_depth_or_stencil(info->format) && + !(pvr_format->bind & PVR_BIND_RENDER_TARGET)) { + result = vk_error(pdevice, VK_ERROR_FORMAT_NOT_SUPPORTED); goto err_unsupported_format; }