diff options
| author | Francisco Jerez <[email protected]> | 2016-04-28 00:19:12 -0700 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2016-05-03 18:06:21 -0700 |
| commit | c55dc77ab13420a9fe0177ccd21a6b0a950d9113 (patch) | |
| tree | 0f139b6a086d70db54989872c89c552058fa031e | |
| parent | 7d9143ad885752184156b3a0d3e492aef09af3b0 (diff) | |
i965: Pass devinfo pointer to brw_instruction_name().
A future series will implement support for an instruction that happens
to have the same opcode number as another instruction we support
already on a disjoint set of hardware generations. In order to
disambiguate which instruction it is brw_instruction_name() will need
some way to find out which device we are generating code for.
Reviewed-by: Iago Toral Quiroga <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_shader.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_shader.h | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4.cpp | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 4b6aa678d54..392404033b2 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -4809,7 +4809,7 @@ fs_visitor::dump_instruction(backend_instruction *be_inst, FILE *file) inst->flag_subreg); } - fprintf(file, "%s", brw_instruction_name(inst->opcode)); + fprintf(file, "%s", brw_instruction_name(devinfo, inst->opcode)); if (inst->saturate) fprintf(file, ".sat"); if (inst->conditional_mod) { diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp index 80fddfc1bd4..a2281a79a18 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.cpp +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp @@ -163,7 +163,7 @@ brw_texture_offset(int *offsets, unsigned num_components) } const char * -brw_instruction_name(enum opcode op) +brw_instruction_name(const struct brw_device_info *devinfo, enum opcode op) { switch (op) { case BRW_OPCODE_ILLEGAL ... BRW_OPCODE_NOP: diff --git a/src/mesa/drivers/dri/i965/brw_shader.h b/src/mesa/drivers/dri/i965/brw_shader.h index fc228f66d81..8ab8d5bf970 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.h +++ b/src/mesa/drivers/dri/i965/brw_shader.h @@ -235,7 +235,8 @@ struct backend_shader; enum brw_reg_type brw_type_for_base_type(const struct glsl_type *type); enum brw_conditional_mod brw_conditional_for_comparison(unsigned int op); uint32_t brw_math_function(enum opcode op); -const char *brw_instruction_name(enum opcode op); +const char *brw_instruction_name(const struct brw_device_info *devinfo, + enum opcode op); bool brw_saturate_immediate(enum brw_reg_type type, struct brw_reg *reg); bool brw_negate_immediate(enum brw_reg_type type, struct brw_reg *reg); bool brw_abs_immediate(enum brw_reg_type type, struct brw_reg *reg); diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp index a2b35603b0e..599e45e434a 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp @@ -1393,7 +1393,7 @@ vec4_visitor::dump_instruction(backend_instruction *be_inst, FILE *file) pred_ctrl_align16[inst->predicate]); } - fprintf(file, "%s", brw_instruction_name(inst->opcode)); + fprintf(file, "%s", brw_instruction_name(devinfo, inst->opcode)); if (inst->saturate) fprintf(file, ".sat"); if (inst->conditional_mod) { |