diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-12 14:26:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-12 14:26:41 +0100 |
| commit | 2b5652fc7742c5ac57aca701214b046626a729e9 (patch) | |
| tree | a994b9e63a32a7c061bcfb563aa22369c217e49c /mesalib/src/mesa/swrast/s_texfetch_tmp.h | |
| parent | 2331d6e4ac699e775ccee07a8a461cae0a98033a (diff) | |
| parent | 5efb0a5e19b75137b7294b27f4e7878aeb8f0927 (diff) | |
| download | vcxsrv-2b5652fc7742c5ac57aca701214b046626a729e9.tar.gz vcxsrv-2b5652fc7742c5ac57aca701214b046626a729e9.tar.bz2 vcxsrv-2b5652fc7742c5ac57aca701214b046626a729e9.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/swrast/s_texfetch_tmp.h')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_texfetch_tmp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/swrast/s_texfetch_tmp.h b/mesalib/src/mesa/swrast/s_texfetch_tmp.h index e9512b561..877c29c9b 100644 --- a/mesalib/src/mesa/swrast/s_texfetch_tmp.h +++ b/mesalib/src/mesa/swrast/s_texfetch_tmp.h @@ -2270,7 +2270,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 GLfloat scale = 1.0F / (GLfloat) 0xffffff; + const GLdouble scale = 1.0 / (GLdouble) 0xffffff; texel[0] = ((*src) >> 8) * scale; ASSERT(texImage->Base.TexFormat == MESA_FORMAT_Z24_S8 || texImage->Base.TexFormat == MESA_FORMAT_Z24_X8); @@ -2298,7 +2298,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 GLfloat scale = 1.0F / (GLfloat) 0xffffff; + const GLdouble scale = 1.0 / (GLdouble) 0xffffff; texel[0] = ((*src) & 0x00ffffff) * scale; ASSERT(texImage->Base.TexFormat == MESA_FORMAT_S8_Z24 || texImage->Base.TexFormat == MESA_FORMAT_X8_Z24); |