From: Eric Anholt <eric@anholt.net>
Date: Sat, 22 Oct 2011 18:56:01 +0000 (-0700)
Subject: i965: Check Fallback again after upload.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=78188bc53769384fdeb8d7618af882c86530a4d5;p=mesa.git

i965: Check Fallback again after upload.

As we move state to emit() time from prepare() time, a couple of the
places that flag fallbacks will move here.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Paul Berry <stereotype441@gmail.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index cd1b082b8c8..aa03f00f558 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -361,7 +361,6 @@ retry:
       if (brw->state.dirty.brw) {
 	 brw_validate_state(brw);
 
-	 /* Various fallback checks:  */
 	 if (brw->intel.Fallback) {
 	    retval = false;
 	    goto out;
@@ -369,6 +368,12 @@ retry:
 
 	 intel->no_batch_wrap = true;
 	 brw_upload_state(brw);
+
+	 if (unlikely(brw->intel.Fallback)) {
+	    intel->no_batch_wrap = false;
+	    retval = false;
+	    goto out;
+	 }
       }
 
       if (intel->gen >= 7)