Redesign pipe_surface in terms of pipe_region.

struct pipe_buffer goes away.
Added basic region functions to softpipe to allocate/release malloc'd regions.
Surface-related code is fairly coherent now.

6 files changed, 437 insertions, 108 deletions

diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index 8655aa83fd..002fe73b59 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -35,6 +35,7 @@
 #include "pipe/p_defines.h"
 #include "sp_context.h"
 #include "sp_clear.h"
+#include "sp_region.h"
 #include "sp_state.h"
 #include "sp_surface.h"
 #include "sp_prim_setup.h"
@@ -42,18 +43,16 @@
 
 static void map_surfaces(struct softpipe_context *sp)
 {
+   struct pipe_context *pipe = &sp->pipe;
    GLuint i;
 
    for (i = 0; i < sp->framebuffer.num_cbufs; i++) {
-      struct softpipe_surface *sps = softpipe_surface(sp->framebuffer.cbufs[i]);
-      struct pipe_buffer *buf = &sps->surface.buffer;
-      buf->map(buf, PIPE_MAP_READ_WRITE);
+      struct softpipe_surface *sps = softpipe_surface(sp->framebuffer.cbufs[i]);      pipe->region_map(pipe, sps->surface.region);
    }
 
    if (sp->framebuffer.zbuf) {
       struct softpipe_surface *sps = softpipe_surface(sp->framebuffer.zbuf);
-      struct pipe_buffer *buf = &sps->surface.buffer;
-      buf->map(buf, PIPE_MAP_READ_WRITE);
+      pipe->region_map(pipe, sps->surface.region);
    }
 
    /* XXX depth & stencil bufs */
@@ -62,18 +61,17 @@ static void map_surfaces(struct softpipe_context *sp)
 
 static void unmap_surfaces(struct softpipe_context *sp)
 {
+   struct pipe_context *pipe = &sp->pipe;
    GLuint i;
 
    for (i = 0; i < sp->framebuffer.num_cbufs; i++) {
       struct softpipe_surface *sps = softpipe_surface(sp->framebuffer.cbufs[i]);
-      struct pipe_buffer *buf = &sps->surface.buffer;
-      buf->unmap(buf);
+      pipe->region_unmap(pipe, sps->surface.region);
    }
 
    if (sp->framebuffer.zbuf) {
       struct softpipe_surface *sps = softpipe_surface(sp->framebuffer.zbuf);
-      struct pipe_buffer *buf = &sps->surface.buffer;
-      buf->unmap(buf);
+      pipe->region_unmap(pipe, sps->surface.region);
    }
    /* XXX depth & stencil bufs */
 }
@@ -161,6 +159,9 @@ struct pipe_context *softpipe_create( void )
    softpipe->draw = draw_create();
    draw_set_setup_stage(softpipe->draw, sp_draw_render_stage(softpipe));
 
+   sp_init_region_functions(softpipe);
+   sp_init_surface_functions(softpipe);
+
    /*
     * XXX we could plug GL selection/feedback into the drawing pipeline
     * by specifying a different setup/render stage.
diff --git a/src/mesa/pipe/softpipe/sp_region.c b/src/mesa/pipe/softpipe/sp_region.c
new file mode 100644
index 0000000000..04ae5e94f9
--- /dev/null
+++ b/src/mesa/pipe/softpipe/sp_region.c
@@ -0,0 +1,105 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+/**
+ * Software-based region allocation and management.
+ * A hardware driver would override these functions.
+ */
+
+
+#include "sp_context.h"
+#include "sp_region.h"
+#include "sp_surface.h"
+#include "main/imports.h"
+
+
+static struct pipe_region *
+sp_region_alloc(struct pipe_context *pipe,
+                GLuint cpp, GLuint pitch, GLuint height)
+{
+   struct pipe_region *region = CALLOC_STRUCT(pipe_region);
+   if (!region)
+      return NULL;
+
+   region->refcount = 1;
+   region->cpp = cpp;
+   region->pitch = pitch;
+   region->height = height;
+   region->map = malloc(cpp * pitch * height);
+
+   return region;
+}
+
+
+static void
+sp_region_release(struct pipe_context *pipe, struct pipe_region **region)
+{
+   assert((*region)->refcount > 0);
+   (*region)->refcount--;
+
+   if ((*region)->refcount == 0) {
+      assert((*region)->map_refcount == 0);
+
+#if 0
+      if ((*region)->pbo)
+	 (*region)->pbo->region = NULL;
+      (*region)->pbo = NULL;
+#endif
+
+      free(*region);
+   }
+   *region = NULL;
+}
+
+
+
+static GLubyte *
+sp_region_map(struct pipe_context *pipe, struct pipe_region *region)
+{
+   region->map_refcount++;
+   return region->map;
+}
+
+
+static void
+sp_region_unmap(struct pipe_context *pipe, struct pipe_region *region)
+{
+   region->map_refcount--;
+}
+
+
+void
+sp_init_region_functions(struct softpipe_context *sp)
+{
+   sp->pipe.region_alloc = sp_region_alloc;
+   sp->pipe.region_release = sp_region_release;
+
+   sp->pipe.region_map = sp_region_map;
+   sp->pipe.region_unmap = sp_region_unmap;
+
+   /* XXX lots of other region functions needed... */
+}
diff --git a/src/mesa/pipe/softpipe/sp_region.h b/src/mesa/pipe/softpipe/sp_region.h
new file mode 100644
index 0000000000..432746b27f
--- /dev/null
+++ b/src/mesa/pipe/softpipe/sp_region.h
@@ -0,0 +1,40 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+
+#ifndef SP_REGION_H
+#define SP_REGION_H
+
+
+struct softpipe_context;
+
+
+extern void
+sp_init_region_functions(struct softpipe_context *sp);
+
+
+#endif /* SP_REGION_H */
diff --git a/src/mesa/pipe/softpipe/sp_surface.c b/src/mesa/pipe/softpipe/sp_surface.c
index 16bbacb12b..cf89d28941 100644
--- a/src/mesa/pipe/softpipe/sp_surface.c
+++ b/src/mesa/pipe/softpipe/sp_surface.c
@@ -28,8 +28,22 @@
 #include "sp_context.h"
 #include "sp_state.h"
 #include "sp_surface.h"
-#include "sp_headers.h"
+#include "pipe/p_defines.h"
+#include "main/imports.h"
 
+
+/**
+ * Softpipe surface functions.
+ * Basically, create surface of a particular type, then plug in default
+ * read/write_quad functions.
+ * Note that these quad funcs assume the buffer/region is in a linear
+ * layout with Y=0=bottom.
+ * If we had swizzled/AOS buffers the read/write functions could be
+ * simplified a lot....
+ */
+
+
+#if 000 /* OLD... should be recycled... */
 static void rgba8_read_quad_f( struct softpipe_surface *gs,
 			       GLint x, GLint y,
 			       GLfloat (*rgba)[NUM_CHANNELS] )
@@ -98,9 +112,6 @@ static void rgba8_write_quad_f_swz( struct softpipe_surface *gs,
    }
 }
 
-
-
-
 static void rgba8_read_quad_ub( struct softpipe_surface *gs,
 				GLint x, GLint y,
 				GLubyte (*rgba)[NUM_CHANNELS] )
@@ -118,7 +129,6 @@ static void rgba8_read_quad_ub( struct softpipe_surface *gs,
    }
 }
 
-
 static void rgba8_write_quad_ub( struct softpipe_surface *gs,
 				 GLint x, GLint y,
 				 GLubyte (*rgba)[NUM_CHANNELS] )
@@ -136,18 +146,216 @@ static void rgba8_write_quad_ub( struct softpipe_surface *gs,
    }
 }
 
+#endif
+
+
+
+static void
+z16_read_quad_z(struct softpipe_surface *sps,
+                GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
+{
+   const GLushort *src
+      = (GLushort *) sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_U_Z16);
+
+   /* converting GLushort to GLuint: */
+   zzzz[0] = src[0];
+   zzzz[1] = src[1];
+   src += sps->surface.region->pitch;
+   zzzz[2] = src[0];
+   zzzz[3] = src[1];
+}
+
+static void
+z16_write_quad_z(struct softpipe_surface *sps,
+                 GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
+{
+   GLushort *dst = (GLushort *) sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_U_Z16);
+
+   /* converting GLuint to GLushort: */
+   dst[0] = zzzz[0];
+   dst[1] = zzzz[1];
+   dst += sps->surface.region->pitch;
+   dst[0] = zzzz[2];
+   dst[1] = zzzz[3];
+}
+
+static void
+z32_read_quad_z(struct softpipe_surface *sps,
+                GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
+{
+   const GLuint *src
+      = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_U_Z32);
+
+   zzzz[0] = src[0];
+   zzzz[1] = src[1];
+   src += sps->surface.region->pitch;
+   zzzz[2] = src[0];
+   zzzz[3] = src[1];
+}
+
+static void
+z32_write_quad_z(struct softpipe_surface *sps,
+                 GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
+{
+   GLuint *dst = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_U_Z32);
+
+   dst[0] = zzzz[0];
+   dst[1] = zzzz[1];
+   dst += sps->surface.region->pitch;
+   dst[0] = zzzz[2];
+   dst[1] = zzzz[3];
+}
+
+static void
+z24s8_read_quad_z(struct softpipe_surface *sps,
+                  GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
+{
+   const GLuint *src
+      = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
+
+   zzzz[0] = src[0] >> 8;
+   zzzz[1] = src[1] >> 8;
+   src += sps->surface.region->pitch;
+   zzzz[2] = src[0] >> 8;
+   zzzz[3] = src[1] >> 8;
+}
+
+static void
+z24s8_write_quad_z(struct softpipe_surface *sps,
+                   GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
+{
+   GLuint *dst = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
+   assert(zzzz[0] <= 0xffffff);
+
+   dst[0] = (dst[0] & 0xff) | (zzzz[0] << 8);
+   dst[1] = (dst[1] & 0xff) | (zzzz[1] << 8);
+   dst += sps->surface.region->pitch;
+   dst[0] = (dst[0] & 0xff) | (zzzz[2] << 8);
+   dst[1] = (dst[1] & 0xff) | (zzzz[3] << 8);
+}
+
+static void
+z24s8_read_quad_stencil(struct softpipe_surface *sps,
+                        GLint x, GLint y, GLubyte ssss[QUAD_SIZE])
+{
+   const GLuint *src
+      = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
+
+   ssss[0] = src[0] & 0xff;
+   ssss[1] = src[1] & 0xff;
+   src += sps->surface.region->pitch;
+   ssss[2] = src[0] & 0xff;
+   ssss[3] = src[1] & 0xff;
+}
 
+static void
+z24s8_write_quad_stencil(struct softpipe_surface *sps,
+                         GLint x, GLint y, const GLubyte ssss[QUAD_SIZE])
+{
+   GLuint *dst = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
 
+   dst[0] = (dst[0] & 0xffffff00) | ssss[0];
+   dst[1] = (dst[1] & 0xffffff00) | ssss[1];
+   dst += sps->surface.region->pitch;
+   dst[0] = (dst[0] & 0xffffff00) | ssss[2];
+   dst[1] = (dst[1] & 0xffffff00) | ssss[3];
+}
 
-struct softpipe_surface_type gs_rgba8 = {
-   G_SURFACE_RGBA_8888,
-   rgba8_read_quad_f,
-   rgba8_read_quad_f_swz,
-   rgba8_read_quad_ub,
-   rgba8_write_quad_f,
-   rgba8_write_quad_f_swz,
-   rgba8_write_quad_ub,
-};
 
+static void
+s8_read_quad_stencil(struct softpipe_surface *sps,
+                     GLint x, GLint y, GLubyte ssss[QUAD_SIZE])
+{
+   const GLubyte *src
+      = sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_U_S8);
+
+   ssss[0] = src[0];
+   ssss[1] = src[1];
+   src += sps->surface.region->pitch;
+   ssss[2] = src[0];
+   ssss[3] = src[1];
+}
+
+static void
+s8_write_quad_stencil(struct softpipe_surface *sps,
+                      GLint x, GLint y, const GLubyte ssss[QUAD_SIZE])
+{
+   GLubyte *dst
+      = sps->surface.region->map + y * sps->surface.region->pitch + x;
 
+   assert(sps->surface.format == PIPE_FORMAT_U_S8);
 
+   dst[0] = ssss[0];
+   dst[1] = ssss[1];
+   dst += sps->surface.region->pitch;
+   dst[0] = ssss[2];
+   dst[1] = ssss[3];
+}
+
+
+
+static void
+init_quad_funcs(struct softpipe_surface *sps)
+{
+   switch (sps->surface.format) {
+   case PIPE_FORMAT_U_Z16:
+      sps->read_quad_z = z16_read_quad_z;
+      sps->write_quad_z = z16_write_quad_z;
+      break;
+   case PIPE_FORMAT_U_Z32:
+      sps->read_quad_z = z32_read_quad_z;
+      sps->write_quad_z = z32_write_quad_z;
+      break;
+   case PIPE_FORMAT_Z24_S8:
+      sps->read_quad_z = z24s8_read_quad_z;
+      sps->write_quad_z = z24s8_write_quad_z;
+      sps->read_quad_stencil = z24s8_read_quad_stencil;
+      sps->write_quad_stencil = z24s8_write_quad_stencil;
+      break;
+   case PIPE_FORMAT_U_S8:
+      sps->read_quad_stencil = s8_read_quad_stencil;
+      sps->write_quad_stencil = s8_write_quad_stencil;
+      break;
+   default:
+      assert(0);
+   }
+}
+
+
+static struct pipe_surface *
+sp_surface_alloc(struct pipe_context *pipe, GLenum format)
+{
+   struct softpipe_surface *sps = CALLOC_STRUCT(softpipe_surface);
+   if (!sps)
+      return NULL;
+
+   sps->surface.format = format;
+   init_quad_funcs(sps);
+
+   return &sps->surface;
+}
+
+
+void
+sp_init_surface_functions(struct softpipe_context *sp)
+{
+   sp->pipe.surface_alloc = sp_surface_alloc;
+}
diff --git a/src/mesa/pipe/softpipe/sp_surface.h b/src/mesa/pipe/softpipe/sp_surface.h
index 3ba732cebe..e8466256db 100644
--- a/src/mesa/pipe/softpipe/sp_surface.h
+++ b/src/mesa/pipe/softpipe/sp_surface.h
@@ -35,8 +35,7 @@
 #include "sp_headers.h"
 
 struct softpipe_surface;
-
-#define G_SURFACE_RGBA_8888  0x1
+struct softpipe_context;
 
 
 /**
@@ -98,4 +97,8 @@ softpipe_surface(struct pipe_surface *ps)
 }
 
 
+extern void
+sp_init_surface_functions(struct softpipe_context *sp);
+
+
 #endif /* SP_SURFACE_H */
diff --git a/src/mesa/pipe/softpipe/sp_z_surface.c b/src/mesa/pipe/softpipe/sp_z_surface.c
index 744737cb6c..7ff1a0cbc8 100644
--- a/src/mesa/pipe/softpipe/sp_z_surface.c
+++ b/src/mesa/pipe/softpipe/sp_z_surface.c
@@ -40,75 +40,35 @@
 #include "sp_surface.h"
 #include "sp_z_surface.h"
 
-static void*
-z_map(struct pipe_buffer *pb, GLuint access_mode)
-{
-   struct softpipe_surface *sps = (struct softpipe_surface *) pb;
-   sps->surface.ptr = pb->ptr;
-   sps->surface.stride = sps->surface.width;
-   return pb->ptr;
-}
-
-static void
-z_unmap(struct pipe_buffer *pb)
-{
-   struct softpipe_surface *sps = (struct softpipe_surface *) pb;
-   sps->surface.ptr = NULL;
-   sps->surface.stride = 0;
-}
-
-static void
-z_resize(struct pipe_surface *ps, GLuint width, GLuint height)
-{
-   struct softpipe_surface *sps = (struct softpipe_surface *) ps;
-
-   if (sps->surface.buffer.ptr)
-      free(sps->surface.buffer.ptr);
-
-   sps->surface.stride = sps->surface.width;
-   if (sps->surface.format == PIPE_FORMAT_U_Z16)
-      sps->surface.cpp = 2;
-   else if (sps->surface.format == PIPE_FORMAT_U_Z32 ||
-            sps->surface.format == PIPE_FORMAT_Z24_S8)
-      sps->surface.cpp = 4;
-   else
-      assert(0);
-
-   ps->buffer.ptr = (GLubyte *) malloc(width * height * sps->surface.cpp);
-   ps->width = width;
-   ps->height = height;
-
-}
-
 static void
 z16_read_quad_z(struct softpipe_surface *sps,
                 GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
 {
    const GLushort *src
-      = (GLushort *) sps->surface.ptr + y * sps->surface.stride + x;
+      = (GLushort *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
    assert(sps->surface.format == PIPE_FORMAT_U_Z16);
 
    /* converting GLushort to GLuint: */
    zzzz[0] = src[0];
    zzzz[1] = src[1];
-   zzzz[2] = src[sps->surface.width + 0];
-   zzzz[3] = src[sps->surface.width + 1];
+   zzzz[2] = src[sps->surface.region->pitch + 0];
+   zzzz[3] = src[sps->surface.region->pitch + 1];
 }
 
 static void
 z16_write_quad_z(struct softpipe_surface *sps,
                  GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
 {
-   GLushort *dst = (GLushort *) sps->surface.ptr + y * sps->surface.stride + x;
+   GLushort *dst = (GLushort *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
    assert(sps->surface.format == PIPE_FORMAT_U_Z16);
 
    /* converting GLuint to GLushort: */
    dst[0] = zzzz[0];
    dst[1] = zzzz[1];
-   dst[sps->surface.width + 0] = zzzz[2];
-   dst[sps->surface.width + 1] = zzzz[3];
+   dst[sps->surface.region->pitch + 0] = zzzz[2];
+   dst[sps->surface.region->pitch + 1] = zzzz[3];
 }
 
 static void
@@ -116,28 +76,28 @@ z32_read_quad_z(struct softpipe_surface *sps,
                 GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
 {
    const GLuint *src
-      = (GLuint *) sps->surface.ptr + y * sps->surface.stride + x;
+      = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
    assert(sps->surface.format == PIPE_FORMAT_U_Z32);
 
    zzzz[0] = src[0];
    zzzz[1] = src[1];
-   zzzz[2] = src[sps->surface.width + 0];
-   zzzz[3] = src[sps->surface.width + 1];
+   zzzz[2] = src[sps->surface.region->pitch + 0];
+   zzzz[3] = src[sps->surface.region->pitch + 1];
 }
 
 static void
 z32_write_quad_z(struct softpipe_surface *sps,
                  GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
 {
-   GLuint *dst = (GLuint *) sps->surface.ptr + y * sps->surface.stride + x;
+   GLuint *dst = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
    assert(sps->surface.format == PIPE_FORMAT_U_Z32);
 
    dst[0] = zzzz[0];
    dst[1] = zzzz[1];
-   dst[sps->surface.width + 0] = zzzz[2];
-   dst[sps->surface.width + 1] = zzzz[3];
+   dst[sps->surface.region->pitch + 0] = zzzz[2];
+   dst[sps->surface.region->pitch + 1] = zzzz[3];
 }
 
 static void
@@ -145,28 +105,28 @@ z24s8_read_quad_z(struct softpipe_surface *sps,
                   GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
 {
    const GLuint *src
-      = (GLuint *) sps->surface.ptr + y * sps->surface.stride + x;
+      = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
    assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
 
    zzzz[0] = src[0] >> 8;
    zzzz[1] = src[1] >> 8;
-   zzzz[2] = src[sps->surface.width + 0] >> 8;
-   zzzz[3] = src[sps->surface.width + 1] >> 8;
+   zzzz[2] = src[sps->surface.region->pitch + 0] >> 8;
+   zzzz[3] = src[sps->surface.region->pitch + 1] >> 8;
 }
 
 static void
 z24s8_write_quad_z(struct softpipe_surface *sps,
                    GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
 {
-   GLuint *dst = (GLuint *) sps->surface.ptr + y * sps->surface.stride + x;
+   GLuint *dst = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
    assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
    assert(zzzz[0] <= 0xffffff);
 
    dst[0] = (dst[0] & 0xff) | (zzzz[0] << 8);
    dst[1] = (dst[1] & 0xff) | (zzzz[1] << 8);
-   dst += sps->surface.width;
+   dst += sps->surface.region->pitch;
    dst[0] = (dst[0] & 0xff) | (zzzz[2] << 8);
    dst[1] = (dst[1] & 0xff) | (zzzz[3] << 8);
 }
@@ -176,32 +136,65 @@ z24s8_read_quad_stencil(struct softpipe_surface *sps,
                         GLint x, GLint y, GLubyte ssss[QUAD_SIZE])
 {
    const GLuint *src
-      = (GLuint *) sps->surface.ptr + y * sps->surface.stride + x;
+      = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
    assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
 
    ssss[0] = src[0] & 0xff;
    ssss[1] = src[1] & 0xff;
-   ssss[2] = src[sps->surface.width + 0] & 0xff;
-   ssss[3] = src[sps->surface.width + 1] & 0xff;
+   ssss[2] = src[sps->surface.region->pitch + 0] & 0xff;
+   ssss[3] = src[sps->surface.region->pitch + 1] & 0xff;
 }
 
 static void
 z24s8_write_quad_stencil(struct softpipe_surface *sps,
                          GLint x, GLint y, const GLubyte ssss[QUAD_SIZE])
 {
-   GLuint *dst = (GLuint *) sps->surface.ptr + y * sps->surface.stride + x;
+   GLuint *dst = (GLuint *) sps->surface.region->map + y * sps->surface.region->pitch + x;
 
    assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
 
    dst[0] = (dst[0] & 0xffffff00) | ssss[0];
    dst[1] = (dst[1] & 0xffffff00) | ssss[1];
-   dst += sps->surface.width;
+   dst += sps->surface.region->pitch;
    dst[0] = (dst[0] & 0xffffff00) | ssss[2];
    dst[1] = (dst[1] & 0xffffff00) | ssss[3];
 }
 
 
+static void
+s8_read_quad_stencil(struct softpipe_surface *sps,
+                     GLint x, GLint y, GLubyte ssss[QUAD_SIZE])
+{
+   const GLubyte *src
+      = sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_U_S8);
+
+   ssss[0] = src[0];
+   ssss[1] = src[1];
+   src += sps->surface.region->pitch;
+   ssss[2] = src[0];
+   ssss[3] = src[1];
+}
+
+static void
+s8_write_quad_stencil(struct softpipe_surface *sps,
+                      GLint x, GLint y, const GLubyte ssss[QUAD_SIZE])
+{
+   GLubyte *dst
+      = sps->surface.region->map + y * sps->surface.region->pitch + x;
+
+   assert(sps->surface.format == PIPE_FORMAT_U_S8);
+
+   dst[0] = ssss[0];
+   dst[1] = ssss[1];
+   dst += sps->surface.region->pitch;
+   dst[0] = ssss[2];
+   dst[1] = ssss[3];
+}
+
+
 
 /**
  * Create a new software-based Z buffer.
@@ -215,27 +208,6 @@ softpipe_new_z_surface(GLuint format)
       return NULL;
 
    sps->surface.format = format;
-   sps->surface.resize = z_resize;
-   sps->surface.buffer.map = z_map;
-   sps->surface.buffer.unmap = z_unmap;
-
-   if (format == PIPE_FORMAT_U_Z16) {
-      sps->read_quad_z = z16_read_quad_z;
-      sps->write_quad_z = z16_write_quad_z;
-   }
-   else if (format == PIPE_FORMAT_U_Z32) {
-      sps->read_quad_z = z32_read_quad_z;
-      sps->write_quad_z = z32_write_quad_z;
-   }
-   else if (format == PIPE_FORMAT_Z24_S8) {
-      sps->read_quad_z = z24s8_read_quad_z;
-      sps->write_quad_z = z24s8_write_quad_z;
-      sps->read_quad_stencil = z24s8_read_quad_stencil;
-      sps->write_quad_stencil = z24s8_write_quad_stencil;
-   }
-   else {
-      assert(0);
-   }
 
    return sps;
 }