Mesa (master): r300g: Check for NULL Draw during flush.

[Corbin Simpson]

Module: Mesa
Branch: master
Commit: 511bd5f32b67f903b590f00f7ccf8132127ef2e4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=511bd5f32b67f903b590f00f7ccf8132127ef2e4

Author: Corbin Simpson <MostAwesomeDude at gmail.com>
Date:   Thu Oct 22 00:21:08 2009 -0700

r300g: Check for NULL Draw during flush.

Split from the fastpath WIP.

---

 src/gallium/drivers/r300/r300_flush.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_flush.c b/src/gallium/drivers/r300/r300_flush.c
index c222ea0..14a0824 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);
     }