diff options
| author | Brian Paul <brianp@vmware.com> | 2013-10-29 14:11:18 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2013-10-31 08:21:58 -0600 |
| commit | 83f276ab05778eea2b3ca493d1b43c7b3b0cf35a (patch) | |
| tree | 91012066deb512c10b74bf7ceecb9133769f438e | |
| parent | 717621acff73784adec35df81470a7adcb2e7ff0 (diff) | |
| download | external_mesa3d-83f276ab05778eea2b3ca493d1b43c7b3b0cf35a.zip external_mesa3d-83f276ab05778eea2b3ca493d1b43c7b3b0cf35a.tar.gz external_mesa3d-83f276ab05778eea2b3ca493d1b43c7b3b0cf35a.tar.bz2 | |
swrast: fix MSVC double->float conversion warnings
| -rw-r--r-- | 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); |