Remove mapping fields from struct pipe_surface.

It's now the responsibility of surface users to keep track of their mappings.

12 files changed, 172 insertions, 178 deletions

diff --git a/src/mesa/pipe/i915simple/i915_surface.c b/src/mesa/pipe/i915simple/i915_surface.c
index 79e74e11437..4e1b0929eed 100644
--- a/src/mesa/pipe/i915simple/i915_surface.c
+++ b/src/mesa/pipe/i915simple/i915_surface.c
@@ -171,10 +171,10 @@ i915_surface_copy(struct pipe_context *pipe,
 /* Fill a rectangular sub-region.  Need better logic about when to
  * push buffers into AGP - will currently do so whenever possible.
  */
-static ubyte *
-get_pointer(struct pipe_surface *dst, unsigned x, unsigned y)
+static void *
+get_pointer(struct pipe_surface *dst, void *dst_map, unsigned x, unsigned y)
 {
-   return dst->map + (y * dst->pitch + x) * dst->cpp;
+   return (char *)dst_map + (y * dst->pitch + x) * dst->cpp;
 }
 
 
@@ -186,12 +186,11 @@ i915_surface_fill(struct pipe_context *pipe,
 {
    if (0) {
       unsigned i, j;
-
-      (void)pipe_surface_map(dst);
+      void *dst_map = pipe_surface_map(dst);
 
       switch (dst->cpp) {
       case 1: {
-	 ubyte *row = get_pointer(dst, dstx, dsty);
+	 ubyte *row = get_pointer(dst, dst_map, dstx, dsty);
 	 for (i = 0; i < height; i++) {
 	    memset(row, value, width);
 	    row += dst->pitch;
@@ -199,7 +198,7 @@ i915_surface_fill(struct pipe_context *pipe,
       }
 	 break;
       case 2: {
-	 ushort *row = (ushort *) get_pointer(dst, dstx, dsty);
+	 ushort *row = get_pointer(dst, dst_map, dstx, dsty);
 	 for (i = 0; i < height; i++) {
 	    for (j = 0; j < width; j++)
 	       row[j] = (ushort) value;
@@ -208,7 +207,7 @@ i915_surface_fill(struct pipe_context *pipe,
       }
 	 break;
       case 4: {
-	 unsigned *row = (unsigned *) get_pointer(dst, dstx, dsty);
+	 unsigned *row = get_pointer(dst, dst_map, dstx, dsty);
 	 for (i = 0; i < height; i++) {
 	    for (j = 0; j < width; j++)
 	       row[j] = value;
@@ -220,6 +219,8 @@ i915_surface_fill(struct pipe_context *pipe,
 	 assert(0);
 	 break;
       }
+
+      pipe_surface_unmap( dst );
    }
    else {
       i915_fill_blit( i915_context(pipe),
diff --git a/src/mesa/pipe/i965simple/brw_surface.c b/src/mesa/pipe/i965simple/brw_surface.c
index d0e7229d5ca..850423bdd53 100644
--- a/src/mesa/pipe/i965simple/brw_surface.c
+++ b/src/mesa/pipe/i965simple/brw_surface.c
@@ -171,10 +171,10 @@ brw_surface_copy(struct pipe_context *pipe,
 /* Fill a rectangular sub-region.  Need better logic about when to
  * push buffers into AGP - will currently do so whenever possible.
  */
-static ubyte *
-get_pointer(struct pipe_surface *dst, unsigned x, unsigned y)
+static void *
+get_pointer(struct pipe_surface *dst, void *dst_map, unsigned x, unsigned y)
 {
-   return dst->map + (y * dst->pitch + x) * dst->cpp;
+   return (char *)dst_map + (y * dst->pitch + x) * dst->cpp;
 }
 
 
@@ -186,12 +186,11 @@ brw_surface_fill(struct pipe_context *pipe,
 {
    if (0) {
       unsigned i, j;
-
-      (void)pipe_surface_map(dst);
+      void *dst_map = pipe_surface_map(dst);
 
       switch (dst->cpp) {
       case 1: {
-	 ubyte *row = get_pointer(dst, dstx, dsty);
+	 ubyte *row = get_pointer(dst, dst_map, dstx, dsty);
 	 for (i = 0; i < height; i++) {
 	    memset(row, value, width);
 	    row += dst->pitch;
@@ -199,7 +198,7 @@ brw_surface_fill(struct pipe_context *pipe,
       }
 	 break;
       case 2: {
-	 ushort *row = (ushort *) get_pointer(dst, dstx, dsty);
+	 ushort *row = get_pointer(dst, dst_map, dstx, dsty);
 	 for (i = 0; i < height; i++) {
 	    for (j = 0; j < width; j++)
 	       row[j] = (ushort) value;
@@ -208,7 +207,7 @@ brw_surface_fill(struct pipe_context *pipe,
       }
 	 break;
       case 4: {
-	 unsigned *row = (unsigned *) get_pointer(dst, dstx, dsty);
+	 unsigned *row = get_pointer(dst, dst_map, dstx, dsty);
 	 for (i = 0; i < height; i++) {
 	    for (j = 0; j < width; j++)
 	       row[j] = value;
@@ -220,6 +219,8 @@ brw_surface_fill(struct pipe_context *pipe,
 	 assert(0);
 	 break;
       }
+
+      pipe_surface_unmap( dst );
    }
    else {
       brw_fill_blit(brw_context(pipe),
diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index 1afb38a8683..1a1f4f4e786 100644
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -194,9 +194,9 @@ struct pipe_context {
                     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);
+			 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);
+			 uint x, uint y, uint w, uint h, const float *p);
 
 
    /*
diff --git a/src/mesa/pipe/p_inlines.h b/src/mesa/pipe/p_inlines.h
index e7303c45c1b..6976d087f9b 100644
--- a/src/mesa/pipe/p_inlines.h
+++ b/src/mesa/pipe/p_inlines.h
@@ -33,35 +33,21 @@
 #include "p_winsys.h"
 
 
-static INLINE ubyte *
+static INLINE void *
 pipe_surface_map(struct pipe_surface *surface)
 {
-   if (!surface->map_refcount++) {
-      surface->map
-         = (ubyte *) surface->winsys->buffer_map( surface->winsys,
-						  surface->buffer,
-						  PIPE_BUFFER_FLAG_WRITE | 
-						  PIPE_BUFFER_FLAG_READ )
-           + surface->offset;
-   }
-
-   return surface->map;
+   return (char *)surface->winsys->buffer_map( surface->winsys, surface->buffer,
+					       PIPE_BUFFER_FLAG_WRITE |
+					       PIPE_BUFFER_FLAG_READ )
+      + surface->offset;
 }
 
 static INLINE void
 pipe_surface_unmap(struct pipe_surface *surface)
 {
-   if (surface->map_refcount > 0) {
-      assert(surface->map);
-      if (!--surface->map_refcount) {
-         surface->winsys->buffer_unmap( surface->winsys,
-					surface->buffer );
-         surface->map = NULL;
-      }
-   }
+   surface->winsys->buffer_unmap( surface->winsys, surface->buffer );
 }
 
-
 /**
  * Set 'ptr' to point to 'surf' and update reference counting.
  * The old thing pointed to, if any, will be unreferenced first.
diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index f9c5bfb6c65..ccd2a5f9e2f 100644
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -242,8 +242,6 @@ struct pipe_sampler_state
 struct pipe_surface
 {
    struct pipe_buffer_handle *buffer; /**< driver private buffer handle */
-   ubyte *map;    /**< only non-NULL when surface is actually mapped */
-   unsigned map_refcount;  /**< Reference count for mapping */
    enum pipe_format format;      /**< PIPE_FORMAT_x */
    unsigned cpp;                 /**< bytes per pixel */
    unsigned width, height;
diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index 4f22539629d..68c18e2d05b 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -75,22 +75,15 @@ softpipe_is_format_supported( struct pipe_context *pipe,
 void
 softpipe_map_surfaces(struct softpipe_context *sp)
 {
-   struct pipe_surface *ps;
    unsigned i;
 
    for (i = 0; i < sp->framebuffer.num_cbufs; i++) {
-      ps = sp->framebuffer.cbufs[i];
-      if (ps->buffer && !ps->map)
-         pipe_surface_map(ps);
+      sp_tile_cache_map_surfaces(sp->cbuf_cache[i]);
    }
 
-   ps = sp->framebuffer.zbuf;
-   if (ps && ps->buffer && !ps->map)
-      pipe_surface_map(ps);
+   sp_tile_cache_map_surfaces(sp->zbuf_cache);
 
-   ps = sp->framebuffer.sbuf;
-   if (ps && ps->buffer && !ps->map)
-      pipe_surface_map(ps);
+   sp_tile_cache_map_surfaces(sp->sbuf_cache);
 }
 
 
@@ -100,7 +93,6 @@ softpipe_map_surfaces(struct softpipe_context *sp)
 void
 softpipe_unmap_surfaces(struct softpipe_context *sp)
 {
-   struct pipe_surface *ps;
    uint i;
 
    for (i = 0; i < sp->framebuffer.num_cbufs; i++)
@@ -109,18 +101,12 @@ softpipe_unmap_surfaces(struct softpipe_context *sp)
    sp_flush_tile_cache(sp, sp->sbuf_cache);
 
    for (i = 0; i < sp->framebuffer.num_cbufs; i++) {
-      ps = sp->framebuffer.cbufs[i];
-      if (ps->map)
-         pipe_surface_unmap(ps);
+      sp_tile_cache_unmap_surfaces(sp->cbuf_cache[i]);
    }
 
-   ps = sp->framebuffer.zbuf;
-   if (ps && ps->map)
-      pipe_surface_unmap(ps);
+   sp_tile_cache_unmap_surfaces(sp->zbuf_cache);
 
-   ps = sp->framebuffer.sbuf;
-   if (ps && ps->map)
-      pipe_surface_unmap(ps);
+   sp_tile_cache_unmap_surfaces(sp->sbuf_cache);
 }
 
 
diff --git a/src/mesa/pipe/softpipe/sp_state_surface.c b/src/mesa/pipe/softpipe/sp_state_surface.c
index ee72aaf4c5a..4a9a28cc4dc 100644
--- a/src/mesa/pipe/softpipe/sp_state_surface.c
+++ b/src/mesa/pipe/softpipe/sp_state_surface.c
@@ -38,7 +38,7 @@
 /**
  * XXX this might get moved someday
  * Set the framebuffer surface info: color buffers, zbuffer, stencil buffer.
- * Here, we map the surfaces and update the tile cache to point to the new
+ * Here, we flush the old surfaces and update the tile cache to point to the new
  * surfaces.
  */
 void
@@ -46,7 +46,6 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe,
                                const struct pipe_framebuffer_state *fb)
 {
    struct softpipe_context *sp = softpipe_context(pipe);
-   struct pipe_surface *ps;
    uint i;
 
    for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++) {
@@ -54,19 +53,12 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe,
       if (sp->framebuffer.cbufs[i] != fb->cbufs[i]) {
          /* flush old */
          sp_flush_tile_cache(sp, sp->cbuf_cache[i]);
-         /* unmap old */
-         ps = sp->framebuffer.cbufs[i];
-         if (ps && ps->map)
-            pipe_surface_unmap(ps);
-         /* map new */
-         ps = fb->cbufs[i];
-         if (ps)
-            pipe_surface_map(ps);
+
          /* assign new */
          sp->framebuffer.cbufs[i] = fb->cbufs[i];
 
          /* update cache */
-         sp_tile_cache_set_surface(sp->cbuf_cache[i], ps);
+         sp_tile_cache_set_surface(sp->cbuf_cache[i], fb->cbufs[i]);
       }
    }
 
@@ -76,23 +68,12 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe,
    if (sp->framebuffer.zbuf != fb->zbuf) {
       /* flush old */
       sp_flush_tile_cache(sp, sp->zbuf_cache);
-      /* unmap old */
-      ps = sp->framebuffer.zbuf;
-      if (ps && ps->map)
-         pipe_surface_unmap(ps);
-      if (sp->framebuffer.sbuf == sp->framebuffer.zbuf) {
-         /* combined z/stencil */
-         sp->framebuffer.sbuf = NULL;
-      }
-      /* map new */
-      ps = fb->zbuf;
-      if (ps)
-         pipe_surface_map(ps);
+
       /* assign new */
       sp->framebuffer.zbuf = fb->zbuf;
 
       /* update cache */
-      sp_tile_cache_set_surface(sp->zbuf_cache, ps);
+      sp_tile_cache_set_surface(sp->zbuf_cache, fb->zbuf);
    }
 
    /* XXX combined depth/stencil here */
@@ -101,14 +82,7 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe,
    if (sp->framebuffer.sbuf != fb->sbuf) {
       /* flush old */
       sp_flush_tile_cache(sp, sp->sbuf_cache_sep);
-      /* unmap old */
-      ps = sp->framebuffer.sbuf;
-      if (ps && ps->map)
-         pipe_surface_unmap(ps);
-      /* map new */
-      ps = fb->sbuf;
-      if (ps && fb->sbuf != fb->zbuf)
-         pipe_surface_map(ps);
+
       /* assign new */
       sp->framebuffer.sbuf = fb->sbuf;
 
@@ -116,12 +90,12 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe,
       if (fb->sbuf != fb->zbuf) {
          /* separate stencil buf */
          sp->sbuf_cache = sp->sbuf_cache_sep;
-         sp_tile_cache_set_surface(sp->sbuf_cache, ps);
+         sp_tile_cache_set_surface(sp->sbuf_cache, fb->sbuf);
       }
       else {
          /* combined depth/stencil */
          sp->sbuf_cache = sp->zbuf_cache;
-         sp_tile_cache_set_surface(sp->sbuf_cache, ps);
+         sp_tile_cache_set_surface(sp->sbuf_cache, fb->sbuf);
       }
    }
 
diff --git a/src/mesa/pipe/softpipe/sp_surface.c b/src/mesa/pipe/softpipe/sp_surface.c
index ece30e36ec4..b44ba3e9570 100644
--- a/src/mesa/pipe/softpipe/sp_surface.c
+++ b/src/mesa/pipe/softpipe/sp_surface.c
@@ -158,10 +158,10 @@ sp_surface_copy(struct pipe_context *pipe,
 }
 
 
-static ubyte *
-get_pointer(struct pipe_surface *dst, unsigned x, unsigned y)
+static void *
+get_pointer(struct pipe_surface *dst, void *dst_map, unsigned x, unsigned y)
 {
-   return dst->map + (y * dst->pitch + x) * dst->cpp;
+   return (char *)dst_map + (y * dst->pitch + x) * dst->cpp;
 }
 
 
@@ -179,16 +179,16 @@ sp_surface_fill(struct pipe_context *pipe,
 		unsigned width, unsigned height, unsigned value)
 {
    unsigned i, j;
+   void *dst_map = pipe_surface_map(dst);
 
    assert(dst->pitch > 0);
    assert(width <= dst->pitch);
 
-   (void)pipe_surface_map(dst);
 
    switch (dst->cpp) {
    case 1:
       {
-         ubyte *row = get_pointer(dst, dstx, dsty);
+	 ubyte *row = get_pointer(dst, dst_map, dstx, dsty);
          for (i = 0; i < height; i++) {
             memset(row, value, width);
 	 row += dst->pitch;
@@ -197,7 +197,7 @@ sp_surface_fill(struct pipe_context *pipe,
       break;
    case 2:
       {
-         ushort *row = (ushort *) get_pointer(dst, dstx, dsty);
+         ushort *row = get_pointer(dst, dst_map, dstx, dsty);
          for (i = 0; i < height; i++) {
             for (j = 0; j < width; j++)
                row[j] = (ushort) value;
@@ -207,7 +207,7 @@ sp_surface_fill(struct pipe_context *pipe,
       break;
    case 4:
       {
-         unsigned *row = (unsigned *) get_pointer(dst, dstx, dsty);
+         unsigned *row = get_pointer(dst, dst_map, dstx, dsty);
          for (i = 0; i < height; i++) {
             for (j = 0; j < width; j++)
                row[j] = value;
@@ -218,7 +218,7 @@ sp_surface_fill(struct pipe_context *pipe,
    case 8:
       {
          /* expand the 4-byte clear value to an 8-byte value */
-         ushort *row = (ushort *) get_pointer(dst, dstx, dsty);
+         ushort *row = (ushort *) get_pointer(dst, dst_map, dstx, dsty);
          ushort val0 = UBYTE_TO_USHORT((value >>  0) & 0xff);
          ushort val1 = UBYTE_TO_USHORT((value >>  8) & 0xff);
          ushort val2 = UBYTE_TO_USHORT((value >> 16) & 0xff);
diff --git a/src/mesa/pipe/softpipe/sp_tile_cache.c b/src/mesa/pipe/softpipe/sp_tile_cache.c
index 1dbcc5aadd0..d6f60807e6c 100644
--- a/src/mesa/pipe/softpipe/sp_tile_cache.c
+++ b/src/mesa/pipe/softpipe/sp_tile_cache.c
@@ -49,6 +49,7 @@
 struct softpipe_tile_cache
 {
    struct pipe_surface *surface;  /**< the surface we're caching */
+   void *surface_map;
    struct pipe_texture *texture;  /**< if caching a texture */
    struct softpipe_cached_tile entries[NUM_ENTRIES];
    uint clear_flags[(MAX_WIDTH / TILE_SIZE) * (MAX_HEIGHT / TILE_SIZE) / 32];
@@ -57,6 +58,7 @@ struct softpipe_tile_cache
    boolean depth_stencil; /** Is the surface a depth/stencil format? */
 
    struct pipe_surface *tex_surf;
+   void *tex_surf_map;
    int tex_face, tex_level, tex_z;
 
    struct softpipe_cached_tile tile;  /**< scratch tile for clears */
@@ -150,7 +152,7 @@ sp_tile_cache_set_surface(struct softpipe_tile_cache *tc,
 {
    assert(!tc->texture);
 
-   if (tc->surface && tc->surface->map) {
+   if (tc->surface_map) {
       /*assert(tc->surface != ps);*/
       pipe_surface_unmap(tc->surface);
    }
@@ -158,8 +160,8 @@ sp_tile_cache_set_surface(struct softpipe_tile_cache *tc,
    pipe_surface_reference(&tc->surface, ps);
 
    if (ps) {
-      if (!ps->map)
-         pipe_surface_map(ps);
+      if (tc->surface_map)
+	 tc->surface_map = pipe_surface_map(ps);
 
       tc->depth_stencil = (ps->format == PIPE_FORMAT_S8Z24_UNORM ||
                            ps->format == PIPE_FORMAT_Z16_UNORM ||
@@ -179,6 +181,32 @@ sp_tile_cache_get_surface(struct softpipe_tile_cache *tc)
 }
 
 
+void
+sp_tile_cache_map_surfaces(struct softpipe_tile_cache *tc)
+{
+   if (tc->surface && !tc->surface_map)
+      tc->surface_map = pipe_surface_map(tc->surface);
+
+   if (tc->tex_surf && !tc->tex_surf_map)
+      tc->tex_surf_map = pipe_surface_map(tc->tex_surf);
+}
+
+
+void
+sp_tile_cache_unmap_surfaces(struct softpipe_tile_cache *tc)
+{
+   if (tc->surface_map) {
+      pipe_surface_unmap(tc->surface);
+      tc->surface_map = NULL;
+   }
+
+   if (tc->tex_surf_map) {
+      pipe_surface_unmap(tc->tex_surf);
+      tc->tex_surf_map = NULL;
+   }
+}
+
+
 /**
  * Specify the texture to cache.
  */
@@ -192,8 +220,10 @@ sp_tile_cache_set_texture(struct softpipe_tile_cache *tc,
 
    tc->texture = texture;
 
-   if (tc->tex_surf && tc->tex_surf->map)
+   if (tc->tex_surf_map) {
       pipe_surface_unmap(tc->tex_surf);
+      tc->tex_surf_map = NULL;
+   }
    pipe_surface_reference(&tc->tex_surf, NULL);
 
    /* mark as entries as invalid/empty */
@@ -330,9 +360,6 @@ sp_flush_tile_cache(struct softpipe_context *softpipe,
    if (!ps || !ps->buffer)
       return;
 
-   if (!ps->map)
-      pipe_surface_map(ps);
-
    for (pos = 0; pos < NUM_ENTRIES; pos++) {
       struct softpipe_cached_tile *tile = tc->entries + pos;
       if (tile->x >= 0) {
@@ -475,11 +502,11 @@ sp_get_cached_tile_tex(struct pipe_context *pipe,
           tc->tex_z != z) {
          /* get new surface (view into texture) */
 
-         if (tc->tex_surf && tc->tex_surf->map)
+	 if (tc->tex_surf_map)
             pipe_surface_unmap(tc->tex_surf);
 
          tc->tex_surf = pipe->get_tex_surface(pipe, tc->texture, face, level, z);
-         pipe_surface_map(tc->tex_surf);
+         tc->tex_surf_map = pipe_surface_map(tc->tex_surf);
 
          tc->tex_face = face;
          tc->tex_level = level;
diff --git a/src/mesa/pipe/softpipe/sp_tile_cache.h b/src/mesa/pipe/softpipe/sp_tile_cache.h
index 91fb2795a26..7fd10812863 100644
--- a/src/mesa/pipe/softpipe/sp_tile_cache.h
+++ b/src/mesa/pipe/softpipe/sp_tile_cache.h
@@ -74,6 +74,12 @@ extern struct pipe_surface *
 sp_tile_cache_get_surface(struct softpipe_tile_cache *tc);
 
 extern void
+sp_tile_cache_map_surfaces(struct softpipe_tile_cache *tc);
+
+extern void
+sp_tile_cache_unmap_surfaces(struct softpipe_tile_cache *tc);
+
+extern void
 sp_tile_cache_set_texture(struct softpipe_tile_cache *tc,
                           struct pipe_texture *texture);
 
diff --git a/src/mesa/pipe/util/p_tile.c b/src/mesa/pipe/util/p_tile.c
index 8bc3c22c832..f2e19f19dcb 100644
--- a/src/mesa/pipe/util/p_tile.c
+++ b/src/mesa/pipe/util/p_tile.c
@@ -56,8 +56,6 @@ pipe_get_tile_raw(struct pipe_context *pipe,
    ubyte *pDest;
    uint i;
 
-   assert(ps->map);
-
    if (dst_stride == 0) {
       dst_stride = w * cpp;
    }
@@ -65,7 +63,7 @@ pipe_get_tile_raw(struct pipe_context *pipe,
    if (pipe_clip_tile(x, y, &w, &h, ps))
       return;
 
-   pSrc = ps->map + (y * ps->pitch + x) * cpp;
+   pSrc = (const ubyte *) pipe_surface_map(ps) + (y * ps->pitch + x) * cpp;
    pDest = (ubyte *) p;
 
    for (i = 0; i < h; i++) {
@@ -73,6 +71,8 @@ pipe_get_tile_raw(struct pipe_context *pipe,
       pDest += dst_stride;
       pSrc += src_stride;
    }
+
+   pipe_surface_unmap(ps);
 }
 
 
@@ -92,8 +92,6 @@ pipe_put_tile_raw(struct pipe_context *pipe,
    ubyte *pDest;
    uint i;
 
-   assert(ps->map);
-
    if (src_stride == 0) {
       src_stride = w * cpp;
    }
@@ -102,13 +100,15 @@ pipe_put_tile_raw(struct pipe_context *pipe,
       return;
 
    pSrc = (const ubyte *) p;
-   pDest = ps->map + (y * ps->pitch + x) * cpp;
+   pDest = (ubyte *) pipe_surface_map(ps) + (y * ps->pitch + x) * cpp;
 
    for (i = 0; i < h; i++) {
       memcpy(pDest, pSrc, w * cpp);
       pDest += dst_stride;
       pSrc += src_stride;
    }
+
+   pipe_surface_unmap(ps);
 }
 
 
@@ -126,11 +126,12 @@ pipe_put_tile_raw(struct pipe_context *pipe,
 
 static void
 a8r8g8b8_get_tile_rgba(struct pipe_surface *ps,
+		       void *map,
                        unsigned x, unsigned y, unsigned w, unsigned h,
                        float *p)
 {
    const unsigned *src
-      = ((const unsigned *) (ps->map))
+      = ((const unsigned *) map)
       + y * ps->pitch + x;
    unsigned i, j;
    unsigned w0 = w;
@@ -158,11 +159,12 @@ a8r8g8b8_get_tile_rgba(struct pipe_surface *ps,
 
 static void
 a8r8g8b8_put_tile_rgba(struct pipe_surface *ps,
+		       void *map,
                        unsigned x, unsigned y, unsigned w, unsigned h,
                        const float *p)
 {
    unsigned *dst
-      = ((unsigned *) (ps->map))
+      = ((unsigned *) map)
       + y * ps->pitch + x;
    unsigned i, j;
    unsigned w0 = w;
@@ -193,11 +195,12 @@ a8r8g8b8_put_tile_rgba(struct pipe_surface *ps,
 
 static void
 b8g8r8a8_get_tile_rgba(struct pipe_surface *ps,
+		       void *map,
                        unsigned x, unsigned y, unsigned w, unsigned h,
                        float *p)
 {
    const unsigned *src
-      = ((const unsigned *) (ps->map))
+      = ((const unsigned *) map)
       + y * ps->pitch + x;
    unsigned i, j;
    unsigned w0 = w;
@@ -225,11 +228,12 @@ b8g8r8a8_get_tile_rgba(struct pipe_surface *ps,
 
 static void
 b8g8r8a8_put_tile_rgba(struct pipe_surface *ps,
+		       void *map,
                        unsigned x, unsigned y, unsigned w, unsigned h,
                        const float *p)
 {
    unsigned *dst
-      = ((unsigned *) (ps->map))
+      = ((unsigned *) map)
       + y * ps->pitch + x;
    unsigned i, j;
    unsigned w0 = w;
@@ -260,11 +264,12 @@ b8g8r8a8_put_tile_rgba(struct pipe_surface *ps,
 
 static void
 a1r5g5b5_get_tile_rgba(struct pipe_surface *ps,
+		       void *map,
                        unsigned x, unsigned y, unsigned w, unsigned h,
                        float *p)
 {
    const ushort *src
-      = ((const ushort *) (ps->map))
+      = ((const ushort *) map)
       + y * ps->pitch + x;
    unsigned i, j;
 
@@ -288,11 +293,12 @@ a1r5g5b5_get_tile_rgba(struct pipe_surface *ps,
 
 static void
 a4r4g4b4_get_tile_rgba(struct pipe_surface *ps,
+		       void *map,
                        unsigned x, unsigned y, unsigned w, unsigned h,
                        float *p)
 {
    const ushort *src
-      = ((const ushort *) (ps->map))
+      = ((const ushort *) map)
       + y * ps->pitch + x;
    unsigned i, j;
 
@@ -316,11 +322,12 @@ a4r4g4b4_get_tile_rgba(struct pipe_surface *ps,
 
 static void
 r5g6b5_get_tile_rgba(struct pipe_surface *ps,
+		     void *map,
                      unsigned x, unsigned y, unsigned w, unsigned h,
                      float *p)
 {
    const ushort *src
-      = ((const ushort *) (ps->map))
+      = ((const ushort *) map)
       + y * ps->pitch + x;
    unsigned i, j;
 
@@ -342,11 +349,12 @@ r5g6b5_get_tile_rgba(struct pipe_surface *ps,
 
 static void
 r5g5b5_put_tile_rgba(struct pipe_surface *ps,
+		     void *map,
                      unsigned x, unsigned y, unsigned w, unsigned h,
                      const float *p)
 {
    ushort *dst
-      = ((ushort *) (ps->map))
+      = ((ushort *) map)
       + y * ps->pitch + x;
    unsigned i, j;
    unsigned w0 = w;
@@ -379,11 +387,12 @@ r5g5b5_put_tile_rgba(struct pipe_surface *ps,
  */
 static void
 z16_get_tile_rgba(struct pipe_surface *ps,
+		  void *map,
                   unsigned x, unsigned y, unsigned w, unsigned h,
                   float *p)
 {
    const ushort *src
-      = ((const ushort *) (ps->map))
+      = ((const ushort *) map)
       + y * ps->pitch + x;
    const float scale = 1.0f / 65535.0f;
    unsigned i, j;
@@ -414,11 +423,12 @@ z16_get_tile_rgba(struct pipe_surface *ps,
 
 static void
 l8_get_tile_rgba(struct pipe_surface *ps,
+		 void *map,
                  unsigned x, unsigned y, unsigned w, unsigned h,
                  float *p)
 {
    const ubyte *src
-      = ((const ubyte *) (ps->map))
+      = ((const ubyte *) map)
       + y * ps->pitch + x;
    unsigned i, j;
    unsigned w0 = w;
@@ -447,11 +457,12 @@ l8_get_tile_rgba(struct pipe_surface *ps,
 
 static void
 a8_get_tile_rgba(struct pipe_surface *ps,
+		 void *map,
                  unsigned x, unsigned y, unsigned w, unsigned h,
                  float *p)
 {
    const ubyte *src
-      = ((const ubyte *) (ps->map))
+      = ((const ubyte *) map)
       + y * ps->pitch + x;
    unsigned i, j;
    unsigned w0 = w;
@@ -480,11 +491,12 @@ a8_get_tile_rgba(struct pipe_surface *ps,
 
 static void
 r16g16b16a16_get_tile_rgba(struct pipe_surface *ps,
+			   void *map,
                            unsigned x, unsigned y, unsigned w, unsigned h,
                            float *p)
 {
    const short *src
-      = ((const short *) (ps->map))
+      = ((const short *) map)
       + (y * ps->pitch + x) * 4;
    unsigned i, j;
    unsigned w0 = w;
@@ -513,11 +525,12 @@ r16g16b16a16_get_tile_rgba(struct pipe_surface *ps,
 
 static void
 r16g16b16a16_put_tile_rgba(struct pipe_surface *ps,
+			   void *map,
                            unsigned x, unsigned y, unsigned w, unsigned h,
                            const float *p)
 {
    short *dst
-      = ((short *) (ps->map))
+      = ((short *) map)
       + (y * ps->pitch + x) * 4;
    unsigned i, j;
    unsigned w0 = w;
@@ -552,11 +565,12 @@ r16g16b16a16_put_tile_rgba(struct pipe_surface *ps,
 
 static void
 i8_get_tile_rgba(struct pipe_surface *ps,
+		 void *map,
                  unsigned x, unsigned y, unsigned w, unsigned h,
                  float *p)
 {
    const ubyte *src
-      = ((const ubyte *) (ps->map))
+      = ((const ubyte *) map)
       + y * ps->pitch + x;
    unsigned i, j;
    unsigned w0 = w;
@@ -585,11 +599,12 @@ i8_get_tile_rgba(struct pipe_surface *ps,
 
 static void
 a8_l8_get_tile_rgba(struct pipe_surface *ps,
+		    void *map,
                     unsigned x, unsigned y, unsigned w, unsigned h,
                     float *p)
 {
    const ushort *src
-      = ((const ushort *) (ps->map))
+      = ((const ushort *) map)
       + y * ps->pitch + x;
    unsigned i, j;
    unsigned w0 = w;
@@ -624,11 +639,12 @@ a8_l8_get_tile_rgba(struct pipe_surface *ps,
  */
 static void
 z32_get_tile_rgba(struct pipe_surface *ps,
+		  void *map,
                   unsigned x, unsigned y, unsigned w, unsigned h,
                   float *p)
 {
    const uint *src
-      = ((const uint *) (ps->map))
+      = ((const uint *) map)
       + y * ps->pitch + x;
    const double scale = 1.0 / (double) 0xffffffff;
    unsigned i, j;
@@ -660,11 +676,12 @@ z32_get_tile_rgba(struct pipe_surface *ps,
  */
 static void
 s8z24_get_tile_rgba(struct pipe_surface *ps,
+		    void *map,
                     unsigned x, unsigned y, unsigned w, unsigned h,
                     float *p)
 {
    const uint *src
-      = ((const uint *) (ps->map))
+      = ((const uint *) map)
       + y * ps->pitch + x;
    const double scale = 1.0 / ((1 << 24) - 1);
    unsigned i, j;
@@ -696,11 +713,12 @@ s8z24_get_tile_rgba(struct pipe_surface *ps,
  */
 static void
 z24s8_get_tile_rgba(struct pipe_surface *ps,
+		    void *map,
                     unsigned x, unsigned y, unsigned w, unsigned h,
                     float *p)
 {
    const uint *src
-      = ((const uint *) (ps->map))
+      = ((const uint *) map)
       + y * ps->pitch + x;
    const double scale = 1.0 / ((1 << 24) - 1);
    unsigned i, j;
@@ -731,52 +749,56 @@ pipe_get_tile_rgba(struct pipe_context *pipe,
                    uint x, uint y, uint w, uint h,
                    float *p)
 {
+   void *map = pipe_surface_map(ps);
+
    switch (ps->format) {
    case PIPE_FORMAT_A8R8G8B8_UNORM:
-      a8r8g8b8_get_tile_rgba(ps, x, y, w, h, p);
+      a8r8g8b8_get_tile_rgba(ps, map, x, y, w, h, p);
       break;
    case PIPE_FORMAT_B8G8R8A8_UNORM:
-      b8g8r8a8_get_tile_rgba(ps, x, y, w, h, p);
+      b8g8r8a8_get_tile_rgba(ps, map, x, y, w, h, p);
       break;
    case PIPE_FORMAT_A1R5G5B5_UNORM:
-      a1r5g5b5_get_tile_rgba(ps, x, y, w, h, p);
+      a1r5g5b5_get_tile_rgba(ps, map, x, y, w, h, p);
       break;
    case PIPE_FORMAT_A4R4G4B4_UNORM:
-      a4r4g4b4_get_tile_rgba(ps, x, y, w, h, p);
+      a4r4g4b4_get_tile_rgba(ps, map, x, y, w, h, p);
       break;
    case PIPE_FORMAT_R5G6B5_UNORM:
-      r5g6b5_get_tile_rgba(ps, x, y, w, h, p);
+      r5g6b5_get_tile_rgba(ps, map, x, y, w, h, p);
       break;
    case PIPE_FORMAT_U_L8:
-      l8_get_tile_rgba(ps, x, y, w, h, p);
+      l8_get_tile_rgba(ps, map, x, y, w, h, p);
       break;
    case PIPE_FORMAT_U_A8:
-      a8_get_tile_rgba(ps, x, y, w, h, p);
+      a8_get_tile_rgba(ps, map, x, y, w, h, p);
       break;
    case PIPE_FORMAT_U_I8:
-      i8_get_tile_rgba(ps, x, y, w, h, p);
+      i8_get_tile_rgba(ps, map, x, y, w, h, p);
       break;
    case PIPE_FORMAT_U_A8_L8:
-      a8_l8_get_tile_rgba(ps, x, y, w, h, p);
+      a8_l8_get_tile_rgba(ps, map, x, y, w, h, p);
       break;
    case PIPE_FORMAT_R16G16B16A16_SNORM:
-      r16g16b16a16_get_tile_rgba(ps, x, y, w, h, p);
+      r16g16b16a16_get_tile_rgba(ps, map, x, y, w, h, p);
       break;
    case PIPE_FORMAT_Z16_UNORM:
-      z16_get_tile_rgba(ps, x, y, w, h, p);
+      z16_get_tile_rgba(ps, map, x, y, w, h, p);
       break;
    case PIPE_FORMAT_Z32_UNORM:
-      z32_get_tile_rgba(ps, x, y, w, h, p);
+      z32_get_tile_rgba(ps, map, x, y, w, h, p);
       break;
    case PIPE_FORMAT_S8Z24_UNORM:
-      s8z24_get_tile_rgba(ps, x, y, w, h, p);
+      s8z24_get_tile_rgba(ps, map, x, y, w, h, p);
       break;
    case PIPE_FORMAT_Z24S8_UNORM:
-      z24s8_get_tile_rgba(ps, x, y, w, h, p);
+      z24s8_get_tile_rgba(ps, map, x, y, w, h, p);
       break;
    default:
       assert(0);
    }
+
+   pipe_surface_unmap(ps);
 }
 
 
@@ -786,49 +808,53 @@ 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);
+
    switch (ps->format) {
    case PIPE_FORMAT_A8R8G8B8_UNORM:
-      a8r8g8b8_put_tile_rgba(ps, x, y, w, h, p);
+      a8r8g8b8_put_tile_rgba(ps, map, x, y, w, h, p);
       break;
    case PIPE_FORMAT_B8G8R8A8_UNORM:
-      b8g8r8a8_put_tile_rgba(ps, x, y, w, h, p);
+      b8g8r8a8_put_tile_rgba(ps, map, x, y, w, h, p);
       break;
    case PIPE_FORMAT_A1R5G5B5_UNORM:
-      /*a1r5g5b5_put_tile_rgba(ps, x, y, w, h, p);*/
+      /*a1r5g5b5_put_tile_rgba(ps, map, x, y, w, h, p);*/
       break;
    case PIPE_FORMAT_R5G6B5_UNORM:
-      r5g5b5_put_tile_rgba(ps, x, y, w, h, p);
+      r5g5b5_put_tile_rgba(ps, map, x, y, w, h, p);
       break;
    case PIPE_FORMAT_R8G8B8A8_UNORM:
       break;
    case PIPE_FORMAT_U_L8:
-      /*l8_put_tile_rgba(ps, x, y, w, h, p);*/
+      /*l8_put_tile_rgba(ps, map, x, y, w, h, p);*/
       break;
    case PIPE_FORMAT_U_A8:
-      /*a8_put_tile_rgba(ps, x, y, w, h, p);*/
+      /*a8_put_tile_rgba(ps, map, x, y, w, h, p);*/
       break;
    case PIPE_FORMAT_U_I8:
-      /*i8_put_tile_rgba(ps, x, y, w, h, p);*/
+      /*i8_put_tile_rgba(ps, map, x, y, w, h, p);*/
       break;
    case PIPE_FORMAT_U_A8_L8:
-      /*a8_l8_put_tile_rgba(ps, x, y, w, h, p);*/
+      /*a8_l8_put_tile_rgba(ps, map, x, y, w, h, p);*/
       break;
    case PIPE_FORMAT_R16G16B16A16_SNORM:
-      r16g16b16a16_put_tile_rgba(ps, x, y, w, h, p);
+      r16g16b16a16_put_tile_rgba(ps, map, x, y, w, h, p);
       break;
    case PIPE_FORMAT_Z16_UNORM:
-      /*z16_put_tile_rgba(ps, x, y, w, h, p);*/
+      /*z16_put_tile_rgba(ps, map, x, y, w, h, p);*/
       break;
    case PIPE_FORMAT_Z32_UNORM:
-      /*z32_put_tile_rgba(ps, x, y, w, h, p);*/
+      /*z32_put_tile_rgba(ps, map, x, y, w, h, p);*/
       break;
    case PIPE_FORMAT_S8Z24_UNORM:
-      /*s8z24_put_tile_rgba(ps, x, y, w, h, p);*/
+      /*s8z24_put_tile_rgba(ps, map, x, y, w, h, p);*/
       break;
    case PIPE_FORMAT_Z24S8_UNORM:
-      /*z24s8_put_tile_rgba(ps, x, y, w, h, p);*/
+      /*z24s8_put_tile_rgba(ps, map, x, y, w, h, p);*/
       break;
    default:
       assert(0);
    }
+
+   pipe_surface_unmap(ps);
 }
diff --git a/src/mesa/pipe/xlib/xm_api.c b/src/mesa/pipe/xlib/xm_api.c
index 168eba07843..03985eab5a6 100644
--- a/src/mesa/pipe/xlib/xm_api.c
+++ b/src/mesa/pipe/xlib/xm_api.c
@@ -1247,22 +1247,11 @@ void XMesaCopySubBuffer( XMesaBuffer b, int x, int y, int width, int height )
 GLboolean XMesaGetDepthBuffer( XMesaBuffer b, GLint *width, GLint *height,
                                GLint *bytesPerValue, void **buffer )
 {
-   struct pipe_surface *surf
-      = st_get_framebuffer_surface(b->stfb, ST_SURFACE_DEPTH);
-   if (surf) {
-      *width = surf->width;
-      *height = surf->pitch;
-      *bytesPerValue = surf->cpp;
-      *buffer = surf->map;
-      return GL_TRUE;
-   }
-   else {
-      *width = 0;
-      *height = 0;
-      *bytesPerValue = 0;
-      *buffer = 0;
-      return GL_FALSE;
-   }
+   *width = 0;
+   *height = 0;
+   *bytesPerValue = 0;
+   *buffer = 0;
+   return GL_FALSE;
 }