From 70754dd1fbb1f0184dbaa3d6ac03f2df4c2e0436 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 7 Jan 2012 14:16:27 -0700 Subject: [PATCH] util: silence some MSVC type conversion warnings --- src/gallium/auxiliary/util/u_format_r11g11b10f.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gallium/auxiliary/util/u_format_r11g11b10f.h b/src/gallium/auxiliary/util/u_format_r11g11b10f.h index 6bb4302965a..bd64b2896b4 100644 --- a/src/gallium/auxiliary/util/u_format_r11g11b10f.h +++ b/src/gallium/auxiliary/util/u_format_r11g11b10f.h @@ -119,12 +119,12 @@ static INLINE float uf11_to_f32(uint16_t val) float scale, decimal; exponent -= 15; if (exponent < 0) { - scale = 1.0 / (1 << -exponent); + scale = 1.0f / (1 << -exponent); } else { - scale = 1 << exponent; + scale = (float) (1 << exponent); } - decimal = 1.0 + (float) mantissa / 64; + decimal = 1.0f + (float) mantissa / 64; f32.f = scale * decimal; } @@ -208,9 +208,9 @@ static INLINE float uf10_to_f32(uint16_t val) scale = 1.0 / (1 << -exponent); } else { - scale = 1 << exponent; + scale = (float) (1 << exponent); } - decimal = 1.0 + (float) mantissa / 32; + decimal = 1.0f + (float) mantissa / 32; f32.f = scale * decimal; } -- 2.30.2