mesa: Added _mesa_texstore_s8_z24

3 files changed, 55 insertions, 4 deletions

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index ea55002f58d..11e7755960a 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -1221,11 +1221,7 @@ const struct gl_texture_format _mesa_texformat_s8_z24 = {
    24,					/* DepthBits */
    8,					/* StencilBits */
    4,					/* TexelBytes */
-#if 0
    _mesa_texstore_s8_z24,		/* StoreTexImageFunc */
-#else
-   _mesa_texstore_z24_s8,		/* StoreTexImageFunc */
-#endif
    NULL,				/* FetchTexel1D */
    NULL,				/* FetchTexel2D */
    NULL,				/* FetchTexel3D */
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 562e07a0f58..f3629cb0d1d 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2397,6 +2397,60 @@ _mesa_texstore_z24_s8(TEXSTORE_PARAMS)
 }
 
 
+/**
+ * Store a combined depth/stencil texture image.
+ */
+GLboolean
+_mesa_texstore_s8_z24(TEXSTORE_PARAMS)
+{
+   const GLuint depthScale = 0xffffff;
+
+   ASSERT(dstFormat == &_mesa_texformat_s8_z24);
+   ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT);
+   ASSERT(srcType == GL_UNSIGNED_INT_24_8_EXT);
+
+
+   /* general path */
+   const GLint srcRowStride
+      = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType)
+      / sizeof(GLuint);
+   GLint img, row;
+
+   for (img = 0; img < srcDepth; img++) {
+      GLuint *dstRow = (GLuint *) dstAddr
+         + dstImageOffsets[dstZoffset + img]
+         + dstYoffset * dstRowStride / sizeof(GLuint)
+         + dstXoffset;
+      const GLuint *src
+         = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,
+                                                srcWidth, srcHeight,
+                                                srcFormat, srcType,
+                                                img, 0, 0);
+      for (row = 0; row < srcHeight; row++) {
+         GLubyte stencil[MAX_WIDTH];
+         GLint i;
+         /* the 24 depth bits will be in the high position: */
+         _mesa_unpack_depth_span(ctx, srcWidth,
+                                 GL_UNSIGNED_INT, /* dst type */
+                                 dstRow, /* dst addr */
+                                 depthScale,
+                                 srcType, src, srcPacking);
+         /* get the 8-bit stencil values */
+         _mesa_unpack_stencil_span(ctx, srcWidth,
+                                   GL_UNSIGNED_BYTE, /* dst type */
+                                   stencil, /* dst addr */
+                                   srcType, src, srcPacking,
+                                   ctx->_ImageTransferState);
+         /* merge stencil values into depth values */
+         for (i = 0; i < srcWidth; i++)
+            dstRow[i] = stencil[i] << 24;
+
+         src += srcRowStride;
+         dstRow += dstRowStride / sizeof(GLuint);
+      }
+   }
+   return GL_TRUE;
+}
 
 /**
  * Store an image in any of the formats:
diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h
index da0c7cb78e5..c5813fbeeec 100644
--- a/src/mesa/main/texstore.h
+++ b/src/mesa/main/texstore.h
@@ -57,6 +57,7 @@ extern GLboolean _mesa_texstore_a8(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_ci8(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_ycbcr(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_z24_s8(TEXSTORE_PARAMS);
+extern GLboolean _mesa_texstore_s8_z24(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_z16(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_z32(TEXSTORE_PARAMS);
 extern GLboolean _mesa_texstore_rgba_float32(TEXSTORE_PARAMS);