From: Corbin Simpson <MostAwesomeDude@gmail.com>
Date: Thu, 22 Oct 2009 07:21:08 +0000 (-0700)
Subject: r300g: Check for NULL Draw during flush.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=511bd5f32b67f903b590f00f7ccf8132127ef2e4;p=mesa.git

r300g: Check for NULL Draw during flush.

Split from the fastpath WIP.
---

diff --git a/src/gallium/drivers/r300/r300_flush.c b/src/gallium/drivers/r300/r300_flush.c
index c222ea09b17..14a08241fc4 100644
--- a/src/gallium/drivers/r300/r300_flush.c
+++ b/src/gallium/drivers/r300/r300_flush.c
@@ -40,8 +40,10 @@ static void r300_flush(struct pipe_context* pipe,
 
     CS_LOCALS(r300);
     /* We probably need to flush Draw, but we may have been called from
-     * within Draw. This feels kludgy, but it might be the best thing. */
-    if (!r300->draw->flushing) {
+     * within Draw. This feels kludgy, but it might be the best thing.
+     *
+     * Of course, the best thing is to kill Draw with fire. :3 */
+    if (r300->draw && !r300->draw->flushing) {
         draw_flush(r300->draw);
     }