From 26abdef5bcaf0c58bd397bf0eb4aa4d362b55a8d Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Wed, 19 Oct 2022 17:02:26 -0700 Subject: [PATCH] turnip: Be sure we blit depth, not stencil, for Z32FS8 -> Z32F resolves. Fixes: #7143 Part-of: --- src/freedreno/ci/freedreno-a618-fails.txt | 4 ---- src/freedreno/ci/freedreno-a630-fails.txt | 3 --- src/freedreno/vulkan/tu_clear_blit.c | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt index c589522..e6242c0 100644 --- a/src/freedreno/ci/freedreno-a618-fails.txt +++ b/src/freedreno/ci/freedreno-a618-fails.txt @@ -58,7 +58,3 @@ gmem-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_after_bind spill-dEQP-VK.subgroups.ballot_broadcast.compute.subgroupbroadcast_bool,Fail spill-dEQP-VK.subgroups.ballot_broadcast.compute.subgroupbroadcast_bool_requiredsubgroupsize128,Fail - -# https://gitlab.freedesktop.org/mesa/mesa/-/issues/7143 -bypass-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint.compatibility_depth_zero_stencil_zero_testing_depth,Fail -bypass-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint_separate_layouts.compatibility_depth_zero_stencil_zero_testing_depth,Fail diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt index 396cccc..c838b49 100644 --- a/src/freedreno/ci/freedreno-a630-fails.txt +++ b/src/freedreno/ci/freedreno-a630-fails.txt @@ -380,9 +380,6 @@ spec@!opengl 1.0@depth-clear-precision-check@depth24_stencil8,Fail spec@!opengl 1.0@depth-clear-precision-check@depth32,Fail spec@arb_texture_buffer_object@texture-buffer-size-clamp,Fail -bypass-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint.compatibility_depth_zero_stencil_zero_testing_depth,Fail -bypass-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint_separate_layouts.compatibility_depth_zero_stencil_zero_testing_depth,Fail - # https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/3759 # deqp-vk: ../src/freedreno/vulkan/tu_pipeline.c:3894: tu_pipeline_builder_init_graphics: Assertion `subpass->color_count == 0 || !create_info->pColorBlendState || subpass->color_count == create_info->pColorBlendState->attachmentCount' failed dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_after_bind.attachments4_more0,Crash diff --git a/src/freedreno/vulkan/tu_clear_blit.c b/src/freedreno/vulkan/tu_clear_blit.c index 24ab70a..46b5342 100644 --- a/src/freedreno/vulkan/tu_clear_blit.c +++ b/src/freedreno/vulkan/tu_clear_blit.c @@ -2274,7 +2274,7 @@ resolve_sysmem(struct tu_cmd_buffer *cmd, for_each_layer(i, layer_mask, layers) { if (src_separate_ds) { - if (vk_src_format == VK_FORMAT_D32_SFLOAT) { + if (vk_src_format == VK_FORMAT_D32_SFLOAT || vk_dst_format == VK_FORMAT_D32_SFLOAT) { r2d_src_depth(cmd, cs, src, i, VK_FILTER_NEAREST); } else { r2d_src_stencil(cmd, cs, src, i, VK_FILTER_NEAREST); -- 2.7.4