summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2017-02-28 18:12:35 -0800
committerJason Ekstrand <[email protected]>2017-03-01 16:14:02 -0800
commit252324166048914119b5d8cfbd1fead907bbc1ed (patch)
treecd6d565c78629ae8367e1bbd0d4d7209132c1f6d
parentffeb73811245243fca45b241ae1b0d4b63153130 (diff)
i965/inst: Stop using fi_type
It's a mesa define that's trivial to inline. This removes a dependence on main/imports.h. Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/brw_inst.h10
1 files 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 bcb6786bbad..d6a2105710d 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);