Remove pipe->get/put_tile_rgba.

pipe_get/put_tile_rgba() now use pipe->get/put_tile internally.

Also simplify the <format>_get/put_tile_rgba() helper functions and clean up
some inconsitencies in them.

10 files changed, 245 insertions, 414 deletions

diff --git a/src/mesa/pipe/i915simple/i915_surface.c b/src/mesa/pipe/i915simple/i915_surface.c
index 4e1b0929ee..e3c3cdd2e4 100644
--- a/src/mesa/pipe/i915simple/i915_surface.c
+++ b/src/mesa/pipe/i915simple/i915_surface.c
@@ -240,8 +240,6 @@ i915_init_surface_functions(struct i915_context *i915)
    i915->pipe.get_tex_surface = i915_get_tex_surface;
    i915->pipe.get_tile = pipe_get_tile_raw;
    i915->pipe.put_tile = pipe_put_tile_raw;
-   i915->pipe.get_tile_rgba = pipe_get_tile_rgba;
-   i915->pipe.put_tile_rgba = pipe_put_tile_rgba;
 
    i915->pipe.surface_data = i915_surface_data;
    i915->pipe.surface_copy = i915_surface_copy;
diff --git a/src/mesa/pipe/i965simple/brw_surface.c b/src/mesa/pipe/i965simple/brw_surface.c
index 850423bdd5..4eacbdf82b 100644
--- a/src/mesa/pipe/i965simple/brw_surface.c
+++ b/src/mesa/pipe/i965simple/brw_surface.c
@@ -239,8 +239,6 @@ brw_init_surface_functions(struct brw_context *brw)
    brw->pipe.get_tex_surface = brw_get_tex_surface;
    brw->pipe.get_tile = pipe_get_tile_raw;
    brw->pipe.put_tile = pipe_put_tile_raw;
-   brw->pipe.get_tile_rgba = pipe_get_tile_rgba;
-   brw->pipe.put_tile_rgba = pipe_put_tile_rgba;
 
    brw->pipe.surface_data  = brw_surface_data;
    brw->pipe.surface_copy  = brw_surface_copy;
diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index 1a1f4f4e78..25b5dc35e4 100644
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -192,11 +192,6 @@ struct pipe_context {
                     struct pipe_surface *ps,
                     uint x, uint y, uint w, uint h,
                     const void *p, int src_stride);
-   /* XXX temporary here, move these to softpipe */
-   void (*get_tile_rgba)(struct pipe_context *pipe, struct pipe_surface *ps,
-			 uint x, uint y, uint w, uint h, float *p);
-   void (*put_tile_rgba)(struct pipe_context *pipe, struct pipe_surface *ps,
-			 uint x, uint y, uint w, uint h, const float *p);
 
 
    /*
diff --git a/src/mesa/pipe/softpipe/sp_surface.c b/src/mesa/pipe/softpipe/sp_surface.c
index b44ba3e957..6c080d5b5c 100644
--- a/src/mesa/pipe/softpipe/sp_surface.c
+++ b/src/mesa/pipe/softpipe/sp_surface.c
@@ -252,8 +252,6 @@ sp_init_surface_functions(struct softpipe_context *sp)
 {
    sp->pipe.get_tile = pipe_get_tile_raw;
    sp->pipe.put_tile = pipe_put_tile_raw;
-   sp->pipe.get_tile_rgba = pipe_get_tile_rgba;
-   sp->pipe.put_tile_rgba = pipe_put_tile_rgba;
 
    sp->pipe.surface_data = sp_surface_data;
    sp->pipe.surface_copy = sp_surface_copy;
diff --git a/src/mesa/pipe/softpipe/sp_tile_cache.c b/src/mesa/pipe/softpipe/sp_tile_cache.c
index d6f60807e6..6515ce668c 100644
--- a/src/mesa/pipe/softpipe/sp_tile_cache.c
+++ b/src/mesa/pipe/softpipe/sp_tile_cache.c
@@ -34,6 +34,7 @@
 
 #include "pipe/p_util.h"
 #include "pipe/p_inlines.h"
+#include "pipe/util/p_tile.h"
 #include "sp_context.h"
 #include "sp_surface.h"
 #include "sp_tile_cache.h"
@@ -369,9 +370,9 @@ sp_flush_tile_cache(struct softpipe_context *softpipe,
                            tile->data.depth32, 0/*STRIDE*/);
          }
          else {
-            pipe->put_tile_rgba(pipe, ps,
-                                tile->x, tile->y, TILE_SIZE, TILE_SIZE,
-                                (float *) tile->data.color);
+            pipe_put_tile_rgba(pipe, ps,
+                               tile->x, tile->y, TILE_SIZE, TILE_SIZE,
+                               (float *) tile->data.color);
          }
          tile->x = tile->y = -1;  /* mark as empty */
          inuse++;
@@ -418,9 +419,9 @@ sp_get_cached_tile(struct softpipe_context *softpipe,
                            tile->data.depth32, 0/*STRIDE*/);
          }
          else {
-            pipe->put_tile_rgba(pipe, ps,
-                                tile->x, tile->y, TILE_SIZE, TILE_SIZE,
-                                (float *) tile->data.color);
+            pipe_put_tile_rgba(pipe, ps,
+                               tile->x, tile->y, TILE_SIZE, TILE_SIZE,
+                               (float *) tile->data.color);
          }
       }
 
@@ -445,9 +446,9 @@ sp_get_cached_tile(struct softpipe_context *softpipe,
                            tile->data.depth32, 0/*STRIDE*/);
          }
          else {
-            pipe->get_tile_rgba(pipe, ps,
-                                tile->x, tile->y, TILE_SIZE, TILE_SIZE,
-                                (float *) tile->data.color);
+            pipe_get_tile_rgba(pipe, ps,
+                               tile->x, tile->y, TILE_SIZE, TILE_SIZE,
+                               (float *) tile->data.color);
          }
       }
    }
@@ -514,9 +515,9 @@ sp_get_cached_tile_tex(struct pipe_context *pipe,
       }
 
       /* get tile from the surface (view into texture) */
-      pipe->get_tile_rgba(pipe, tc->tex_surf,
-                          tile_x, tile_y, TILE_SIZE, TILE_SIZE,
-                          (float *) tile->data.color);
+      pipe_get_tile_rgba(pipe, tc->tex_surf,
+                         tile_x, tile_y, TILE_SIZE, TILE_SIZE,
+                         (float *) tile->data.color);
       tile->x = tile_x;
       tile->y = tile_y;
       tile->z = z;
diff --git a/src/mesa/pipe/util/p_tile.c b/src/mesa/pipe/util/p_tile.c
index f2e19f19dc..85a863db8a 100644
--- a/src/mesa/pipe/util/p_tile.c
+++ b/src/mesa/pipe/util/p_tile.c
@@ -125,68 +125,46 @@ pipe_put_tile_raw(struct pipe_context *pipe,
 /*** PIPE_FORMAT_A8R8G8B8_UNORM ***/
 
 static void
-a8r8g8b8_get_tile_rgba(struct pipe_surface *ps,
-		       void *map,
-                       unsigned x, unsigned y, unsigned w, unsigned h,
-                       float *p)
+a8r8g8b8_get_tile_rgba(unsigned *src,
+                       unsigned w, unsigned h,
+                       float *p,
+                       unsigned dst_stride)
 {
-   const unsigned *src
-      = ((const unsigned *) map)
-      + y * ps->pitch + x;
    unsigned i, j;
-   unsigned w0 = w;
-
-   assert(ps->format == PIPE_FORMAT_A8R8G8B8_UNORM);
-
-   if (pipe_clip_tile(x, y, &w, &h, ps))
-      return;
 
    for (i = 0; i < h; i++) {
       float *pRow = p;
-      for (j = 0; j < w; j++) {
-         const unsigned pixel = src[j];
+      for (j = 0; j < w; j++, pRow += 4) {
+         const unsigned pixel = *src++;
          pRow[0] = UBYTE_TO_FLOAT((pixel >> 16) & 0xff);
          pRow[1] = UBYTE_TO_FLOAT((pixel >>  8) & 0xff);
          pRow[2] = UBYTE_TO_FLOAT((pixel >>  0) & 0xff);
          pRow[3] = UBYTE_TO_FLOAT((pixel >> 24) & 0xff);
-         pRow += 4;
       }
-      src += ps->pitch;
-      p += w0 * 4;
+      p += dst_stride;
    }
 }
 
 
 static void
-a8r8g8b8_put_tile_rgba(struct pipe_surface *ps,
-		       void *map,
-                       unsigned x, unsigned y, unsigned w, unsigned h,
-                       const float *p)
+a8r8g8b8_put_tile_rgba(unsigned *dst,
+                       unsigned w, unsigned h,
+                       const float *p,
+                       unsigned src_stride)
 {
-   unsigned *dst
-      = ((unsigned *) map)
-      + y * ps->pitch + x;
    unsigned i, j;
-   unsigned w0 = w;
-
-   assert(ps->format == PIPE_FORMAT_A8R8G8B8_UNORM);
-
-   if (pipe_clip_tile(x, y, &w, &h, ps))
-      return;
 
    for (i = 0; i < h; i++) {
       const float *pRow = p;
-      for (j = 0; j < w; j++) {
+      for (j = 0; j < w; j++, pRow += 4) {
          unsigned r, g, b, a;
          UNCLAMPED_FLOAT_TO_UBYTE(r, pRow[0]);
          UNCLAMPED_FLOAT_TO_UBYTE(g, pRow[1]);
          UNCLAMPED_FLOAT_TO_UBYTE(b, pRow[2]);
          UNCLAMPED_FLOAT_TO_UBYTE(a, pRow[3]);
-         dst[j] = (a << 24) | (r << 16) | (g << 8) | b;
-         pRow += 4;
+         *dst++ = (a << 24) | (r << 16) | (g << 8) | b;
       }
-      dst += ps->pitch;
-      p += w0 * 4;
+      p += src_stride;
    }
 }
 
@@ -194,68 +172,46 @@ a8r8g8b8_put_tile_rgba(struct pipe_surface *ps,
 /*** PIPE_FORMAT_B8G8R8A8_UNORM ***/
 
 static void
-b8g8r8a8_get_tile_rgba(struct pipe_surface *ps,
-		       void *map,
-                       unsigned x, unsigned y, unsigned w, unsigned h,
-                       float *p)
+b8g8r8a8_get_tile_rgba(unsigned *src,
+                       unsigned w, unsigned h,
+                       float *p,
+                       unsigned dst_stride)
 {
-   const unsigned *src
-      = ((const unsigned *) map)
-      + y * ps->pitch + x;
    unsigned i, j;
-   unsigned w0 = w;
-
-   assert(ps->format == PIPE_FORMAT_B8G8R8A8_UNORM);
-
-   if (pipe_clip_tile(x, y, &w, &h, ps))
-      return;
 
    for (i = 0; i < h; i++) {
       float *pRow = p;
-      for (j = 0; j < w; j++) {
-         const unsigned pixel = src[j];
+      for (j = 0; j < w; j++, pRow += 4) {
+         const unsigned pixel = *src++;
          pRow[0] = UBYTE_TO_FLOAT((pixel >>  8) & 0xff);
          pRow[1] = UBYTE_TO_FLOAT((pixel >> 16) & 0xff);
          pRow[2] = UBYTE_TO_FLOAT((pixel >> 24) & 0xff);
          pRow[3] = UBYTE_TO_FLOAT((pixel >>  0) & 0xff);
-         pRow += 4;
       }
-      src += ps->pitch;
-      p += w0 * 4;
+      p += dst_stride;
    }
 }
 
 
 static void
-b8g8r8a8_put_tile_rgba(struct pipe_surface *ps,
-		       void *map,
-                       unsigned x, unsigned y, unsigned w, unsigned h,
-                       const float *p)
+b8g8r8a8_put_tile_rgba(unsigned *dst,
+                       unsigned w, unsigned h,
+                       const float *p,
+                       unsigned src_stride)
 {
-   unsigned *dst
-      = ((unsigned *) map)
-      + y * ps->pitch + x;
    unsigned i, j;
-   unsigned w0 = w;
-
-   assert(ps->format == PIPE_FORMAT_B8G8R8A8_UNORM);
-
-   if (pipe_clip_tile(x, y, &w, &h, ps))
-      return;
 
    for (i = 0; i < h; i++) {
       const float *pRow = p;
-      for (j = 0; j < w; j++) {
+      for (j = 0; j < w; j++, pRow += 4) {
          unsigned r, g, b, a;
          UNCLAMPED_FLOAT_TO_UBYTE(r, pRow[0]);
          UNCLAMPED_FLOAT_TO_UBYTE(g, pRow[1]);
          UNCLAMPED_FLOAT_TO_UBYTE(b, pRow[2]);
          UNCLAMPED_FLOAT_TO_UBYTE(a, pRow[3]);
-         dst[j] = (b << 24) | (g << 16) | (r << 8) | a;
-         pRow += 4;
+         *dst++ = (b << 24) | (g << 16) | (r << 8) | a;
       }
-      dst += ps->pitch;
-      p += w0 * 4;
+      p += src_stride;
    }
 }
 
@@ -263,28 +219,23 @@ b8g8r8a8_put_tile_rgba(struct pipe_surface *ps,
 /*** PIPE_FORMAT_A1R5G5B5_UNORM ***/
 
 static void
-a1r5g5b5_get_tile_rgba(struct pipe_surface *ps,
-		       void *map,
-                       unsigned x, unsigned y, unsigned w, unsigned h,
-                       float *p)
+a1r5g5b5_get_tile_rgba(ushort *src,
+                       unsigned w, unsigned h,
+                       float *p,
+                       unsigned dst_stride)
 {
-   const ushort *src
-      = ((const ushort *) map)
-      + y * ps->pitch + x;
    unsigned i, j;
 
-   assert(ps->format == PIPE_FORMAT_A1R5G5B5_UNORM);
-
    for (i = 0; i < h; i++) {
-      for (j = 0; j < w; j++) {
-         const ushort pixel = src[j];
-         p[0] = ((pixel >> 10) & 0x1f) * (1.0f / 31.0f);
-         p[1] = ((pixel >>  5) & 0x1f) * (1.0f / 31.0f);
-         p[2] = ((pixel      ) & 0x1f) * (1.0f / 31.0f);
-         p[3] = ((pixel >> 15)       ) * 1.0f;
-         p += 4;
+      float *pRow = p;
+      for (j = 0; j < w; j++, pRow += 4) {
+         const ushort pixel = *src++;
+         pRow[0] = ((pixel >> 10) & 0x1f) * (1.0f / 31.0f);
+         pRow[1] = ((pixel >>  5) & 0x1f) * (1.0f / 31.0f);
+         pRow[2] = ((pixel      ) & 0x1f) * (1.0f / 31.0f);
+         pRow[3] = ((pixel >> 15)       ) * 1.0f;
       }
-      src += ps->pitch;
+      p += dst_stride;
    }
 }
 
@@ -292,28 +243,23 @@ a1r5g5b5_get_tile_rgba(struct pipe_surface *ps,
 /*** PIPE_FORMAT_A4R4G4B4_UNORM ***/
 
 static void
-a4r4g4b4_get_tile_rgba(struct pipe_surface *ps,
-		       void *map,
-                       unsigned x, unsigned y, unsigned w, unsigned h,
-                       float *p)
+a4r4g4b4_get_tile_rgba(ushort *src,
+                       unsigned w, unsigned h,
+                       float *p,
+                       unsigned dst_stride)
 {
-   const ushort *src
-      = ((const ushort *) map)
-      + y * ps->pitch + x;
    unsigned i, j;
 
-   assert(ps->format == PIPE_FORMAT_A4R4G4B4_UNORM);
-
    for (i = 0; i < h; i++) {
-      for (j = 0; j < w; j++) {
-         const ushort pixel = src[j];
-         p[0] = ((pixel >>  8) & 0xf) * (1.0f / 15.0f);
-         p[1] = ((pixel >>  4) & 0xf) * (1.0f / 15.0f);
-         p[2] = ((pixel      ) & 0xf) * (1.0f / 15.0f);
-         p[3] = ((pixel >> 12)      ) * (1.0f / 15.0f);
-         p += 4;
+      float *pRow = p;
+      for (j = 0; j < w; j++, pRow += 4) {
+         const ushort pixel = *src++;
+         pRow[0] = ((pixel >>  8) & 0xf) * (1.0f / 15.0f);
+         pRow[1] = ((pixel >>  4) & 0xf) * (1.0f / 15.0f);
+         pRow[2] = ((pixel      ) & 0xf) * (1.0f / 15.0f);
+         pRow[3] = ((pixel >> 12)      ) * (1.0f / 15.0f);
       }
-      src += ps->pitch;
+      p += dst_stride;
    }
 }
 
@@ -321,60 +267,44 @@ a4r4g4b4_get_tile_rgba(struct pipe_surface *ps,
 /*** PIPE_FORMAT_R5G6B5_UNORM ***/
 
 static void
-r5g6b5_get_tile_rgba(struct pipe_surface *ps,
-		     void *map,
-                     unsigned x, unsigned y, unsigned w, unsigned h,
-                     float *p)
+r5g6b5_get_tile_rgba(ushort *src,
+                     unsigned w, unsigned h,
+                     float *p,
+                     unsigned dst_stride)
 {
-   const ushort *src
-      = ((const ushort *) map)
-      + y * ps->pitch + x;
    unsigned i, j;
 
-   assert(ps->format == PIPE_FORMAT_R5G6B5_UNORM);
-
    for (i = 0; i < h; i++) {
-      for (j = 0; j < w; j++) {
-         const ushort pixel = src[j];
-         p[0] = ((pixel >> 11) & 0x1f) * (1.0f / 31.0f);
-         p[1] = ((pixel >>  5) & 0x3f) * (1.0f / 63.0f);
-         p[2] = ((pixel      ) & 0x1f) * (1.0f / 31.0f);
-         p[3] = 1.0f;
-         p += 4;
+      float *pRow = p;
+      for (j = 0; j < w; j++, pRow += 4) {
+         const ushort pixel = *src++;
+         pRow[0] = ((pixel >> 11) & 0x1f) * (1.0f / 31.0f);
+         pRow[1] = ((pixel >>  5) & 0x3f) * (1.0f / 63.0f);
+         pRow[2] = ((pixel      ) & 0x1f) * (1.0f / 31.0f);
+         pRow[3] = 1.0f;
       }
-      src += ps->pitch;
+      p += dst_stride;
    }
 }
 
 
 static void
-r5g5b5_put_tile_rgba(struct pipe_surface *ps,
-		     void *map,
-                     unsigned x, unsigned y, unsigned w, unsigned h,
-                     const float *p)
+r5g5b5_put_tile_rgba(ushort *dst,
+                     unsigned w, unsigned h,
+                     const float *p,
+                     unsigned src_stride)
 {
-   ushort *dst
-      = ((ushort *) map)
-      + y * ps->pitch + x;
    unsigned i, j;
-   unsigned w0 = w;
-
-   assert(ps->format == PIPE_FORMAT_R5G6B5_UNORM);
-
-   if (pipe_clip_tile(x, y, &w, &h, ps))
-      return;
 
    for (i = 0; i < h; i++) {
       const float *pRow = p;
-      for (j = 0; j < w; j++) {
+      for (j = 0; j < w; j++, pRow += 4) {
          uint r = (uint) (CLAMP(pRow[0], 0.0, 1.0) * 31.0);
          uint g = (uint) (CLAMP(pRow[1], 0.0, 1.0) * 63.0);
          uint b = (uint) (CLAMP(pRow[2], 0.0, 1.0) * 31.0);
-         dst[j] = (r << 11) | (g << 5) | (b);
-         pRow += 4;
+         *dst++ = (r << 11) | (g << 5) | (b);
       }
-      dst += ps->pitch;
-      p += w0 * 4;
+      p += src_stride;
    }
 }
 
@@ -386,33 +316,23 @@ r5g5b5_put_tile_rgba(struct pipe_surface *ps,
  * Return each Z value as four floats in [0,1].
  */
 static void
-z16_get_tile_rgba(struct pipe_surface *ps,
-		  void *map,
-                  unsigned x, unsigned y, unsigned w, unsigned h,
-                  float *p)
+z16_get_tile_rgba(ushort *src,
+                  unsigned w, unsigned h,
+                  float *p,
+                  unsigned dst_stride)
 {
-   const ushort *src
-      = ((const ushort *) map)
-      + y * ps->pitch + x;
    const float scale = 1.0f / 65535.0f;
    unsigned i, j;
-   unsigned w0 = w;
-
-   assert(ps->format == PIPE_FORMAT_Z16_UNORM);
-
-   if (pipe_clip_tile(x, y, &w, &h, ps))
-      return;
 
    for (i = 0; i < h; i++) {
       float *pRow = p;
-      for (j = 0; j < w; j++) {
-         pRow[j * 4 + 0] =
-         pRow[j * 4 + 1] =
-         pRow[j * 4 + 2] =
-         pRow[j * 4 + 3] = src[j] * scale;
+      for (j = 0; j < w; j++, pRow += 4) {
+         pRow[0] =
+         pRow[1] =
+         pRow[2] =
+         pRow[3] = *src++ * scale;
       }
-      src += ps->pitch;
-      p += 4 * w0;
+      p += dst_stride;
    }
 }
 
@@ -422,33 +342,22 @@ z16_get_tile_rgba(struct pipe_surface *ps,
 /*** PIPE_FORMAT_U_L8 ***/
 
 static void
-l8_get_tile_rgba(struct pipe_surface *ps,
-		 void *map,
-                 unsigned x, unsigned y, unsigned w, unsigned h,
-                 float *p)
+l8_get_tile_rgba(ubyte *src,
+                 unsigned w, unsigned h,
+                 float *p,
+                 unsigned dst_stride)
 {
-   const ubyte *src
-      = ((const ubyte *) map)
-      + y * ps->pitch + x;
    unsigned i, j;
-   unsigned w0 = w;
-
-   assert(ps->format == PIPE_FORMAT_U_L8);
-
-   if (pipe_clip_tile(x, y, &w, &h, ps))
-      return;
 
    for (i = 0; i < h; i++) {
       float *pRow = p;
-      for (j = 0; j < w; j++) {
+      for (j = 0; j < w; j++, src++, pRow += 4) {
          pRow[0] =
          pRow[1] =
-         pRow[2] = UBYTE_TO_FLOAT(src[j]);
+         pRow[2] = UBYTE_TO_FLOAT(*src);
          pRow[3] = 1.0;
-         pRow += 4;
       }
-      src += ps->pitch;
-      p += w0 * 4;
+      p += dst_stride;
    }
 }
 
@@ -456,33 +365,22 @@ l8_get_tile_rgba(struct pipe_surface *ps,
 /*** PIPE_FORMAT_U_A8 ***/
 
 static void
-a8_get_tile_rgba(struct pipe_surface *ps,
-		 void *map,
-                 unsigned x, unsigned y, unsigned w, unsigned h,
-                 float *p)
+a8_get_tile_rgba(ubyte *src,
+                 unsigned w, unsigned h,
+                 float *p,
+                 unsigned dst_stride)
 {
-   const ubyte *src
-      = ((const ubyte *) map)
-      + y * ps->pitch + x;
    unsigned i, j;
-   unsigned w0 = w;
-
-   assert(ps->format == PIPE_FORMAT_U_A8);
-
-   if (pipe_clip_tile(x, y, &w, &h, ps))
-      return;
 
    for (i = 0; i < h; i++) {
       float *pRow = p;
-      for (j = 0; j < w; j++) {
+      for (j = 0; j < w; j++, src++, pRow += 4) {
          pRow[0] =
          pRow[1] =
          pRow[2] = 0.0;
-         pRow[3] = UBYTE_TO_FLOAT(src[j]);
-         pRow += 4;
+         pRow[3] = UBYTE_TO_FLOAT(*src);
       }
-      src += ps->pitch;
-      p += w0 * 4;
+      p += dst_stride;
    }
 }
 
@@ -490,72 +388,43 @@ a8_get_tile_rgba(struct pipe_surface *ps,
 /*** PIPE_FORMAT_R16G16B16A16_SNORM ***/
 
 static void
-r16g16b16a16_get_tile_rgba(struct pipe_surface *ps,
-			   void *map,
-                           unsigned x, unsigned y, unsigned w, unsigned h,
-                           float *p)
+r16g16b16a16_get_tile_rgba(short *src,
+                           unsigned w, unsigned h,
+                           float *p,
+                           unsigned dst_stride)
 {
-   const short *src
-      = ((const short *) map)
-      + (y * ps->pitch + x) * 4;
    unsigned i, j;
-   unsigned w0 = w;
-
-   assert(ps->format == PIPE_FORMAT_R16G16B16A16_SNORM);
-
-   if (pipe_clip_tile(x, y, &w, &h, ps))
-      return;
 
    for (i = 0; i < h; i++) {
       float *pRow = p;
-      const short *pixel = src;
-      for (j = 0; j < w; j++) {
-         pRow[0] = SHORT_TO_FLOAT(pixel[0]);
-         pRow[1] = SHORT_TO_FLOAT(pixel[1]);
-         pRow[2] = SHORT_TO_FLOAT(pixel[2]);
-         pRow[3] = SHORT_TO_FLOAT(pixel[3]);
-         pRow += 4;
-         pixel += 4;
+      for (j = 0; j < w; j++, src += 4, pRow += 4) {
+         pRow[0] = SHORT_TO_FLOAT(src[0]);
+         pRow[1] = SHORT_TO_FLOAT(src[1]);
+         pRow[2] = SHORT_TO_FLOAT(src[2]);
+         pRow[3] = SHORT_TO_FLOAT(src[3]);
       }
-      src += ps->pitch * 4;
-      p += w0 * 4;
+      p += dst_stride;
    }
 }
 
 
 static void
-r16g16b16a16_put_tile_rgba(struct pipe_surface *ps,
-			   void *map,
-                           unsigned x, unsigned y, unsigned w, unsigned h,
-                           const float *p)
+r16g16b16a16_put_tile_rgba(short *dst,
+                           unsigned w, unsigned h,
+                           const float *p,
+                           unsigned src_stride)
 {
-   short *dst
-      = ((short *) map)
-      + (y * ps->pitch + x) * 4;
    unsigned i, j;
-   unsigned w0 = w;
-
-   assert(ps->format == PIPE_FORMAT_R16G16B16A16_SNORM);
-
-   if (pipe_clip_tile(x, y, &w, &h, ps))
-      return;
 
    for (i = 0; i < h; i++) {
       const float *pRow = p;
-      for (j = 0; j < w; j++) {
-         short r, g, b, a;
-         UNCLAMPED_FLOAT_TO_SHORT(r, pRow[0]);
-         UNCLAMPED_FLOAT_TO_SHORT(g, pRow[1]);
-         UNCLAMPED_FLOAT_TO_SHORT(b, pRow[2]);
-         UNCLAMPED_FLOAT_TO_SHORT(a, pRow[3]);
-         dst[j*4+0] = r;
-         dst[j*4+1] = g;
-         dst[j*4+2] = b;
-         dst[j*4+3] = a;
-         pRow += 4;
+      for (j = 0; j < w; j++, dst += 4, pRow += 4) {
+         UNCLAMPED_FLOAT_TO_SHORT(dst[0], pRow[0]);
+         UNCLAMPED_FLOAT_TO_SHORT(dst[1], pRow[1]);
+         UNCLAMPED_FLOAT_TO_SHORT(dst[2], pRow[2]);
+         UNCLAMPED_FLOAT_TO_SHORT(dst[3], pRow[3]);
       }
-      dst += ps->pitch * 4;
-      p += w0 * 4;
+      p += src_stride;
    }
 }
 
@@ -564,33 +433,22 @@ r16g16b16a16_put_tile_rgba(struct pipe_surface *ps,
 /*** PIPE_FORMAT_U_I8 ***/
 
 static void
-i8_get_tile_rgba(struct pipe_surface *ps,
-		 void *map,
-                 unsigned x, unsigned y, unsigned w, unsigned h,
-                 float *p)
+i8_get_tile_rgba(ubyte *src,
+                 unsigned w, unsigned h,
+                 float *p,
+                 unsigned dst_stride)
 {
-   const ubyte *src
-      = ((const ubyte *) map)
-      + y * ps->pitch + x;
    unsigned i, j;
-   unsigned w0 = w;
-
-   assert(ps->format == PIPE_FORMAT_U_I8);
-
-   if (pipe_clip_tile(x, y, &w, &h, ps))
-      return;
 
    for (i = 0; i < h; i++) {
       float *pRow = p;
-      for (j = 0; j < w; j++) {
+      for (j = 0; j < w; j++, src++, pRow += 4) {
          pRow[0] =
          pRow[1] =
          pRow[2] =
-         pRow[3] = UBYTE_TO_FLOAT(src[j]);
-         pRow += 4;
+         pRow[3] = UBYTE_TO_FLOAT(*src);
       }
-      src += ps->pitch;
-      p += w0 * 4;
+      p += dst_stride;
    }
 }
 
@@ -598,34 +456,23 @@ i8_get_tile_rgba(struct pipe_surface *ps,
 /*** PIPE_FORMAT_U_A8_L8 ***/
 
 static void
-a8_l8_get_tile_rgba(struct pipe_surface *ps,
-		    void *map,
-                    unsigned x, unsigned y, unsigned w, unsigned h,
-                    float *p)
+a8_l8_get_tile_rgba(ushort *src,
+                    unsigned w, unsigned h,
+                    float *p,
+                    unsigned dst_stride)
 {
-   const ushort *src
-      = ((const ushort *) map)
-      + y * ps->pitch + x;
    unsigned i, j;
-   unsigned w0 = w;
-
-   assert(ps->format == PIPE_FORMAT_U_A8_L8);
-
-   if (pipe_clip_tile(x, y, &w, &h, ps))
-      return;
 
    for (i = 0; i < h; i++) {
       float *pRow = p;
-      for (j = 0; j < w; j++) {
-         const ushort p = src[j];
+      for (j = 0; j < w; j++, pRow += 4) {
+         ushort p = *src++;
          pRow[0] =
          pRow[1] =
          pRow[2] = UBYTE_TO_FLOAT(p & 0xff);
          pRow[3] = UBYTE_TO_FLOAT(p >> 8);
-         pRow += 4;
       }
-      src += ps->pitch;
-      p += w0 * 4;
+      p += dst_stride;
    }
 }
 
@@ -638,33 +485,23 @@ a8_l8_get_tile_rgba(struct pipe_surface *ps,
  * Return each Z value as four floats in [0,1].
  */
 static void
-z32_get_tile_rgba(struct pipe_surface *ps,
-		  void *map,
-                  unsigned x, unsigned y, unsigned w, unsigned h,
-                  float *p)
+z32_get_tile_rgba(unsigned *src,
+                  unsigned w, unsigned h,
+                  float *p,
+                  unsigned dst_stride)
 {
-   const uint *src
-      = ((const uint *) map)
-      + y * ps->pitch + x;
    const double scale = 1.0 / (double) 0xffffffff;
    unsigned i, j;
-   unsigned w0 = w;
-
-   assert(ps->format == PIPE_FORMAT_Z16_UNORM);
-
-   if (pipe_clip_tile(x, y, &w, &h, ps))
-      return;
 
    for (i = 0; i < h; i++) {
       float *pRow = p;
-      for (j = 0; j < w; j++) {
-         pRow[j * 4 + 0] =
-         pRow[j * 4 + 1] =
-         pRow[j * 4 + 2] =
-         pRow[j * 4 + 3] = (float) (scale * src[j]);
+      for (j = 0; j < w; j++, pRow += 4) {
+         pRow[0] =
+         pRow[1] =
+         pRow[2] =
+         pRow[3] = (float) (*src++ * scale);
       }
-      src += ps->pitch;
-      p += 4 * w0;
+      p += dst_stride;
    }
 }
 
@@ -675,33 +512,23 @@ z32_get_tile_rgba(struct pipe_surface *ps,
  * Return Z component as four float in [0,1].  Stencil part ignored.
  */
 static void
-s8z24_get_tile_rgba(struct pipe_surface *ps,
-		    void *map,
-                    unsigned x, unsigned y, unsigned w, unsigned h,
-                    float *p)
+s8z24_get_tile_rgba(unsigned *src,
+                    unsigned w, unsigned h,
+                    float *p,
+                    unsigned dst_stride)
 {
-   const uint *src
-      = ((const uint *) map)
-      + y * ps->pitch + x;
    const double scale = 1.0 / ((1 << 24) - 1);
    unsigned i, j;
-   unsigned w0 = w;
-
-   assert(ps->format == PIPE_FORMAT_S8Z24_UNORM);
-
-   if (pipe_clip_tile(x, y, &w, &h, ps))
-      return;
 
    for (i = 0; i < h; i++) {
       float *pRow = p;
-      for (j = 0; j < w; j++) {
-         pRow[j * 4 + 0] =
-         pRow[j * 4 + 1] =
-         pRow[j * 4 + 2] =
-         pRow[j * 4 + 3] = (float) (scale * (src[j] & 0xffffff));
+      for (j = 0; j < w; j++, pRow += 4) {
+         pRow[0] =
+         pRow[1] =
+         pRow[2] =
+         pRow[3] = (float) (scale * (*src++ & 0xffffff));
       }
-      src += ps->pitch;
-      p += 4 * w0;
+      p += dst_stride;
    }
 }
 
@@ -712,33 +539,23 @@ s8z24_get_tile_rgba(struct pipe_surface *ps,
  * Return Z component as four float in [0,1].  Stencil part ignored.
  */
 static void
-z24s8_get_tile_rgba(struct pipe_surface *ps,
-		    void *map,
-                    unsigned x, unsigned y, unsigned w, unsigned h,
-                    float *p)
+z24s8_get_tile_rgba(unsigned *src,
+                    unsigned w, unsigned h,
+                    float *p,
+                    unsigned dst_stride)
 {
-   const uint *src
-      = ((const uint *) map)
-      + y * ps->pitch + x;
    const double scale = 1.0 / ((1 << 24) - 1);
    unsigned i, j;
-   unsigned w0 = w;
-
-   assert(ps->format == PIPE_FORMAT_Z24S8_UNORM);
-
-   if (pipe_clip_tile(x, y, &w, &h, ps))
-      return;
 
    for (i = 0; i < h; i++) {
       float *pRow = p;
-      for (j = 0; j < w; j++) {
-         pRow[j * 4 + 0] =
-         pRow[j * 4 + 1] =
-         pRow[j * 4 + 2] =
-         pRow[j * 4 + 3] = (float) (scale * (src[j] >> 8));
+      for (j = 0; j < w; j++, pRow += 4) {
+         pRow[0] =
+         pRow[1] =
+         pRow[2] =
+         pRow[3] = (float) (scale * (*src++ >> 8));
       }
-      src += ps->pitch;
-      p += 4 * w0;
+      p += dst_stride;
    }
 }
 
@@ -749,56 +566,67 @@ pipe_get_tile_rgba(struct pipe_context *pipe,
                    uint x, uint y, uint w, uint h,
                    float *p)
 {
-   void *map = pipe_surface_map(ps);
+   unsigned dst_stride = w * 4;
+   void *packed;
+
+   if (pipe_clip_tile(x, y, &w, &h, ps))
+      return;
+
+   packed = MALLOC(h * w * ps->cpp);
+
+   if (!packed)
+      return;
+
+   pipe->get_tile(pipe, ps, x, y, w, h, packed, w * ps->cpp);
 
    switch (ps->format) {
    case PIPE_FORMAT_A8R8G8B8_UNORM:
-      a8r8g8b8_get_tile_rgba(ps, map, x, y, w, h, p);
+      a8r8g8b8_get_tile_rgba((unsigned *) packed, w, h, p, dst_stride);
       break;
    case PIPE_FORMAT_B8G8R8A8_UNORM:
-      b8g8r8a8_get_tile_rgba(ps, map, x, y, w, h, p);
+      b8g8r8a8_get_tile_rgba((unsigned *) packed, w, h, p, dst_stride);
       break;
    case PIPE_FORMAT_A1R5G5B5_UNORM:
-      a1r5g5b5_get_tile_rgba(ps, map, x, y, w, h, p);
+      a1r5g5b5_get_tile_rgba((ushort *) packed, w, h, p, dst_stride);
       break;
    case PIPE_FORMAT_A4R4G4B4_UNORM:
-      a4r4g4b4_get_tile_rgba(ps, map, x, y, w, h, p);
+      a4r4g4b4_get_tile_rgba((ushort *) packed, w, h, p, dst_stride);
       break;
    case PIPE_FORMAT_R5G6B5_UNORM:
-      r5g6b5_get_tile_rgba(ps, map, x, y, w, h, p);
+      r5g6b5_get_tile_rgba((ushort *) packed, w, h, p, dst_stride);
       break;
    case PIPE_FORMAT_U_L8:
-      l8_get_tile_rgba(ps, map, x, y, w, h, p);
+      l8_get_tile_rgba((ubyte *) packed, w, h, p, dst_stride);
       break;
    case PIPE_FORMAT_U_A8:
-      a8_get_tile_rgba(ps, map, x, y, w, h, p);
+      a8_get_tile_rgba((ubyte *) packed, w, h, p, dst_stride);
       break;
    case PIPE_FORMAT_U_I8:
-      i8_get_tile_rgba(ps, map, x, y, w, h, p);
+      i8_get_tile_rgba((ubyte *) packed, w, h, p, dst_stride);
       break;
    case PIPE_FORMAT_U_A8_L8:
-      a8_l8_get_tile_rgba(ps, map, x, y, w, h, p);
+      a8_l8_get_tile_rgba((ushort *) packed, w, h, p, dst_stride);
       break;
    case PIPE_FORMAT_R16G16B16A16_SNORM:
-      r16g16b16a16_get_tile_rgba(ps, map, x, y, w, h, p);
+      r16g16b16a16_get_tile_rgba((short *) packed, w, h, p, dst_stride);
       break;
    case PIPE_FORMAT_Z16_UNORM:
-      z16_get_tile_rgba(ps, map, x, y, w, h, p);
+      z16_get_tile_rgba((ushort *) packed, w, h, p, dst_stride);
       break;
    case PIPE_FORMAT_Z32_UNORM:
-      z32_get_tile_rgba(ps, map, x, y, w, h, p);
+      z32_get_tile_rgba((unsigned *) packed, w, h, p, dst_stride);
       break;
    case PIPE_FORMAT_S8Z24_UNORM:
-      s8z24_get_tile_rgba(ps, map, x, y, w, h, p);
+      s8z24_get_tile_rgba((unsigned *) packed, w, h, p, dst_stride);
       break;
    case PIPE_FORMAT_Z24S8_UNORM:
-      z24s8_get_tile_rgba(ps, map, x, y, w, h, p);
+      z24s8_get_tile_rgba((unsigned *) packed, w, h, p, dst_stride);
       break;
    default:
       assert(0);
    }
 
-   pipe_surface_unmap(ps);
+   FREE(packed);
 }
 
 
@@ -808,53 +636,64 @@ pipe_put_tile_rgba(struct pipe_context *pipe,
                    uint x, uint y, uint w, uint h,
                    const float *p)
 {
-   void *map = pipe_surface_map(ps);
+   unsigned src_stride = w * 4;
+   void *packed;
+
+   if (pipe_clip_tile(x, y, &w, &h, ps))
+      return;
+
+   packed = MALLOC(h * w * ps->cpp);
+
+   if (!packed)
+      return;
 
    switch (ps->format) {
    case PIPE_FORMAT_A8R8G8B8_UNORM:
-      a8r8g8b8_put_tile_rgba(ps, map, x, y, w, h, p);
+      a8r8g8b8_put_tile_rgba((unsigned *) packed, w, h, p, src_stride);
       break;
    case PIPE_FORMAT_B8G8R8A8_UNORM:
-      b8g8r8a8_put_tile_rgba(ps, map, x, y, w, h, p);
+      b8g8r8a8_put_tile_rgba((unsigned *) packed, w, h, p, src_stride);
       break;
    case PIPE_FORMAT_A1R5G5B5_UNORM:
-      /*a1r5g5b5_put_tile_rgba(ps, map, x, y, w, h, p);*/
+      /*a1r5g5b5_put_tile_rgba((ushort *) packed, w, h, p, src_stride);*/
       break;
    case PIPE_FORMAT_R5G6B5_UNORM:
-      r5g5b5_put_tile_rgba(ps, map, x, y, w, h, p);
+      r5g5b5_put_tile_rgba((ushort *) packed, w, h, p, src_stride);
       break;
    case PIPE_FORMAT_R8G8B8A8_UNORM:
       break;
    case PIPE_FORMAT_U_L8:
-      /*l8_put_tile_rgba(ps, map, x, y, w, h, p);*/
+      /*l8_put_tile_rgba((ubyte *) packed, w, h, p, src_stride);*/
       break;
    case PIPE_FORMAT_U_A8:
-      /*a8_put_tile_rgba(ps, map, x, y, w, h, p);*/
+      /*a8_put_tile_rgba((ubyte *) packed, w, h, p, src_stride);*/
       break;
    case PIPE_FORMAT_U_I8:
-      /*i8_put_tile_rgba(ps, map, x, y, w, h, p);*/
+      /*i8_put_tile_rgba((ubyte *) packed, w, h, p, src_stride);*/
       break;
    case PIPE_FORMAT_U_A8_L8:
-      /*a8_l8_put_tile_rgba(ps, map, x, y, w, h, p);*/
+      /*a8_l8_put_tile_rgba((ushort *) packed, w, h, p, src_stride);*/
       break;
    case PIPE_FORMAT_R16G16B16A16_SNORM:
-      r16g16b16a16_put_tile_rgba(ps, map, x, y, w, h, p);
+      r16g16b16a16_put_tile_rgba((short *) packed, w, h, p, src_stride);
       break;
    case PIPE_FORMAT_Z16_UNORM:
-      /*z16_put_tile_rgba(ps, map, x, y, w, h, p);*/
+      /*z16_put_tile_rgba((ushort *) packed, w, h, p, src_stride);*/
       break;
    case PIPE_FORMAT_Z32_UNORM:
-      /*z32_put_tile_rgba(ps, map, x, y, w, h, p);*/
+      /*z32_put_tile_rgba((unsigned *) packed, w, h, p, src_stride);*/
       break;
    case PIPE_FORMAT_S8Z24_UNORM:
-      /*s8z24_put_tile_rgba(ps, map, x, y, w, h, p);*/
+      /*s8z24_put_tile_rgba((unsigned *) packed, w, h, p, src_stride);*/
       break;
    case PIPE_FORMAT_Z24S8_UNORM:
-      /*z24s8_put_tile_rgba(ps, map, x, y, w, h, p);*/
+      /*z24s8_put_tile_rgba((unsigned *) packed, w, h, p, src_stride);*/
       break;
    default:
       assert(0);
    }
 
-   pipe_surface_unmap(ps);
+   pipe->put_tile(pipe, ps, x, y, w, h, packed, w * ps->cpp);
+
+   FREE(packed);
 }
diff --git a/src/mesa/state_tracker/st_cb_accum.c b/src/mesa/state_tracker/st_cb_accum.c
index 73cd7db18d..3a3bf9016d 100644
--- a/src/mesa/state_tracker/st_cb_accum.c
+++ b/src/mesa/state_tracker/st_cb_accum.c
@@ -43,6 +43,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_inlines.h"
+#include "pipe/util/p_tile.h"
 
 
 #define UNCLAMPED_FLOAT_TO_SHORT(us, f)  \
@@ -80,7 +81,7 @@ st_clear_accum_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
       accBuf[i*4+3] = a;
    }
 
-   pipe->put_tile_rgba(pipe, acc_ps, xpos, ypos, width, height, accBuf);
+   pipe_put_tile_rgba(pipe, acc_ps, xpos, ypos, width, height, accBuf);
 }
 
 
@@ -95,13 +96,13 @@ accum_mad(struct pipe_context *pipe, GLfloat scale, GLfloat bias,
 
    accBuf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
 
-   pipe->get_tile_rgba(pipe, acc_ps, xpos, ypos, width, height, accBuf);
+   pipe_get_tile_rgba(pipe, acc_ps, xpos, ypos, width, height, accBuf);
 
    for (i = 0; i < 4 * width * height; i++) {
       accBuf[i] = accBuf[i] * scale + bias;
    }
 
-   pipe->put_tile_rgba(pipe, acc_ps, xpos, ypos, width, height, accBuf);
+   pipe_put_tile_rgba(pipe, acc_ps, xpos, ypos, width, height, accBuf);
 
    free(accBuf);
 }
@@ -119,14 +120,14 @@ accum_accum(struct pipe_context *pipe, GLfloat value,
    colorBuf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
    accBuf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
 
-   pipe->get_tile_rgba(pipe, color_ps, xpos, ypos, width, height, colorBuf);
-   pipe->get_tile_rgba(pipe, acc_ps, xpos, ypos, width, height, accBuf);
+   pipe_get_tile_rgba(pipe, color_ps, xpos, ypos, width, height, colorBuf);
+   pipe_get_tile_rgba(pipe, acc_ps, xpos, ypos, width, height, accBuf);
 
    for (i = 0; i < 4 * width * height; i++) {
       accBuf[i] = accBuf[i] + colorBuf[i] * value;
    }
 
-   pipe->put_tile_rgba(pipe, acc_ps, xpos, ypos, width, height, accBuf);
+   pipe_put_tile_rgba(pipe, acc_ps, xpos, ypos, width, height, accBuf);
 
    free(colorBuf);
    free(accBuf);
@@ -144,13 +145,13 @@ accum_load(struct pipe_context *pipe, GLfloat value,
 
    buf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
 
-   pipe->get_tile_rgba(pipe, color_ps, xpos, ypos, width, height, buf);
+   pipe_get_tile_rgba(pipe, color_ps, xpos, ypos, width, height, buf);
 
    for (i = 0; i < 4 * width * height; i++) {
       buf[i] = buf[i] * value;
    }
 
-   pipe->put_tile_rgba(pipe, acc_ps, xpos, ypos, width, height, buf);
+   pipe_put_tile_rgba(pipe, acc_ps, xpos, ypos, width, height, buf);
 
    free(buf);
 }
@@ -169,11 +170,11 @@ accum_return(GLcontext *ctx, GLfloat value,
 
    abuf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
 
-   pipe->get_tile_rgba(pipe, acc_ps, xpos, ypos, width, height, abuf);
+   pipe_get_tile_rgba(pipe, acc_ps, xpos, ypos, width, height, abuf);
 
    if (!colormask[0] || !colormask[1] || !colormask[2] || !colormask[3]) {
       cbuf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
-      pipe->get_tile_rgba(pipe, color_ps, xpos, ypos, width, height, cbuf);
+      pipe_get_tile_rgba(pipe, color_ps, xpos, ypos, width, height, cbuf);
    }
 
    for (i = 0; i < width * height; i++) {
@@ -188,7 +189,7 @@ accum_return(GLcontext *ctx, GLfloat value,
       }
    }
 
-   pipe->put_tile_rgba(pipe, color_ps, xpos, ypos, width, height, abuf);
+   pipe_put_tile_rgba(pipe, color_ps, xpos, ypos, width, height, abuf);
 
    free(abuf);
    if (cbuf)
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 5ea2f08b8a..be5434f91b 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -56,6 +56,7 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_inlines.h"
 #include "pipe/p_winsys.h"
+#include "pipe/util/p_tile.h"
 #include "shader/prog_instruction.h"
 
 
@@ -1261,8 +1262,8 @@ st_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy,
       /* alternate path using get/put_tile() */
       GLfloat *buf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
 
-      pipe->get_tile_rgba(pipe, psRead, srcx, srcy, width, height, buf);
-      pipe->put_tile_rgba(pipe, psTex, 0, 0, width, height, buf);
+      pipe_get_tile_rgba(pipe, psRead, srcx, srcy, width, height, buf);
+      pipe_put_tile_rgba(pipe, psTex, 0, 0, width, height, buf);
 
       free(buf);
    }
diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c
index 585fe04dee..a1bbb3a831 100644
--- a/src/mesa/state_tracker/st_cb_readpixels.c
+++ b/src/mesa/state_tracker/st_cb_readpixels.c
@@ -40,6 +40,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_inlines.h"
+#include "pipe/util/p_tile.h"
 #include "st_context.h"
 #include "st_cb_readpixels.h"
 #include "st_cb_fbo.h"
@@ -210,7 +211,7 @@ st_readpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
 
    /* Do a row at a time to flip image data vertically */
    for (i = 0; i < height; i++) {
-      pipe->get_tile_rgba(pipe, strb->surface, x, y, width, 1, df);
+      pipe_get_tile_rgba(pipe, strb->surface, x, y, width, 1, df);
       y += yStep;
       df += dfStride;
       if (!dfStride) {
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 19274570a1..ba0950e295 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -45,6 +45,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_inlines.h"
+#include "pipe/util/p_tile.h"
 
 
 #define DBG if (0) printf
@@ -1068,8 +1069,7 @@ fallback_copy_texsubimage(GLcontext *ctx,
 
    /* do copy row by row */
    for (row = 0; row < height; row++) {
-      pipe->get_tile_rgba(pipe, src_surf, srcX, srcY + row, width, 1,
-			  data);
+      pipe_get_tile_rgba(pipe, src_surf, srcX, srcY + row, width, 1, data);
 
       /* XXX we're ignoring convolution for now */
       if (ctx->_ImageTransferState) {
@@ -1078,8 +1078,7 @@ fallback_copy_texsubimage(GLcontext *ctx,
                             width, (GLfloat (*)[4])data);
       }
 
-      pipe->put_tile_rgba(pipe, dest_surf, destX, destY, width, 1,
-			  data);
+      pipe_put_tile_rgba(pipe, dest_surf, destX, destY, width, 1, data);
       destY += yStep;
    }