diff options
| author | Kenneth Graunke <[email protected]> | 2014-03-11 00:04:35 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2014-03-14 13:17:57 -0700 |
| commit | 01d9023a9b9a50b42f7a4ef4799d0e35e0b045ca (patch) | |
| tree | 5dd0fc7278453b775bd0bb69764080e923aba878 /src | |
| parent | 4d2e79269a97c403a6384e0f5164b9f54b6a5f61 (diff) | |
i965: Fix register types in dump_instructions(), again.
In commit e57d77280efcbfd6579a88f071426653287ef833, I fixed this for
destinations in the Vec4 backend, and sources in the scalar backend.
But not both types in both backends.
To prevent this mess from continuing, make the reg_encoding table
static, so only the disassembler can use it.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.h | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_disasm.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4.cpp | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index ae66249d94c..bc79a00b593 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -1843,7 +1843,6 @@ struct opcode_desc { extern const struct opcode_desc opcode_descs[128]; extern const char * const conditional_modifier[16]; -extern const char * const reg_encoding[8]; void brw_emit_depthbuffer(struct brw_context *brw); diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c b/src/mesa/drivers/dri/i965/brw_disasm.c index d79e7503a69..8cd8a40792e 100644 --- a/src/mesa/drivers/dri/i965/brw_disasm.c +++ b/src/mesa/drivers/dri/i965/brw_disasm.c @@ -244,7 +244,7 @@ static const char * const access_mode[2] = { [1] = "align16", }; -const char * const reg_encoding[8] = { +static const char * const reg_encoding[8] = { [0] = "UD", [1] = "D", [2] = "UW", diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 27cf0f6f2f1..9081aafb30f 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -3068,7 +3068,7 @@ fs_visitor::dump_instruction(backend_instruction *be_inst) fprintf(stderr, "???"); break; } - fprintf(stderr, ":%s, ", reg_encoding[inst->dst.type]); + fprintf(stderr, ":%s, ", brw_reg_type_letters(inst->dst.type)); for (int i = 0; i < 3 && inst->src[i].file != BAD_FILE; i++) { if (inst->src[i].negate) diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp index 87825f13497..0245f40330c 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp @@ -1269,7 +1269,7 @@ vec4_visitor::dump_instruction(backend_instruction *be_inst) fprintf(stderr, "|"); if (inst->src[i].file != IMM) { - fprintf(stderr, ":%s", reg_encoding[inst->src[i].type]); + fprintf(stderr, ":%s", brw_reg_type_letters(inst->src[i].type)); } if (i < 2 && inst->src[i + 1].file != BAD_FILE) |