diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-10-05 15:49:34 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-10-19 08:45:14 -0700 |
| commit | e00314bc57a59b3f816daba6249e7b7157761f86 (patch) | |
| tree | 0a05259013868fd4ea28566ff45e84c94838eca3 /src/mesa/drivers/dri/i965/intel_asm_annotation.c | |
| parent | b23a4859f4dbbcca7d6a637010167d470211e45b (diff) | |
| download | external_mesa3d-e00314bc57a59b3f816daba6249e7b7157761f86.zip external_mesa3d-e00314bc57a59b3f816daba6249e7b7157761f86.tar.gz external_mesa3d-e00314bc57a59b3f816daba6249e7b7157761f86.tar.bz2 | |
i965/asm: Explicitly use a nir_instr for IR annotations
Now that everything goes through NIR, we don't need this to be a void
pointer anymore.
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.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 | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_asm_annotation.c b/src/mesa/drivers/dri/i965/intel_asm_annotation.c index bb8bb8d..b3d6324 100644 --- a/src/mesa/drivers/dri/i965/intel_asm_annotation.c +++ b/src/mesa/drivers/dri/i965/intel_asm_annotation.c @@ -33,8 +33,7 @@ void dump_assembly(void *assembly, int num_annotations, struct annotation *annotation, - const struct brw_device_info *devinfo, - const struct gl_program *prog) + const struct brw_device_info *devinfo) { const char *last_annotation_string = NULL; const void *last_annotation_ir = NULL; @@ -57,19 +56,7 @@ dump_assembly(void *assembly, int num_annotations, struct annotation *annotation last_annotation_ir = annotation[i].ir; if (last_annotation_ir) { fprintf(stderr, " "); - if (prog->nir) - nir_print_instr(annotation[i].ir, stderr); - else if (!prog->Instructions) - fprint_ir(stderr, annotation[i].ir); - else { - const struct prog_instruction *pi = - (const struct prog_instruction *)annotation[i].ir; - fprintf(stderr, "%d: ", - (int)(pi - prog->Instructions)); - _mesa_fprint_instruction_opt(stderr, - pi, - 0, PROG_PRINT_DEBUG, NULL); - } + nir_print_instr(annotation[i].ir, stderr); fprintf(stderr, "\n"); } } |