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 cd1b082b8c8ed85be6191620717760281d6929c0..aa03f00f558ff276ae8ad318187bd2506c2cf9a1 100644 (file)
--- 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)