Module: Mesa Branch: main Commit: f7d1fff23fc6c316f591a4e934079dd707b1a996 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7d1fff23fc6c316f591a4e934079dd707b1a996
Author: Mike Blumenkrantz <[email protected]> Date: Wed Mar 1 09:03:45 2023 -0500 zink: disable queries for clear_texture() this otherwise can do weird things cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21628> --- src/gallium/drivers/zink/zink_clear.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gallium/drivers/zink/zink_clear.c b/src/gallium/drivers/zink/zink_clear.c index bb00ec86af5..0aaeb2c169e 100644 --- a/src/gallium/drivers/zink/zink_clear.c +++ b/src/gallium/drivers/zink/zink_clear.c @@ -455,8 +455,10 @@ zink_clear_texture(struct pipe_context *pctx, util_blitter_save_framebuffer(ctx->blitter, &ctx->fb_state); set_clear_fb(pctx, surf, NULL); ctx->blitting = true; + ctx->queries_disabled = true; pctx->clear(pctx, PIPE_CLEAR_COLOR0, &scissor, &color, 0, 0); util_blitter_restore_fb_state(ctx->blitter); + ctx->queries_disabled = false; ctx->blitting = false; } else { float depth = 0.0; @@ -477,8 +479,10 @@ zink_clear_texture(struct pipe_context *pctx, util_blitter_save_framebuffer(ctx->blitter, &ctx->fb_state); ctx->blitting = true; set_clear_fb(pctx, NULL, surf); + ctx->queries_disabled = true; pctx->clear(pctx, flags, &scissor, NULL, depth, stencil); util_blitter_restore_fb_state(ctx->blitter); + ctx->queries_disabled = false; ctx->blitting = false; } /* this will never destroy the surface */
