From: Marek Olšák <maraeo@gmail.com>
Date: Thu, 21 Mar 2013 18:29:29 +0000 (+0100)
Subject: radeonsi: fix crash while binding a NULL constant buffer
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=35c522dce461a7d18a471e681413781da702d4b0;p=mesa.git

radeonsi: fix crash while binding a NULL constant buffer

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 7eac477327a..bdd41b45534 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -2491,7 +2491,7 @@ static void si_set_constant_buffer(struct pipe_context *ctx, uint shader, uint i
 	/* Note that the state tracker can unbind constant buffers by
 	 * passing NULL here.
 	 */
-	if (cb == NULL)
+	if (cb == NULL || (!cb->buffer && !cb->user_buffer))
 		return;
 
 	pm4 = CALLOC_STRUCT(si_pm4_state);