Module: Mesa Branch: main Commit: e6e1d01be089e1a27eac597d1a3da87170495540 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e6e1d01be089e1a27eac597d1a3da87170495540
Author: Mike Blumenkrantz <[email protected]> Date: Thu Mar 9 09:32:34 2023 -0500 lavapipe: set render_condition_enabled=false for vkCmdClearDepthStencilImage this command ignores conditional rendering fixes: dEQP-VK.conditional_rendering.conditional_ignore.clear_condition_host_memory_expect_noop dEQP-VK.conditional_rendering.conditional_ignore.clear_condition_host_memory_secondary_buffer_expect_noop dEQP-VK.conditional_rendering.conditional_ignore.clear_condition_host_memory_secondary_buffer_expect_noop_inverted dEQP-VK.conditional_rendering.conditional_ignore.clear_condition_host_memory_secondary_buffer_inherited_expect_noop dEQP-VK.conditional_rendering.conditional_ignore.clear_condition_local_memory_expect_noop_inverted dEQP-VK.conditional_rendering.conditional_ignore.clear_condition_local_memory_secondary_buffer_expect_noop dEQP-VK.conditional_rendering.conditional_ignore.clear_condition_local_memory_secondary_buffer_expect_noop_inverted dEQP-VK.conditional_rendering.conditional_ignore.clear_condition_local_memory_secondary_buffer_inherited_expect_noop Fixes: fe53c222949 ("lavapipe: fix only clearing depth or stencil paths.") Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21814> --- src/gallium/frontends/lavapipe/ci/lvp-fails.txt | 4 ---- src/gallium/frontends/lavapipe/lvp_execute.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/gallium/frontends/lavapipe/ci/lvp-fails.txt b/src/gallium/frontends/lavapipe/ci/lvp-fails.txt index 219b224a79c..5e970d861b9 100644 --- a/src/gallium/frontends/lavapipe/ci/lvp-fails.txt +++ b/src/gallium/frontends/lavapipe/ci/lvp-fails.txt @@ -5,7 +5,3 @@ dEQP-VK.rasterization.provoking_vertex.transform_feedback.per_pipeline.triangle_ # New CTS failures in 1.3.5.0 dEQP-VK.api.info.format_properties.g10x6_b10x6r10x6_2plane_420_unorm_3pack16,Fail -dEQP-VK.conditional_rendering.conditional_ignore.clear_condition_host_memory_expect_noop_inverted,Fail -dEQP-VK.conditional_rendering.conditional_ignore.clear_condition_host_memory_secondary_buffer_inherited_expect_noop_inverted,Fail -dEQP-VK.conditional_rendering.conditional_ignore.clear_condition_local_memory_expect_noop,Fail -dEQP-VK.conditional_rendering.conditional_ignore.clear_condition_local_memory_secondary_buffer_inherited_expect_noop_inverted,Fail diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c index d6b211d168f..544b7acb67c 100644 --- a/src/gallium/frontends/lavapipe/lvp_execute.c +++ b/src/gallium/frontends/lavapipe/lvp_execute.c @@ -2998,7 +2998,7 @@ static void handle_clear_ds_image(struct vk_cmd_queue_entry *cmd, cmd->u.clear_depth_stencil_image.depth_stencil->depth, cmd->u.clear_depth_stencil_image.depth_stencil->stencil, 0, 0, - width, height, true); + width, height, false); state->pctx->surface_destroy(state->pctx, surf); } }
