From 78188bc53769384fdeb8d7618af882c86530a4d5 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sat, 22 Oct 2011 11:56:01 -0700 Subject: [PATCH] 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 Acked-by: Paul Berry --- src/mesa/drivers/dri/i965/brw_draw.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index cd1b082..aa03f00 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) -- 2.7.4