i965/vec4: Simplify reswizzle() using the swizzle utils.

[mesa.git] / src / mesa / drivers / dri / i965 / brw_inst.h

diff --git a/src/mesa/drivers/dri/i965/brw_inst.h b/src/mesa/drivers/dri/i965/brw_inst.h
index e880c9f497e87ffabbd020ed43f7881dab6926b7..372aa2b89b28c6d04510ea3a50dc8ac399524b31 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_inst.h
+++ b/src/mesa/drivers/dri/i965/brw_inst.h
@@ -56,6 +56,7 @@ brw_inst_set_##name(const struct brw_context *brw,            \
                     brw_inst *inst, uint64_t v)               \
 {                                                             \
    assert(assertions);                                        \
+   (void) brw;                                                \
    brw_inst_set_bits(inst, high, low, v);                     \
 }                                                             \
 static inline uint64_t                                        \
@@ -63,6 +64,7 @@ brw_inst_##name(const struct brw_context *brw,                \
                 brw_inst *inst)                               \
 {                                                             \
    assert(assertions);                                        \
+   (void) brw;                                                \
    return brw_inst_bits(inst, high, low);                     \
 }
 
@@ -167,9 +169,9 @@ FF(flag_reg_nr,
    /* 8: */ 33, 33)
 F8(flag_subreg_nr,     /* 4+ */  89, 89, /* 8+ */ 32, 32)
 F(saturate,             31,  31)
-FC(branch_control,      30,  30, brw->gen >= 8)
 F(debug_control,        30,  30)
 F(cmpt_control,         29,  29)
+FC(branch_control,      28,  28, brw->gen >= 8)
 F(acc_wr_control,       28,  28)
 F(cond_modifier,        27,  24)
 FC(math_function,       27,  24, brw->gen >= 6)
@@ -304,14 +306,14 @@ static inline void                                                            \
 brw_inst_set_##name(const struct brw_context *brw, brw_inst *inst, int16_t v) \
 {                                                                             \
    assert(assertions);                                                        \
-   assert(v <= (1 << 16) - 1);                                                \
-   assert(v > -(1 << 16));                                                    \
+   (void) brw;                                                                \
    brw_inst_set_bits(inst, high, low, (uint16_t) v);                          \
 }                                                                             \
 static inline int16_t                                                         \
 brw_inst_##name(const struct brw_context *brw, brw_inst *inst)                \
 {                                                                             \
    assert(assertions);                                                        \
+   (void) brw;                                                                \
    return brw_inst_bits(inst, high, low);                                     \
 }
 
@@ -544,12 +546,14 @@ F(pi_message_data,   MD(7),   MD(0))
 static inline int
 brw_inst_imm_d(const struct brw_context *brw, brw_inst *insn)
 {
+   (void) brw;
    return brw_inst_bits(insn, 127, 96);
 }
 
 static inline unsigned
 brw_inst_imm_ud(const struct brw_context *brw, brw_inst *insn)
 {
+   (void) brw;
    return brw_inst_bits(insn, 127, 96);
 }
 
@@ -557,6 +561,7 @@ static inline float
 brw_inst_imm_f(const struct brw_context *brw, brw_inst *insn)
 {
    fi_type ft;
+   (void) brw;
    ft.u = brw_inst_bits(insn, 127, 96);
    return ft.f;
 }
@@ -565,6 +570,7 @@ static inline void
 brw_inst_set_imm_d(const struct brw_context *brw,
                    brw_inst *insn, int value)
 {
+   (void) brw;
    return brw_inst_set_bits(insn, 127, 96, value);
 }
 
@@ -572,6 +578,7 @@ static inline void
 brw_inst_set_imm_ud(const struct brw_context *brw,
                     brw_inst *insn, unsigned value)
 {
+   (void) brw;
    return brw_inst_set_bits(insn, 127, 96, value);
 }
 
@@ -580,6 +587,7 @@ brw_inst_set_imm_f(const struct brw_context *brw,
                    brw_inst *insn, float value)
 {
    fi_type ft;
+   (void) brw;
    ft.f = value;
    brw_inst_set_bits(insn, 127, 96, ft.u);
 }