i965: Refactor SIMD16-to-2xSIMD8 checks.

[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 719ac8e0985bb06fa6e72c3f353ea6b8728b7b40..372aa2b89b28c6d04510ea3a50dc8ac399524b31 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_inst.h
+++ b/src/mesa/drivers/dri/i965/brw_inst.h
@@ -169,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)
@@ -306,8 +306,6 @@ 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);                          \
 }                                                                             \