mesa: add/update comments in _mesa_copy_buffer_subdata()

[mesa.git] / src / mesa / drivers / dri / i965 / brw_disasm.c

diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c b/src/mesa/drivers/dri/i965/brw_disasm.c
index a010cd727b79b8b0e159276961395625c5d8c045..cfea1a30ecc94ce34803c9d30aeeb90bfc4a0660 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_disasm.c
+++ b/src/mesa/drivers/dri/i965/brw_disasm.c
@@ -74,7 +74,7 @@ struct {
     [BRW_OPCODE_SEND] = { .name = "send", .nsrc = 1, .ndst = 1 },
     [BRW_OPCODE_SENDC] = { .name = "sendc", .nsrc = 1, .ndst = 1 },
     [BRW_OPCODE_NOP] = { .name = "nop", .nsrc = 0, .ndst = 0 },
-    [BRW_OPCODE_JMPI] = { .name = "jmpi", .nsrc = 1, .ndst = 0 },
+    [BRW_OPCODE_JMPI] = { .name = "jmpi", .nsrc = 0, .ndst = 0 },
     [BRW_OPCODE_IF] = { .name = "if", .nsrc = 2, .ndst = 0 },
     [BRW_OPCODE_IFF] = { .name = "iff", .nsrc = 2, .ndst = 1 },
     [BRW_OPCODE_WHILE] = { .name = "while", .nsrc = 2, .ndst = 0 },
@@ -932,6 +932,8 @@ int brw_disasm (FILE *file, struct brw_instruction *inst, int gen)
                            inst->header.opcode == BRW_OPCODE_ENDIF ||
                            inst->header.opcode == BRW_OPCODE_WHILE)) {
        format (file, " %d", inst->bits1.branch_gen6.jump_count);
+    } else if (inst->header.opcode == BRW_OPCODE_JMPI) {
+       format (file, " %d", inst->bits3.d);
     }
 
     if (opcode[inst->header.opcode].nsrc > 0) {
@@ -1036,7 +1038,7 @@ int brw_disasm (FILE *file, struct brw_instruction *inst, int gen)
            } else {
                format (file, " (%d, %d, %d, %d)",
                        inst->bits3.dp_write.binding_table_index,
-                       (inst->bits3.dp_write.pixel_scoreboard_clear << 3) |
+                       (inst->bits3.dp_write.last_render_target << 3) |
                        inst->bits3.dp_write.msg_control,
                        inst->bits3.dp_write.msg_type,
                        inst->bits3.dp_write.send_commit_msg);
@@ -1066,6 +1068,14 @@ int brw_disasm (FILE *file, struct brw_instruction *inst, int gen)
            break;
        case BRW_SFID_THREAD_SPAWNER:
            break;
+       case GEN7_SFID_DATAPORT_DATA_CACHE:
+           format (file, " (%d, %d, %d)",
+                   inst->bits3.gen7_dp.binding_table_index,
+                   inst->bits3.gen7_dp.msg_control,
+                   inst->bits3.gen7_dp.msg_type);
+           break;
+
+
        default:
            format (file, "unsupported target %d", target);
            break;