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

r300g: fix crash while binding a NULL constant buffer
---

diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
index ad93510ab3f..2de0fd6b7f9 100644
--- a/src/gallium/drivers/r300/r300_state.c
+++ b/src/gallium/drivers/r300/r300_state.c
@@ -2056,7 +2056,7 @@ static void r300_set_constant_buffer(struct pipe_context *pipe,
     struct r300_constant_buffer *cbuf;
     uint32_t *mapped;
 
-    if (!cb)
+    if (!cb || (!cb->buffer && !cb->user_buffer))
         return;
 
     switch (shader) {