Mesa (7.8-gles): i965: Fix assertion for surface tile offset usage on Ironlake.

[Kristian Høgsberg]

Module: Mesa
Branch: 7.8-gles
Commit: 71f028bf93bb5dcea1596365f4dbe1be46ea9b29
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=71f028bf93bb5dcea1596365f4dbe1be46ea9b29

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Apr 22 15:24:26 2010 -0700

i965: Fix assertion for surface tile offset usage on Ironlake.

Fixes assertion failure in fbo-generatemipmap-npot.
(cherry picked from commit b2e52e727849bd78f8600931261ae69c1b29d6a6)

---

 src/mesa/drivers/dri/i965/brw_wm_surface_state.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index ce0bf0b..99ae02b 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -588,7 +588,7 @@ brw_update_renderbuffer_surface(struct brw_context *brw,
 	    tile_base = ((key.draw_y / 32) * (32 * pitch));
 	    tile_base += (key.draw_x - tile_x) / (128 / key.cpp) * 4096;
 	 }
-	 assert(intel->is_g4x || (tile_x == 0 && tile_y == 0));
+	 assert(brw->has_surface_tile_offset || (tile_x == 0 && tile_y == 0));
 	 assert(tile_x % 4 == 0);
 	 assert(tile_y % 2 == 0);
 	 /* Note that the low bits of these fields are missing, so