pvr: Fixup for deqp-vk.api 2d.optimal.* conformance
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
macOS-CI / macOS-CI (xlib) (push) Waiting to run

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 <nick.hamilton@imgtec.com>
Acked-by: Frank Binns <frank.binns@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40456>
This commit is contained in:
Arjob Mukherjee 2026-03-11 08:19:29 +00:00 committed by Marge Bot
parent 96cfb1cb7f
commit 3df9ec7ae3
2 changed files with 3 additions and 7 deletions

View file

@ -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

View file

@ -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;
}