diff options
| author | Eric Anholt <[email protected]> | 2011-10-22 11:56:01 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2011-10-29 12:16:12 -0700 |
| commit | 78188bc53769384fdeb8d7618af882c86530a4d5 (patch) | |
| tree | 85ed7b134d701f63526b5caebda5632027a7961d | |
| parent | eaf4d3e6e2493a6e0b20d1205a5fb33ce500c9c2 (diff) | |
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 <[email protected]>
Acked-by: Paul Berry <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_draw.c | 7 |
1 files changed, 6 insertions, 1 deletions
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) |