i965: Use immediate float operands for some VS instructions.

[mesa.git] / src / mesa / drivers / dri / i965 / brw_wm_surface_state.c

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 ce0bf0b97d24af30d44a98c1bfe52d64a11c1aeb..e51a1a0e26a8629b435040ee49cf1d5fbadad502 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -261,7 +261,7 @@ brw_update_texture_surface( GLcontext *ctx, GLuint unit )
 
    key.format = firstImage->TexFormat;
    key.internal_format = firstImage->InternalFormat;
-   key.pitch = intelObj->mt->pitch;
+   key.pitch = intelObj->mt->region->pitch;
    key.depth = firstImage->Depth;
    key.bo = intelObj->mt->region->buffer;
    key.offset = 0;
@@ -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