fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-11 03:40:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

lavapipe: fix DS3 min sample setting

Browse source 
if a DS3 pipeline enabling dynamic samples is not bound when samples
are set dynamically, then such a pipeline is later bound, min samples
would have been incorrectly set to 1

instead, flag the update for later and do it just before draw

cc: mesa-stable

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23368>
This commit is contained in:
Mike Blumenkrantz 2023-05-31 15:25:41 -04:00 • committed by Marge Bot
parent 5a85c4432c
commit cc9e958053
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/gallium/frontends/lavapipe/lvp_execute.c
View file

@ -434,6 +434,25 @@ static void emit_compute_state(struct rendering_state *state)
}
}
static void
update_min_samples(struct rendering_state *state)
{
state->min_samples = 1;
if (state->sample_shading) {
state->min_samples = ceil(state->rast_samples * state->min_sample_shading);
if (state->min_samples > 1)
state->min_samples = state->rast_samples;
if (state->min_samples < 1)
state->min_samples = 1;
}
if (state->force_min_sample)
state->min_samples = state->rast_samples;
if (state->rast_samples != state->framebuffer.samples) {
state->framebuffer.samples = state->rast_samples;
state->pctx->set_framebuffer_state(state->pctx, &state->framebuffer);
}
}
static void emit_state(struct rendering_state *state)
{
if (!state->shaders[MESA_SHADER_FRAGMENT] && !state->noop_fs_bound) {
@ -498,6 +517,7 @@ static void emit_state(struct rendering_state *state)
}
if (state->min_samples_dirty) {
update_min_samples(state);
cso_set_min_samples(state->cso, state->min_samples);
state->min_samples_dirty = false;
}
@ -663,21 +683,7 @@ update_samples(struct rendering_state *state, VkSampleCountFlags samples)
state->rast_samples = samples;
state->rs_dirty |= state->rs_state.multisample != (samples > 1);
state->rs_state.multisample = samples > 1;
state->min_samples = 1;
if (state->sample_shading) {
state->min_samples = ceil(samples * state->min_sample_shading);
if (state->min_samples > 1)
state->min_samples = samples;
if (state->min_samples < 1)
state->min_samples = 1;
}
if (state->force_min_sample)
state->min_samples = samples;
state->min_samples_dirty = true;
if (samples != state->framebuffer.samples) {
state->framebuffer.samples = samples;
state->pctx->set_framebuffer_state(state->pctx, &state->framebuffer);
}
}
static void