From: Xiang, Haihao <haihao.xiang@intel.com>
Date: Thu, 4 Sep 2008 03:32:52 +0000 (+0800)
Subject: mesa: merge stencil values into depth values for MESA_FORMAT_S8_Z24
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=55e89eecff6a8dc0433eca16e2ea699ec9636d1b;p=mesa.git

mesa: merge stencil values into depth values for MESA_FORMAT_S8_Z24

Cherry-picked from master
---

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index e821d9f367f..0fd6a2daae2 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2522,7 +2522,7 @@ _mesa_texstore_s8_z24(TEXSTORE_PARAMS)
          for (row = 0; row < srcHeight; row++) {
             GLubyte stencil[MAX_WIDTH];
             GLint i;
-            /* the 24 depth bits will be in the high position: */
+            /* the 24 depth bits will be in the low position: */
             _mesa_unpack_depth_span(ctx, srcWidth,
                                     GL_UNSIGNED_INT, /* dst type */
                                     dstRow, /* dst addr */
@@ -2536,7 +2536,7 @@ _mesa_texstore_s8_z24(TEXSTORE_PARAMS)
                                       ctx->_ImageTransferState);
             /* merge stencil values into depth values */
             for (i = 0; i < srcWidth; i++)
-               dstRow[i] = stencil[i] << 24;
+               dstRow[i] |= stencil[i] << 24;
 
             src += srcRowStride;
             dstRow += dstRowStride / sizeof(GLuint);