diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2020-01-30 16:58:15 -0500 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-02-11 09:27:01 -0800 |
| commit | 007013c754ac1b0b98e5950b0bc6aaa3d330c3ff (patch) | |
| tree | 06cf347248453b79e8630bbc77a7a4e8f49fa275 | |
| parent | c17c8119c3d8b3a8efb04d74db76337929adea11 (diff) | |
radeonsi: fix the DCC MSAA bug workaround
Cc: 19.3 20.0 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3646>
(cherry picked from commit fbb27eebc8cab1a5d70ea67a37de8d18f20a88f0)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 95ebc79221d..c45df7b02a6 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -355,7 +355,7 @@ "description": "radeonsi: fix the DCC MSAA bug workaround", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 783ede89d0d..311453dae0a 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -685,7 +685,7 @@ static void si_bind_blend_state(struct pipe_context *ctx, void *state) if (old_blend->cb_target_mask != blend->cb_target_mask || old_blend->dual_src_blend != blend->dual_src_blend || - (old_blend->blend_enable_4bit != blend->blend_enable_4bit && + (old_blend->dcc_msaa_corruption_4bit != blend->dcc_msaa_corruption_4bit && sctx->framebuffer.nr_samples >= 2 && sctx->screen->dcc_msaa_allowed)) si_mark_atom_dirty(sctx, &sctx->atoms.s.cb_render_state); |