From 0311bc6d0e6b9a67892b16852aee979e5c42f64b Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 20 May 2025 10:57:39 -0400 Subject: [PATCH] llvmpipe: disable conditional rendering mem for blits u_blitter doesn't support this, and changing u_blitter to support a niche lavapipe feature seems like overkill fixes dEQP-VK.conditional_rendering.conditional_ignore.resolve_image* cc: mesa-stable Reviewed-by: Konstantin Seurer Part-of: (cherry picked from commit 753d3e71d31ebe2a0389dca07c6d756bed896e22) --- .pick_status.json | 2 +- src/gallium/drivers/llvmpipe/lp_surface.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 17a1b5b2497..a847e378455 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4814,7 +4814,7 @@ "description": "llvmpipe: disable conditional rendering mem for blits", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/llvmpipe/lp_surface.c b/src/gallium/drivers/llvmpipe/lp_surface.c index 0fb74534c4c..cbf41b9c9ff 100644 --- a/src/gallium/drivers/llvmpipe/lp_surface.c +++ b/src/gallium/drivers/llvmpipe/lp_surface.c @@ -191,7 +191,12 @@ lp_blit(struct pipe_context *pipe, util_blitter_save_render_condition(lp->blitter, lp->render_cond_query, lp->render_cond_cond, lp->render_cond_mode); + + void *render_cond_buffer = lp->render_cond_buffer; + if (!blit_info->render_condition_enable) + lp->render_cond_buffer = NULL; util_blitter_blit(lp->blitter, &info, NULL); + lp->render_cond_buffer = render_cond_buffer; }