Mesa (master): swrast: fix MSVC double->float conversion warnings

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Oct 29 14:11:18 2013 -0600

swrast: fix MSVC double->float conversion warnings

---

 src/mesa/swrast/s_texfetch_tmp.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h
index 7a68753..e2521b5 100644
--- a/src/mesa/swrast/s_texfetch_tmp.h
+++ b/src/mesa/swrast/s_texfetch_tmp.h
@@ -1537,7 +1537,7 @@ static void FETCH(f_z24_s8)( const struct swrast_texture_image *texImage,
    /* only return Z, not stencil data */
    const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
    const GLdouble scale = 1.0 / (GLdouble) 0xffffff;
-   texel[0] = ((*src) >> 8) * scale;
+   texel[0] = (GLfloat) (((*src) >> 8) * scale);
    ASSERT(texImage->Base.TexFormat == MESA_FORMAT_Z24_S8 ||
 	  texImage->Base.TexFormat == MESA_FORMAT_Z24_X8);
    ASSERT(texel[0] >= 0.0F);
@@ -1555,7 +1555,7 @@ static void FETCH(f_s8_z24)( const struct swrast_texture_image *texImage,
    /* only return Z, not stencil data */
    const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
    const GLdouble scale = 1.0 / (GLdouble) 0xffffff;
-   texel[0] = ((*src) & 0x00ffffff) * scale;
+   texel[0] = (GLfloat) (((*src) & 0x00ffffff) * scale);
    ASSERT(texImage->Base.TexFormat == MESA_FORMAT_S8_Z24 ||
 	  texImage->Base.TexFormat == MESA_FORMAT_X8_Z24);
    ASSERT(texel[0] >= 0.0F);