From 4a8a6ce154b4284da0160e8d88e330e1a26bea78 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Sat, 20 Sep 2014 00:30:52 +0800 Subject: [PATCH] ilo: rename ilo_gpe_gen*.[ch] Rename them to ilo_state_gen*.[ch]. --- src/gallium/drivers/ilo/Makefile.sources | 6 +++--- src/gallium/drivers/ilo/ilo_blitter_rectlist.c | 2 +- src/gallium/drivers/ilo/{ilo_gpe_gen6.h => ilo_state_gen.h} | 6 +++--- .../drivers/ilo/{ilo_gpe_gen6.c => ilo_state_gen6.c} | 2 +- .../drivers/ilo/{ilo_gpe_gen7.c => ilo_state_gen7.c} | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) rename src/gallium/drivers/ilo/{ilo_gpe_gen6.h => ilo_state_gen.h} (97%) rename src/gallium/drivers/ilo/{ilo_gpe_gen6.c => ilo_state_gen6.c} (99%) rename src/gallium/drivers/ilo/{ilo_gpe_gen7.c => ilo_state_gen7.c} (99%) diff --git a/src/gallium/drivers/ilo/Makefile.sources b/src/gallium/drivers/ilo/Makefile.sources index 0a631e809af..de3bb67cd72 100644 --- a/src/gallium/drivers/ilo/Makefile.sources +++ b/src/gallium/drivers/ilo/Makefile.sources @@ -31,9 +31,6 @@ C_SOURCES := \ ilo_cp.h \ ilo_format.c \ ilo_format.h \ - ilo_gpe_gen6.c \ - ilo_gpe_gen6.h \ - ilo_gpe_gen7.c \ ilo_gpe.h \ ilo_gpgpu.c \ ilo_gpgpu.h \ @@ -50,6 +47,9 @@ C_SOURCES := \ ilo_shader.h \ ilo_state.c \ ilo_state.h \ + ilo_state_gen.h \ + ilo_state_gen6.c \ + ilo_state_gen7.c \ ilo_transfer.c \ ilo_transfer.h \ ilo_video.c \ diff --git a/src/gallium/drivers/ilo/ilo_blitter_rectlist.c b/src/gallium/drivers/ilo/ilo_blitter_rectlist.c index c77eac36bc6..a243507e844 100644 --- a/src/gallium/drivers/ilo/ilo_blitter_rectlist.c +++ b/src/gallium/drivers/ilo/ilo_blitter_rectlist.c @@ -31,7 +31,7 @@ #include "ilo_3d.h" #include "ilo_3d_pipeline.h" #include "ilo_builder_3d_top.h" /* for ve_init_cso_with_components() */ -#include "ilo_gpe_gen6.h" /* for zs_align_surface() */ +#include "ilo_state_gen.h" /* for zs_align_surface() */ #include "ilo_blit.h" #include "ilo_gpe.h" #include "ilo_blitter.h" diff --git a/src/gallium/drivers/ilo/ilo_gpe_gen6.h b/src/gallium/drivers/ilo/ilo_state_gen.h similarity index 97% rename from src/gallium/drivers/ilo/ilo_gpe_gen6.h rename to src/gallium/drivers/ilo/ilo_state_gen.h index f417710237a..33b762835f1 100644 --- a/src/gallium/drivers/ilo/ilo_gpe_gen6.h +++ b/src/gallium/drivers/ilo/ilo_state_gen.h @@ -25,8 +25,8 @@ * Chia-I Wu */ -#ifndef ILO_GPE_GEN6_H -#define ILO_GPE_GEN6_H +#ifndef ILO_STATE_GEN_H +#define ILO_STATE_GEN_H #include "genhw/genhw.h" #include "intel_winsys.h" @@ -115,4 +115,4 @@ zs_align_surface(const struct ilo_dev_info *dev, zs->payload[2] = dw3; } -#endif /* ILO_GPE_GEN6_H */ +#endif /* ILO_STATE_GEN_H */ diff --git a/src/gallium/drivers/ilo/ilo_gpe_gen6.c b/src/gallium/drivers/ilo/ilo_state_gen6.c similarity index 99% rename from src/gallium/drivers/ilo/ilo_gpe_gen6.c rename to src/gallium/drivers/ilo/ilo_state_gen6.c index 451471987fb..0fb226dc1c4 100644 --- a/src/gallium/drivers/ilo/ilo_gpe_gen6.c +++ b/src/gallium/drivers/ilo/ilo_state_gen6.c @@ -35,7 +35,7 @@ #include "ilo_resource.h" #include "ilo_shader.h" #include "ilo_state.h" -#include "ilo_gpe_gen6.h" +#include "ilo_state_gen.h" /** * Translate a pipe logicop to the matching hardware logicop. diff --git a/src/gallium/drivers/ilo/ilo_gpe_gen7.c b/src/gallium/drivers/ilo/ilo_state_gen7.c similarity index 99% rename from src/gallium/drivers/ilo/ilo_gpe_gen7.c rename to src/gallium/drivers/ilo/ilo_state_gen7.c index 21b4bfd6101..3814de02e9c 100644 --- a/src/gallium/drivers/ilo/ilo_gpe_gen7.c +++ b/src/gallium/drivers/ilo/ilo_state_gen7.c @@ -31,7 +31,7 @@ #include "ilo_format.h" #include "ilo_resource.h" #include "ilo_shader.h" -#include "ilo_gpe_gen6.h" +#include "ilo_state_gen.h" #include "ilo_gpe.h" void -- 2.30.2