From: Marek Olšák Date: Sun, 15 Feb 2015 17:12:06 +0000 (+0100) Subject: radeonsi: fix a crash if a stencil ref state is set before a DSA state X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2ead74888a70481aa40b5b6ede42279e1917e66c;p=mesa.git radeonsi: fix a crash if a stencil ref state is set before a DSA state + minor indentation fixes Discovered by Axel Davy. This can't be reproduced with any app, because all state trackers set a DSA state first. Cc: 10.5 10.4 10.3 Reviewed-by: Axel Davy --- diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index fb353ad419d..3eea0b6c18a 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -735,12 +735,16 @@ static void si_delete_rs_state(struct pipe_context *ctx, void *state) */ static void si_update_dsa_stencil_ref(struct si_context *sctx) { - struct si_pm4_state *pm4 = CALLOC_STRUCT(si_pm4_state); + struct si_pm4_state *pm4; struct pipe_stencil_ref *ref = &sctx->stencil_ref; - struct si_state_dsa *dsa = sctx->queued.named.dsa; + struct si_state_dsa *dsa = sctx->queued.named.dsa; - if (pm4 == NULL) - return; + if (!dsa) + return; + + pm4 = CALLOC_STRUCT(si_pm4_state); + if (pm4 == NULL) + return; si_pm4_set_reg(pm4, R_028430_DB_STENCILREFMASK, S_028430_STENCILTESTVAL(ref->ref_value[0]) |