summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-04-01 15:11:05 +0100
committerJosé Fonseca <jfonseca@vmware.com>2010-04-01 15:11:05 +0100
commit982d36667dcb53236cfd9668b56f7e91d49e9f0a (patch)
tree13e3d6c9db0ee9a29a0e6ab98ec47966fb4f8be0
parent08eb07bc83c9ba81ad5b497b8991d1069e17f4d7 (diff)
util: Use u_math.h's union fi instead of redefining it.
-rw-r--r--src/gallium/auxiliary/util/u_half.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/util/u_half.h b/src/gallium/auxiliary/util/u_half.h
index 464d43df8a0..54e7c7458ec 100644
--- a/src/gallium/auxiliary/util/u_half.h
+++ b/src/gallium/auxiliary/util/u_half.h
@@ -2,6 +2,7 @@
#define U_HALF_H
#include "pipe/p_compiler.h"
+#include "u_math.h"
extern uint32_t util_half_to_float_mantissa_table[2048];
extern uint32_t util_half_to_float_exponent_table[64];
@@ -31,8 +32,8 @@ util_half_to_floatui(half h)
static INLINE float
util_half_to_float(half h)
{
- union {float f; uint32_t v;} r;
- r.v = util_half_to_floatui(h);
+ union fi r;
+ r.ui = util_half_to_floatui(h);
return r.f;
}
@@ -47,9 +48,9 @@ util_floatui_to_half(uint32_t v)
static INLINE half
util_float_to_half(float f)
{
- union {float f; uint32_t v;} i;
+ union fi i;
i.f = f;
- return util_floatui_to_half(i.v);
+ return util_floatui_to_half(i.ui);
}
#endif /* U_HALF_H */