[Mesa-dev] [PATCH 14/24] i965/inst: Stop using fi_type

[Jason Ekstrand]

It's a mesa define that's trivial to inline.  This removes a dependence
on main/imports.h.
---
 src/mesa/drivers/dri/i965/brw_inst.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_inst.h b/src/mesa/drivers/dri/i965/brw_inst.h
index bcb6786..d6a2105 100644
--- a/src/mesa/drivers/dri/i965/brw_inst.h
+++ b/src/mesa/drivers/dri/i965/brw_inst.h
@@ -570,7 +570,10 @@ brw_inst_imm_ud(const struct gen_device_info *devinfo, const brw_inst *insn)
 static inline float
 brw_inst_imm_f(const struct gen_device_info *devinfo, const brw_inst *insn)
 {
-   fi_type ft;
+   union {
+      float f;
+      uint32_t u;
+   } ft;
    (void) devinfo;
    ft.u = brw_inst_bits(insn, 127, 96);
    return ft.f;
@@ -608,7 +611,10 @@ static inline void
 brw_inst_set_imm_f(const struct gen_device_info *devinfo,
                    brw_inst *insn, float value)
 {
-   fi_type ft;
+   union {
+      float f;
+      uint32_t u;
+   } ft;
    (void) devinfo;
    ft.f = value;
    brw_inst_set_bits(insn, 127, 96, ft.u);
-- 
2.5.0.400.gff86faf