Module: Mesa Branch: master Commit: c7dd59b06d93e6820189e2d1e087c0811707ee07 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c7dd59b06d93e6820189e2d1e087c0811707ee07
Author: Marek Olšák <[email protected]> Date: Thu Apr 5 15:53:52 2018 -0400 radeonsi: fix a crash if ps_shader.cso is NULL in si_get_total_colormask --- src/gallium/drivers/radeonsi/si_pipe.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index a794633d14..9fb18a84d3 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; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
