i965: Fix disassembly of sampler messages on Ivybridge.

Compared to sampler_gen5, simd_mode shifted by a bit and msg_type grew
by a bit.  So we were printing slightly incorrect numbers.

NOTE: This is a candidate for stable release branches.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c b/src/mesa/drivers/dri/i965/brw_disasm.c
index cfea1a30ecc94ce34803c9d30aeeb90bfc4a0660..02fa14cb598d23db3e313604d0052f94f34097f6 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_disasm.c
+++ b/src/mesa/drivers/dri/i965/brw_disasm.c
@@ -982,7 +982,13 @@ int brw_disasm (FILE *file, struct brw_instruction *inst, int gen)
                            inst->bits3.math.precision, &space);
            break;
        case BRW_SFID_SAMPLER:
-           if (gen >= 5) {
+           if (gen >= 7) {
+               format (file, " (%d, %d, %d, %d)",
+                       inst->bits3.sampler_gen7.binding_table_index,
+                       inst->bits3.sampler_gen7.sampler,
+                       inst->bits3.sampler_gen7.msg_type,
+                       inst->bits3.sampler_gen7.simd_mode);
+           } else if (gen >= 5) {
                format (file, " (%d, %d, %d, %d)",
                        inst->bits3.sampler_gen5.binding_table_index,
                        inst->bits3.sampler_gen5.sampler,