diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2019-07-30 17:43:41 -0400 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2019-08-06 17:08:39 -0400 |
| commit | 8b8819e88af0070c242d2d4289ace0eebedbc09c (patch) | |
| tree | f89a0b09c866595bfe06042ea5238c8325bfc4b4 /src/gallium/drivers/radeonsi/si_state.c | |
| parent | b758eed9c373db14a5acc04d9522ec9d74e51f1b (diff) | |
| download | mesa-8b8819e88af0070c242d2d4289ace0eebedbc09c.tar.gz | |
radeonsi: make sure that DSA state != NULL and remove all NULL checking
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_state.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index eb191b927c4..fad027a13f2 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -1303,8 +1303,8 @@ static void si_bind_dsa_state(struct pipe_context *ctx, void *state) struct si_state_dsa *old_dsa = sctx->queued.named.dsa; struct si_state_dsa *dsa = state; - if (!state) - return; + if (!dsa) + dsa = (struct si_state_dsa *)sctx->noop_dsa; si_pm4_bind_state(sctx, dsa, dsa); @@ -1314,19 +1314,17 @@ static void si_bind_dsa_state(struct pipe_context *ctx, void *state) si_mark_atom_dirty(sctx, &sctx->atoms.s.stencil_ref); } - if (!old_dsa || old_dsa->alpha_func != dsa->alpha_func) + if (old_dsa->alpha_func != dsa->alpha_func) sctx->do_update_shaders = true; if (sctx->screen->dpbb_allowed && - (!old_dsa || - (old_dsa->depth_enabled != dsa->depth_enabled || + ((old_dsa->depth_enabled != dsa->depth_enabled || old_dsa->stencil_enabled != dsa->stencil_enabled || old_dsa->db_can_write != dsa->db_can_write))) si_mark_atom_dirty(sctx, &sctx->atoms.s.dpbb_state); if (sctx->screen->has_out_of_order_rast && - (!old_dsa || - memcmp(old_dsa->order_invariance, dsa->order_invariance, + (memcmp(old_dsa->order_invariance, dsa->order_invariance, sizeof(old_dsa->order_invariance)))) si_mark_atom_dirty(sctx, &sctx->atoms.s.msaa_config); } |