diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-04-15 15:01:25 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-04-22 16:00:33 -0700 |
| commit | 9c89e47806ee0437a2617eb4b90a0b953869fea2 (patch) | |
| tree | 1741cbacf3bd5d432b564545df0e9b5bc708efb7 /src/mesa/drivers/dri/i965/intel_asm_annotation.c | |
| parent | 5cb91db619e8689c8fd45a67b57b96fc36f4ca9b (diff) | |
| download | external_mesa3d-9c89e47806ee0437a2617eb4b90a0b953869fea2.zip external_mesa3d-9c89e47806ee0437a2617eb4b90a0b953869fea2.tar.gz external_mesa3d-9c89e47806ee0437a2617eb4b90a0b953869fea2.tar.bz2 | |
i965: Make the annotation code take a device_info instead of a context
Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_asm_annotation.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_asm_annotation.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_asm_annotation.c b/src/mesa/drivers/dri/i965/intel_asm_annotation.c index b4a693f..bb8bb8d 100644 --- a/src/mesa/drivers/dri/i965/intel_asm_annotation.c +++ b/src/mesa/drivers/dri/i965/intel_asm_annotation.c @@ -33,7 +33,8 @@ void dump_assembly(void *assembly, int num_annotations, struct annotation *annotation, - struct brw_context *brw, const struct gl_program *prog) + const struct brw_device_info *devinfo, + const struct gl_program *prog) { const char *last_annotation_string = NULL; const void *last_annotation_ir = NULL; @@ -79,7 +80,7 @@ dump_assembly(void *assembly, int num_annotations, struct annotation *annotation fprintf(stderr, " %s\n", last_annotation_string); } - brw_disassemble(brw->intelScreen->devinfo, assembly, start_offset, end_offset, stderr); + brw_disassemble(devinfo, assembly, start_offset, end_offset, stderr); if (annotation[i].block_end) { fprintf(stderr, " END B%d", annotation[i].block_end->num); @@ -94,7 +95,7 @@ dump_assembly(void *assembly, int num_annotations, struct annotation *annotation fprintf(stderr, "\n"); } -void annotate(struct brw_context *brw, +void annotate(const struct brw_device_info *devinfo, struct annotation_info *annotation, const struct cfg_t *cfg, struct backend_instruction *inst, unsigned offset) { @@ -129,7 +130,7 @@ void annotate(struct brw_context *brw, * There's also only complication from emitting an annotation without * a corresponding hardware instruction to disassemble. */ - if (brw->gen >= 6 && inst->opcode == BRW_OPCODE_DO) { + if (devinfo->gen >= 6 && inst->opcode == BRW_OPCODE_DO) { annotation->ann_count--; } |