From 423932791d0e4bbae28f3557659f031d3b2ac980 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sun, 29 Jun 2014 18:09:35 -0700 Subject: [PATCH] i965: Rename intel_asm_printer -> intel_asm_annotation. The #ifndef include guards already said the right thing :) Reviewed-by: Topi Pohjolainen --- src/mesa/drivers/dri/i965/Makefile.sources | 2 +- src/mesa/drivers/dri/i965/brw_eu.h | 2 +- src/mesa/drivers/dri/i965/brw_eu_compact.c | 2 +- src/mesa/drivers/dri/i965/brw_fs.h | 2 +- src/mesa/drivers/dri/i965/brw_shader.h | 2 +- src/mesa/drivers/dri/i965/brw_vec4.h | 2 +- .../drivers/dri/i965/{intel_asm_printer.c => intel_asm_annotation.c} | 2 +- .../drivers/dri/i965/{intel_asm_printer.h => intel_asm_annotation.h} | 0 8 files changed, 7 insertions(+), 7 deletions(-) rename src/mesa/drivers/dri/i965/{intel_asm_printer.c => intel_asm_annotation.c} (99%) rename src/mesa/drivers/dri/i965/{intel_asm_printer.h => intel_asm_annotation.h} (100%) diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index 6c513e2..eb5ba60 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -3,7 +3,7 @@ i965_INCLUDES = \ $(MESA_TOP)/src/mesa/drivers/dri/intel i965_FILES = \ - intel_asm_printer.c \ + intel_asm_annotation.c \ intel_batchbuffer.c \ intel_blit.c \ intel_buffer_objects.c \ diff --git a/src/mesa/drivers/dri/i965/brw_eu.h b/src/mesa/drivers/dri/i965/brw_eu.h index 48ef298..3164c80 100644 --- a/src/mesa/drivers/dri/i965/brw_eu.h +++ b/src/mesa/drivers/dri/i965/brw_eu.h @@ -38,7 +38,7 @@ #include "brw_structs.h" #include "brw_defines.h" #include "brw_reg.h" -#include "intel_asm_printer.h" +#include "intel_asm_annotation.h" #include "program/prog_instruction.h" #ifdef __cplusplus diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c b/src/mesa/drivers/dri/i965/brw_eu_compact.c index b9a6500..eec6454 100644 --- a/src/mesa/drivers/dri/i965/brw_eu_compact.c +++ b/src/mesa/drivers/dri/i965/brw_eu_compact.c @@ -39,7 +39,7 @@ #include "brw_context.h" #include "brw_eu.h" -#include "intel_asm_printer.h" +#include "intel_asm_annotation.h" static const uint32_t gen6_control_index_table[32] = { 0b00000000000000000, diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h index fdb0efe..537f10e 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.h +++ b/src/mesa/drivers/dri/i965/brw_fs.h @@ -46,7 +46,7 @@ extern "C" { #include "brw_eu.h" #include "brw_wm.h" #include "brw_shader.h" -#include "intel_asm_printer.h" +#include "intel_asm_annotation.h" } #include "gen8_generator.h" #include "glsl/glsl_types.h" diff --git a/src/mesa/drivers/dri/i965/brw_shader.h b/src/mesa/drivers/dri/i965/brw_shader.h index f866249..a922487 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.h +++ b/src/mesa/drivers/dri/i965/brw_shader.h @@ -26,7 +26,7 @@ #include "brw_defines.h" #include "main/compiler.h" #include "glsl/ir.h" -#include "intel_asm_printer.h" +#include "intel_asm_annotation.h" #pragma once diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h index 247d591..9d76bea 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_vec4.h @@ -36,7 +36,7 @@ extern "C" { #include "brw_context.h" #include "brw_eu.h" -#include "intel_asm_printer.h" +#include "intel_asm_annotation.h" #ifdef __cplusplus }; /* extern "C" */ diff --git a/src/mesa/drivers/dri/i965/intel_asm_printer.c b/src/mesa/drivers/dri/i965/intel_asm_annotation.c similarity index 99% rename from src/mesa/drivers/dri/i965/intel_asm_printer.c rename to src/mesa/drivers/dri/i965/intel_asm_annotation.c index 3c2d256..a7bb2e1 100644 --- a/src/mesa/drivers/dri/i965/intel_asm_printer.c +++ b/src/mesa/drivers/dri/i965/intel_asm_annotation.c @@ -23,7 +23,7 @@ #include "brw_cfg.h" #include "brw_eu.h" -#include "intel_asm_printer.h" +#include "intel_asm_annotation.h" #include "program/prog_print.h" #include "program/prog_instruction.h" diff --git a/src/mesa/drivers/dri/i965/intel_asm_printer.h b/src/mesa/drivers/dri/i965/intel_asm_annotation.h similarity index 100% rename from src/mesa/drivers/dri/i965/intel_asm_printer.h rename to src/mesa/drivers/dri/i965/intel_asm_annotation.h -- 2.7.4