Mesa (master): main: Fix compiler warning. No need to convert/ store depthScale as GLfloat just to convert it back to GLuint to call unpack_depth_span .

Karl Schultz kschultz at kemper.freedesktop.org
Thu Feb 11 23:51:55 UTC 2010


Module: Mesa
Branch: master
Commit: 92098438784887fd6005918794476cfbbeac5035
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=92098438784887fd6005918794476cfbbeac5035

Author: Karl Schultz <karl.w.schultz at gmail.com>
Date:   Thu Feb 11 16:49:41 2010 -0700

main: Fix compiler warning.  No need to convert/store depthScale as GLfloat just to convert it back to GLuint to call unpack_depth_span.
Also removes a difference between the 24/8 and 8/24 texstore routines.

---

 src/mesa/main/texstore.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index fcd0a56..78612b0 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2678,7 +2678,7 @@ _mesa_texstore_signed_rgba8888(TEXSTORE_PARAMS)
 static GLboolean
 _mesa_texstore_z24_s8(TEXSTORE_PARAMS)
 {
-   const GLfloat depthScale = (GLfloat) 0xffffff;
+   const GLuint depthScale = 0xffffff;
    const GLint srcRowStride
       = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType)
       / sizeof(GLuint);
@@ -2752,7 +2752,7 @@ _mesa_texstore_z24_s8(TEXSTORE_PARAMS)
             _mesa_unpack_depth_span(ctx, srcWidth,
                                     GL_UNSIGNED_INT_24_8_EXT, /* dst type */
                                     dstRow, /* dst addr */
-                                    (GLuint) depthScale,
+                                    depthScale,
                                     srcType, src, srcPacking);
             /* get the 8-bit stencil values */
             _mesa_unpack_stencil_span(ctx, srcWidth,




More information about the mesa-commit mailing list