1 files changed, 103 insertions, 25 deletions

diff --git a/mesalib/src/mesa/main/format_unpack.c b/mesalib/src/mesa/main/format_unpack.c
index 2051f68fb..eaa33dfdb 100644
--- a/mesalib/src/mesa/main/format_unpack.c
+++ b/mesalib/src/mesa/main/format_unpack.c
@@ -1415,37 +1415,26 @@ _mesa_unpack_float_z_row(gl_format format, GLuint n,
 typedef void (*unpack_uint_z_func)(const void *src, GLuint *dst);
 
 static void
-unpack_uint_z_Z24_S8(const void *src, GLuint *dst)
+unpack_uint_z_Z24_X8(const void *src, GLuint *dst)
 {
    /* only return Z, not stencil data */
    const GLuint s = *((const GLuint *) src);
-   *dst = (s >> 8);
+   *dst = (s & 0xffffff00) | (s >> 24);
 }
 
 static void
-unpack_uint_z_S8_Z24(const void *src, GLuint *dst)
+unpack_uint_z_X8_Z24(const void *src, GLuint *dst)
 {
    /* only return Z, not stencil data */
    const GLuint s = *((const GLuint *) src);
-   *dst = s & 0x00ffffff;
+   *dst = (s << 8) | ((s >> 16) & 0xff);
 }
 
 static void
 unpack_uint_z_Z16(const void *src, GLuint *dst)
 {
-   *dst = *((const GLushort *) src);
-}
-
-static void
-unpack_uint_z_X8_Z24(const void *src, GLuint *dst)
-{
-   unpack_uint_z_S8_Z24(src, dst);
-}
-
-static void
-unpack_uint_z_Z24_X8(const void *src, GLuint *dst)
-{
-   unpack_uint_z_Z24_S8(src, dst);
+   const GLushort s = *((const GLushort *)src);
+   *dst = (s << 16) | s;
 }
 
 static void
@@ -1466,19 +1455,15 @@ _mesa_unpack_uint_z_row(gl_format format, GLuint n,
 
    switch (format) {
    case MESA_FORMAT_Z24_S8:
-      unpack = unpack_uint_z_Z24_S8;
+   case MESA_FORMAT_Z24_X8:
+      unpack = unpack_uint_z_Z24_X8;
       break;
    case MESA_FORMAT_S8_Z24:
-      unpack = unpack_uint_z_S8_Z24;
-      break;
-   case MESA_FORMAT_Z16:
-      unpack = unpack_uint_z_Z16;
-      break;
    case MESA_FORMAT_X8_Z24:
       unpack = unpack_uint_z_X8_Z24;
       break;
-   case MESA_FORMAT_Z24_X8:
-      unpack = unpack_uint_z_Z24_X8;
+   case MESA_FORMAT_Z16:
+      unpack = unpack_uint_z_Z16;
       break;
    case MESA_FORMAT_Z32:
       unpack = unpack_uint_z_Z32;
@@ -1495,4 +1480,97 @@ _mesa_unpack_uint_z_row(gl_format format, GLuint n,
    }
 }
 
+static void
+unpack_ubyte_s_S8(const void *src, GLubyte *dst, GLuint n)
+{
+   memcpy(dst, src, n);
+}
 
+static void
+unpack_ubyte_s_Z24_S8(const void *src, GLubyte *dst, GLuint n)
+{
+   GLuint i;
+   const GLuint *src32 = src;
+
+   for (i = 0; i < n; i++)
+      dst[i] = src32[i] & 0xff;
+}
+
+static void
+unpack_ubyte_s_S8_Z24(const void *src, GLubyte *dst, GLuint n)
+{
+   GLuint i;
+   const GLuint *src32 = src;
+
+   for (i = 0; i < n; i++)
+      dst[i] = src32[i] >> 24;
+}
+
+static void
+unpack_ubyte_s_Z32_FLOAT_X24S8(const void *src, GLubyte *dst, GLuint n)
+{
+   GLuint i;
+   const GLuint *src32 = src;
+
+   for (i = 0; i < n; i++)
+      dst[i] = src32[i * 2 + 1] & 0xff;
+}
+
+void
+_mesa_unpack_ubyte_stencil_row(gl_format format, GLuint n,
+			       const void *src, GLubyte *dst)
+{
+   switch (format) {
+   case MESA_FORMAT_S8:
+      unpack_ubyte_s_S8(src, dst, n);
+      break;
+   case MESA_FORMAT_Z24_S8:
+      unpack_ubyte_s_Z24_S8(src, dst, n);
+      break;
+   case MESA_FORMAT_S8_Z24:
+      unpack_ubyte_s_S8_Z24(src, dst, n);
+      break;
+   case MESA_FORMAT_Z32_FLOAT_X24S8:
+      unpack_ubyte_s_Z32_FLOAT_X24S8(src, dst, n);
+      break;
+   default:
+      _mesa_problem(NULL, "bad format %s in _mesa_unpack_ubyte_s_row",
+                    _mesa_get_format_name(format));
+      return;
+   }
+}
+
+static void
+unpack_uint_24_8_depth_stencil_S8_Z24(const GLuint *src, GLuint *dst, GLuint n)
+{
+   GLuint i;
+
+   for (i = 0; i < n; i++) {
+      GLuint val = src[i];
+      dst[i] = val >> 24 | val << 8;
+   }
+}
+
+static void
+unpack_uint_24_8_depth_stencil_Z24_S8(const GLuint *src, GLuint *dst, GLuint n)
+{
+   memcpy(dst, src, n * 4);
+}
+
+void
+_mesa_unpack_uint_24_8_depth_stencil_row(gl_format format, GLuint n,
+					 const void *src, GLuint *dst)
+{
+   switch (format) {
+   case MESA_FORMAT_Z24_S8:
+      unpack_uint_24_8_depth_stencil_Z24_S8(src, dst, n);
+      break;
+   case MESA_FORMAT_S8_Z24:
+      unpack_uint_24_8_depth_stencil_S8_Z24(src, dst, n);
+      break;
+   default:
+      _mesa_problem(NULL, "bad format %s in _mesa_unpack_ubyte_s_row",
+                    _mesa_get_format_name(format));
+      return;
+   }
+}