From 4ecfc45cd0f4fe37acb4640eeb3ed3eb3d3bb0ef Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Thu, 30 May 2024 17:16:03 +0200 Subject: [PATCH] panvk: Allow ZS formats on 1D/3D images There's no real blocker here, so let's just allow it. Signed-off-by: Boris Brezillon Reviewed-by: Mary Guillemard Part-of: --- src/panfrost/ci/panfrost-g52-fails.txt | 4 ++++ src/panfrost/vulkan/panvk_physical_device.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/panfrost/ci/panfrost-g52-fails.txt b/src/panfrost/ci/panfrost-g52-fails.txt index cc918120fe8..c9d41306b8e 100644 --- a/src/panfrost/ci/panfrost-g52-fails.txt +++ b/src/panfrost/ci/panfrost-g52-fails.txt @@ -2608,3 +2608,7 @@ dEQP-VK.compute.pipeline.indirect_dispatch.upload_buffer.multiple_groups,Crash dEQP-VK.compute.pipeline.indirect_dispatch.upload_buffer.multiple_groups_multiple_invocations,Crash dEQP-VK.compute.pipeline.indirect_dispatch.upload_buffer.single_invocation,Crash dEQP-VK.compute.pipeline.indirect_dispatch.upload_buffer.small_offset,Crash + +# Filtering of 3D depth-stencil textures fails unless we set SAMPLER:round_to_nearest_even=false +dEQP-VK.texture.filtering.3d.formats.d24_unorm_s8_uint_stencil.d24_unorm_s8_uint_stencil_nearest,Fail +dEQP-VK.texture.filtering.3d.formats.d32_sfloat_s8_uint_stencil.d32_sfloat_s8_uint_stencil_nearest,Fail diff --git a/src/panfrost/vulkan/panvk_physical_device.c b/src/panfrost/vulkan/panvk_physical_device.c index c2a1cff9219..95c7cc9f01e 100644 --- a/src/panfrost/vulkan/panvk_physical_device.c +++ b/src/panfrost/vulkan/panvk_physical_device.c @@ -1090,10 +1090,6 @@ get_image_format_properties(struct panvk_physical_device *physical_device, if (format_feature_flags == 0) goto unsupported; - if (info->type != VK_IMAGE_TYPE_2D && - util_format_is_depth_or_stencil(format)) - goto unsupported; - switch (info->type) { default: unreachable("bad vkimage type");