Mesa (master): i965: Add devinfo->gen assertions for acc_wr_control.

Matt Turner mattst88 at kemper.freedesktop.org
Wed Oct 21 17:17:54 UTC 2015


Module: Mesa
Branch: master
Commit: 3ec9d96d435d5f57b35d4a8c75149fd75eaba187
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3ec9d96d435d5f57b35d4a8c75149fd75eaba187

Author: Matt Turner <mattst88 at gmail.com>
Date:   Mon Oct 19 14:47:17 2015 -0700

i965: Add devinfo->gen assertions for acc_wr_control.

... and for flag_subreg_nr since it's right near by.

Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>

---

 src/mesa/drivers/dri/i965/brw_inst.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_inst.h b/src/mesa/drivers/dri/i965/brw_inst.h
index 088143c..cb3d7e6 100644
--- a/src/mesa/drivers/dri/i965/brw_inst.h
+++ b/src/mesa/drivers/dri/i965/brw_inst.h
@@ -181,7 +181,7 @@ F(saturate,             31,  31)
 F(debug_control,        30,  30)
 F(cmpt_control,         29,  29)
 FC(branch_control,      28,  28, devinfo->gen >= 8)
-F(acc_wr_control,       28,  28)
+FC(acc_wr_control,      28,  28, devinfo->gen >= 6)
 F(cond_modifier,        27,  24)
 FC(math_function,       27,  24, devinfo->gen >= 6)
 F(exec_size,            23,  21)
@@ -789,9 +789,9 @@ F(dst_reg_nr,       47, 40)
 F(src1_index,       39, 35)
 F(src0_index,       34, 30)
 F(cmpt_control,     29, 29) /* Same location as brw_inst */
-F(flag_subreg_nr,   28, 28) /* <= Gen6 only */
+FC(flag_subreg_nr,  28, 28, devinfo->gen <= 6)
 F(cond_modifier,    27, 24) /* Same location as brw_inst */
-F(acc_wr_control,   23, 23)
+FC(acc_wr_control,  23, 23, devinfo->gen >= 6)
 F(subreg_index,     22, 18)
 F(datatype_index,   17, 13)
 F(control_index,    12,  8)




More information about the mesa-commit mailing list