From 156c73a899efd9618cc791447e0b16ac8735c57e Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sat, 28 Jun 2014 18:24:05 -0700 Subject: [PATCH] i965/disasm: Properly disassemble all32h/any32h align1 predicates. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit While we're adding things, use symbolic constants rather than magic numbers. Signed-off-by: Kenneth Graunke Reviewed-by: Matt Turner Reviewed-by: Kristian Høgsberg --- src/mesa/drivers/dri/i965/brw_disasm.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c b/src/mesa/drivers/dri/i965/brw_disasm.c index e40938ab9e8..26b60b6e794 100644 --- a/src/mesa/drivers/dri/i965/brw_disasm.c +++ b/src/mesa/drivers/dri/i965/brw_disasm.c @@ -231,17 +231,19 @@ static const char *const pred_ctrl_align16[16] = { }; static const char *const pred_ctrl_align1[16] = { - [1] = "", - [2] = ".anyv", - [3] = ".allv", - [4] = ".any2h", - [5] = ".all2h", - [6] = ".any4h", - [7] = ".all4h", - [8] = ".any8h", - [9] = ".all8h", - [10] = ".any16h", - [11] = ".all16h", + [BRW_PREDICATE_NORMAL] = "", + [BRW_PREDICATE_ALIGN1_ANYV] = ".anyv", + [BRW_PREDICATE_ALIGN1_ALLV] = ".allv", + [BRW_PREDICATE_ALIGN1_ANY2H] = ".any2h", + [BRW_PREDICATE_ALIGN1_ALL2H] = ".all2h", + [BRW_PREDICATE_ALIGN1_ANY4H] = ".any4h", + [BRW_PREDICATE_ALIGN1_ALL4H] = ".all4h", + [BRW_PREDICATE_ALIGN1_ANY8H] = ".any8h", + [BRW_PREDICATE_ALIGN1_ALL8H] = ".all8h", + [BRW_PREDICATE_ALIGN1_ANY16H] = ".any16h", + [BRW_PREDICATE_ALIGN1_ANY16H] = ".all16h", + [BRW_PREDICATE_ALIGN1_ANY32H] = ".any32h", + [BRW_PREDICATE_ALIGN1_ANY32H] = ".all32h", }; static const char *const thread_ctrl[4] = { -- 2.30.2