From: Karl Schultz <karl.w.schultz@gmail.com>
Date: Thu, 11 Feb 2010 23:49:41 +0000 (-0700)
Subject: main: Fix compiler warning.  No need to convert/store depthScale as GLfloat just... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=92098438784887fd6005918794476cfbbeac5035;p=mesa.git

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.
---

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index fcd0a56d76a..78612b08560 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,