summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2012-01-07 14:16:27 -0700
committerBrian Paul <[email protected]>2012-01-07 14:16:27 -0700
commit70754dd1fbb1f0184dbaa3d6ac03f2df4c2e0436 (patch)
treeaa8931b738517a925640f9460170b701eff7c271
parentf0f623a9075107461438468e1aea6bca3a3234f3 (diff)
util: silence some MSVC type conversion warnings
-rw-r--r--src/gallium/auxiliary/util/u_format_r11g11b10f.h10
1 files 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;
}