fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 07:18:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

u_blitter: stop leaking saved blitter states on no-op blits

Browse source 
drivers expect blitter to clean up after itself

cc: mesa-stable

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29122>
(cherry picked from commit cd004defd4)
This commit is contained in:
Mike Blumenkrantz 2024-05-09 10:48:45 -04:00 • committed by Eric Engestrom
parent cb375dfe03
commit 020d145f4a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -274,7 +274,7 @@
"description": "u_blitter: stop leaking saved blitter states on no-op blits",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

8
src/gallium/auxiliary/util/u_blitter.c
View file

@ -2014,6 +2014,7 @@ void util_blitter_blit_generic(struct blitter_context *blitter,
unsigned dst_sample)
{
struct blitter_context_priv *ctx = (struct blitter_context_priv*)blitter;
unsigned count = 0;
struct pipe_context *pipe = ctx->base.pipe;
enum pipe_texture_target src_target = src->target;
unsigned src_samples = src->texture->nr_samples;
@ -2038,7 +2039,7 @@ void util_blitter_blit_generic(struct blitter_context *blitter,
/* Return if there is nothing to do. */
if (!dst_has_color && !dst_has_depth && !dst_has_stencil) {
return;
goto out;
}
bool is_scaled = dstbox->width != abs(srcbox->width) ||
@ -2170,7 +2171,6 @@ void util_blitter_blit_generic(struct blitter_context *blitter,
}
/* Set samplers. */
unsigned count = 0;
if (src_has_depth && src_has_stencil &&
(dst_has_color || (dst_has_depth && dst_has_stencil))) {
/* Setup two samplers, one for depth and the other one for stencil. */
@ -2223,7 +2223,8 @@ void util_blitter_blit_generic(struct blitter_context *blitter,
do_blits(ctx, dst, dstbox, src, src_width0, src_height0,
srcbox, dst_has_depth || dst_has_stencil, use_txf, sample0_only,
dst_sample);
util_blitter_unset_running_flag(blitter);
out:
util_blitter_restore_vertex_states(blitter);
util_blitter_restore_fragment_states(blitter);
util_blitter_restore_textures_internal(blitter, count);
@ -2232,7 +2233,6 @@ void util_blitter_blit_generic(struct blitter_context *blitter,
pipe->set_scissor_states(pipe, 0, 1, &ctx->base.saved_scissor);
}
util_blitter_restore_render_cond(blitter);
util_blitter_unset_running_flag(blitter);
}
void