KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/blitter: fix sampler restore with 0 saved samplers 

in a sequence where a driver saves 0 sampler/views before calling
u_blitter, the previous state of having 0 sampler/views bound would
not be restored as expected, resulting in stale sampler/views which
could affect behavior before new sampler/views were bound

cc: mesa-stable

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16178>
This commit is contained in:
Mike Blumenkrantz 2022-04-26 08:32:54 -04:00 committed by Marge Bot
parent 969512d696
commit 38ab178c4a
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/gallium/auxiliary/util/u_blitter.c
View File

@ -778,23 +778,35 @@ static void blitter_check_saved_textures(ASSERTED struct blitter_context_priv *c
assert(ctx->base.saved_num_sampler_views != ~0u);
}
void util_blitter_restore_textures(struct blitter_context *blitter)
static void util_blitter_restore_textures_internal(struct blitter_context *blitter, unsigned count)
{
struct blitter_context_priv *ctx = (struct blitter_context_priv*)blitter;
struct pipe_context *pipe = ctx->base.pipe;
unsigned i;
/* Fragment sampler states. */
pipe->bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, 0,
ctx->base.saved_num_sampler_states,
ctx->base.saved_sampler_states);
void *states[2] = {NULL};
assert(count <= ARRAY_SIZE(states));
if (ctx->base.saved_num_sampler_states)
pipe->bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, 0,
ctx->base.saved_num_sampler_states,
ctx->base.saved_sampler_states);
else if (count)
pipe->bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, 0,
count,
states);
ctx->base.saved_num_sampler_states = ~0;
/* Fragment sampler views. */
pipe->set_sampler_views(pipe, PIPE_SHADER_FRAGMENT, 0,
ctx->base.saved_num_sampler_views, 0, true,
ctx->base.saved_sampler_views);
if (ctx->base.saved_num_sampler_views)
pipe->set_sampler_views(pipe, PIPE_SHADER_FRAGMENT, 0,
ctx->base.saved_num_sampler_views, 0, true,
ctx->base.saved_sampler_views);
else if (count)
pipe->set_sampler_views(pipe, PIPE_SHADER_FRAGMENT, 0,
0, count, true,
NULL);
/* Just clear them to NULL because set_sampler_views(take_ownership = true). */
for (i = 0; i < ctx->base.saved_num_sampler_views; i++)
@ -803,6 +815,11 @@ void util_blitter_restore_textures(struct blitter_context *blitter)
ctx->base.saved_num_sampler_views = ~0;
}
void util_blitter_restore_textures(struct blitter_context *blitter)
{
util_blitter_restore_textures_internal(blitter, 0);
}
void util_blitter_restore_constant_buffer_state(struct blitter_context *blitter)
{
struct pipe_context *pipe = blitter->pipe;
@ -2136,6 +2153,7 @@ 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. */
@ -2150,6 +2168,7 @@ void util_blitter_blit_generic(struct blitter_context *blitter,
views[0] = src;
views[1] = pipe->create_sampler_view(pipe, src->texture, &templ);
count = 2;
pipe->set_sampler_views(pipe, PIPE_SHADER_FRAGMENT, 0, 2, 0, false, views);
pipe->bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, 0, 2, samplers);
@ -2165,12 +2184,14 @@ void util_blitter_blit_generic(struct blitter_context *blitter,
view = pipe->create_sampler_view(pipe, src->texture, &templ);
count = 1;
pipe->set_sampler_views(pipe, PIPE_SHADER_FRAGMENT, 0, 1, 0, false, &view);
pipe->bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT,
0, 1, &sampler_state);
pipe_sampler_view_reference(&view, NULL);
} else {
count = 1;
pipe->set_sampler_views(pipe, PIPE_SHADER_FRAGMENT, 0, 1, 0, false, &src);
pipe->bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT,
0, 1, &sampler_state);
@ -2187,7 +2208,7 @@ void util_blitter_blit_generic(struct blitter_context *blitter,
util_blitter_restore_vertex_states(blitter);
util_blitter_restore_fragment_states(blitter);
util_blitter_restore_textures(blitter);
util_blitter_restore_textures_internal(blitter, count);
util_blitter_restore_fb_state(blitter);
if (scissor) {
pipe->set_scissor_states(pipe, 0, 1, &ctx->base.saved_scissor);
@ -2329,7 +2350,7 @@ void util_blitter_generate_mipmap(struct blitter_context *blitter,
util_blitter_restore_vertex_states(blitter);
util_blitter_restore_fragment_states(blitter);
util_blitter_restore_textures(blitter);
util_blitter_restore_textures_internal(blitter, 1);
util_blitter_restore_fb_state(blitter);
util_blitter_restore_render_cond(blitter);
util_blitter_unset_running_flag(blitter);
@ -3008,7 +3029,7 @@ util_blitter_stencil_fallback(struct blitter_context *blitter,
util_blitter_restore_vertex_states(blitter);
util_blitter_restore_fragment_states(blitter);
util_blitter_restore_textures(blitter);
util_blitter_restore_textures_internal(blitter, 1);
util_blitter_restore_fb_state(blitter);
util_blitter_restore_render_cond(blitter);
util_blitter_restore_constant_buffer_state(blitter);