From c7366985e5c162c2a76e2f159a564aa0c38ecbd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 11 Dec 2024 11:34:49 -0500 Subject: [PATCH] r600: fix a constant buffer memory leak for u_blitter Fixes: 3d6e44fd - r300,r600,svga: save the FS constant buffer for u_blitter to fix a regression Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12131 Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/r600/r600_blit.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c index 9bedf87c7b0..881b12471e1 100644 --- a/src/gallium/drivers/r600/r600_blit.c +++ b/src/gallium/drivers/r600/r600_blit.c @@ -16,8 +16,9 @@ enum r600_blitter_op /* bitmask */ R600_SAVE_TEXTURES = 2, R600_SAVE_FRAMEBUFFER = 4, R600_DISABLE_RENDER_COND = 8, + R600_SAVE_CONST_BUF0 = 16, - R600_CLEAR = R600_SAVE_FRAGMENT_STATE, + R600_CLEAR = R600_SAVE_FRAGMENT_STATE | R600_SAVE_CONST_BUF0, R600_CLEAR_SURFACE = R600_SAVE_FRAGMENT_STATE | R600_SAVE_FRAMEBUFFER, @@ -61,6 +62,9 @@ static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op util_blitter_save_depth_stencil_alpha(rctx->blitter, rctx->dsa_state.cso); util_blitter_save_stencil_ref(rctx->blitter, &rctx->stencil_ref.pipe_state); util_blitter_save_sample_mask(rctx->blitter, rctx->sample_mask.sample_mask, rctx->ps_iter_samples); + } + + if (op & R600_SAVE_CONST_BUF0) { util_blitter_save_fragment_constant_buffer_slot(rctx->blitter, &rctx->constbuf_state[PIPE_SHADER_FRAGMENT].cb[0]); }