From: Marek Olšák <marek.olsak@amd.com>
Date: Thu, 5 Apr 2018 19:53:52 +0000 (-0400)
Subject: radeonsi: fix a crash if ps_shader.cso is NULL in si_get_total_colormask
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c7dd59b06d93e6820189e2d1e087c0811707ee07;p=mesa.git

radeonsi: fix a crash if ps_shader.cso is NULL in si_get_total_colormask
---

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index a794633d14b..9fb18a84d31 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -1237,6 +1237,9 @@ static inline unsigned si_get_total_colormask(struct si_context *sctx)
 		return 0;
 
 	struct si_shader_selector *ps = sctx->ps_shader.cso;
+	if (!ps)
+		return 0;
+
 	unsigned colormask = sctx->framebuffer.colorbuf_enabled_4bit &
 			     sctx->queued.named.blend->cb_target_mask;