32 and z24s8 softpipe buffers

4 files changed, 164 insertions, 33 deletions

diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index a1412ef007..a900de169e 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -51,6 +51,7 @@
 
 #include "pipe/softpipe/sp_z_surface.h"
 #include "pipe/p_state.h"
+#include "pipe/p_defines.h"
 
 
 /* 32-bit color index format.  Not a public format. */
@@ -1094,7 +1095,8 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       rb->PutValues = put_values_ushort;
       rb->PutMonoValues = put_mono_values_ushort;
       rb->DepthBits = 8 * sizeof(GLushort);
-      rb->surface = (struct pipe_surface *) softpipe_new_z_surface(16);
+      rb->surface
+         = (struct pipe_surface *) softpipe_new_z_surface(PIPE_FORMAT_U_Z16);
       pixelSize = sizeof(GLushort);
       break;
    case GL_DEPTH_COMPONENT24:
@@ -1117,6 +1119,8 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
          rb->_ActualFormat = GL_DEPTH_COMPONENT32;
          rb->DepthBits = 32;
       }
+      rb->surface
+         = (struct pipe_surface *) softpipe_new_z_surface(PIPE_FORMAT_U_Z32);
       pixelSize = sizeof(GLuint);
       break;
    case GL_DEPTH_STENCIL_EXT:
@@ -1134,6 +1138,8 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       rb->PutMonoValues = put_mono_values_uint;
       rb->DepthBits = 24;
       rb->StencilBits = 8;
+      rb->surface
+         = (struct pipe_surface *) softpipe_new_z_surface(PIPE_FORMAT_Z24_S8);
       pixelSize = sizeof(GLuint);
       break;
    case GL_COLOR_INDEX8_EXT:
diff --git a/src/mesa/pipe/p_defines.h b/src/mesa/pipe/p_defines.h
index 1b799f1451..58f01758e3 100644
--- a/src/mesa/pipe/p_defines.h
+++ b/src/mesa/pipe/p_defines.h
@@ -132,19 +132,21 @@
 /**
  * Texture/surface image formats (preliminary)
  */
-#define PIPE_FORMAT_U_R8_G8_B8_A8   0  /**< ubyte[4] RGBA */
-#define PIPE_FORMAT_U_A8_R8_G8_B8   1  /**< ubyte[4] ARGB */
-#define PIPE_FORMAT_U_R5_G6_B5      2  /**< 5/6/5 RGB */
-#define PIPE_FORMAT_U_L8            3  /**< ubyte luminance */
-#define PIPE_FORMAT_U_A8            4  /**< ubyte alpha */
-#define PIPE_FORMAT_U_I8            5  /**< ubyte intensity */
-#define PIPE_FORMAT_U_L8_A8         6  /**< ubyte luminance, alpha */
-#define PIPE_FORMAT_U_Z16           7  /**< ushort Z/depth */
-#define PIPE_FORMAT_F_Z32           8  /**< float Z/depth */
-#define PIPE_FORMAT_YCBCR           9
-#define PIPE_FORMAT_YCBCR_REV      10
-#define PIPE_FORMAT_U_S8           11  /**< 8-bit stencil */
-#define PIPE_FORMAT_Z24_S8         12  /**< 24-bit Z + 8-bit stencil */
+#define PIPE_FORMAT_NONE            0  /**< unstructured */
+#define PIPE_FORMAT_U_R8_G8_B8_A8   1  /**< ubyte[4] RGBA */
+#define PIPE_FORMAT_U_A8_R8_G8_B8   2  /**< ubyte[4] ARGB */
+#define PIPE_FORMAT_U_R5_G6_B5      3  /**< 5/6/5 RGB */
+#define PIPE_FORMAT_U_L8            4  /**< ubyte luminance */
+#define PIPE_FORMAT_U_A8            5  /**< ubyte alpha */
+#define PIPE_FORMAT_U_I8            6  /**< ubyte intensity */
+#define PIPE_FORMAT_U_L8_A8         7  /**< ubyte luminance, alpha */
+#define PIPE_FORMAT_YCBCR           8
+#define PIPE_FORMAT_YCBCR_REV       9
+#define PIPE_FORMAT_U_Z16          10  /**< ushort Z/depth */
+#define PIPE_FORMAT_U_Z32          11  /**< uint Z/depth */
+#define PIPE_FORMAT_F_Z32          12  /**< float Z/depth */
+#define PIPE_FORMAT_Z24_S8         13  /**< 24-bit Z + 8-bit stencil */
+#define PIPE_FORMAT_U_S8           14  /**< 8-bit stencil */
 
 
 /**
diff --git a/src/mesa/pipe/softpipe/sp_z_surface.c b/src/mesa/pipe/softpipe/sp_z_surface.c
index 662a4a15ee..744737cb6c 100644
--- a/src/mesa/pipe/softpipe/sp_z_surface.c
+++ b/src/mesa/pipe/softpipe/sp_z_surface.c
@@ -36,38 +36,48 @@
 #include "main/imports.h"
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
+#include "sp_context.h"
 #include "sp_surface.h"
 #include "sp_z_surface.h"
 
 static void*
-z16_map(struct pipe_buffer *pb, GLuint access_mode)
+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
-z16_unmap(struct pipe_buffer *pb)
+z_unmap(struct pipe_buffer *pb)
 {
    struct softpipe_surface *sps = (struct softpipe_surface *) pb;
    sps->surface.ptr = NULL;
+   sps->surface.stride = 0;
 }
 
 static void
-z16_resize(struct pipe_surface *ps, GLuint width, GLuint height)
+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);
 
-   ps->buffer.ptr = (GLubyte *) malloc(width * height * sizeof(GLushort));
+   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;
 
-   sps->surface.stride = sps->surface.width;
-   sps->surface.cpp = 2;
 }
 
 static void
@@ -77,10 +87,12 @@ z16_read_quad_z(struct softpipe_surface *sps,
    const GLushort *src
       = (GLushort *) sps->surface.ptr + y * sps->surface.stride + 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];
+   zzzz[2] = src[sps->surface.width + 0];
    zzzz[3] = src[sps->surface.width + 1];
 }
 
@@ -90,29 +102,140 @@ z16_write_quad_z(struct softpipe_surface *sps,
 {
    GLushort *dst = (GLushort *) sps->surface.ptr + y * sps->surface.stride + 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] = zzzz[2];
+   dst[sps->surface.width + 0] = zzzz[2];
+   dst[sps->surface.width + 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.ptr + y * sps->surface.stride + 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];
+}
+
+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;
+
+   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];
 }
 
+static void
+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;
+
+   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;
+}
+
+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;
+
+   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[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.ptr + y * sps->surface.stride + 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;
+}
+
+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;
+
+   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[0] = (dst[0] & 0xffffff00) | ssss[2];
+   dst[1] = (dst[1] & 0xffffff00) | ssss[3];
+}
+
+
+
+/**
+ * Create a new software-based Z buffer.
+ * \param format  one of the PIPE_FORMAT_z* formats
+ */
 struct softpipe_surface *
-softpipe_new_z_surface(GLuint depth)
+softpipe_new_z_surface(GLuint format)
 {
    struct softpipe_surface *sps = CALLOC_STRUCT(softpipe_surface);
    if (!sps)
       return NULL;
 
-   /* XXX ignoring depth param for now */
-
-   sps->surface.format = PIPE_FORMAT_U_Z16;
-
-   sps->surface.resize = z16_resize;
-   sps->surface.buffer.map = z16_map;
-   sps->surface.buffer.unmap = z16_unmap;
-   sps->read_quad_z = z16_read_quad_z;
-   sps->write_quad_z = z16_write_quad_z;
+   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;
 }
diff --git a/src/mesa/pipe/softpipe/sp_z_surface.h b/src/mesa/pipe/softpipe/sp_z_surface.h
index 9c3c43ca57..6a8d89a7c1 100644
--- a/src/mesa/pipe/softpipe/sp_z_surface.h
+++ b/src/mesa/pipe/softpipe/sp_z_surface.h
@@ -31,7 +31,7 @@
 
 
 extern struct softpipe_surface *
-softpipe_new_z_surface(GLuint depth);
+softpipe_new_z_surface(GLuint format);
 
 
 #endif /* SP_Z_SURFACE_H */