From 392890d5de3970f5bee03a3ebce576e63e0a0bbf Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Wed, 24 Sep 2014 13:06:45 +0800 Subject: [PATCH] ilo: rename ilo_3d.[ch] to ilo_draw.[ch] There is not much left in struct ilo_3d. We want to kill it and ilo_3d.[ch] will be bad names. Signed-off-by: Chia-I Wu --- src/gallium/drivers/ilo/Makefile.sources | 4 ++-- src/gallium/drivers/ilo/ilo_blitter_rectlist.c | 2 +- src/gallium/drivers/ilo/ilo_context.c | 2 +- src/gallium/drivers/ilo/{ilo_3d.c => ilo_draw.c} | 2 +- src/gallium/drivers/ilo/{ilo_3d.h => ilo_draw.h} | 6 +++--- src/gallium/drivers/ilo/ilo_query.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename src/gallium/drivers/ilo/{ilo_3d.c => ilo_draw.c} (99%) rename src/gallium/drivers/ilo/{ilo_3d.h => ilo_draw.h} (97%) diff --git a/src/gallium/drivers/ilo/Makefile.sources b/src/gallium/drivers/ilo/Makefile.sources index 0cc56688b7a..a6477e76b39 100644 --- a/src/gallium/drivers/ilo/Makefile.sources +++ b/src/gallium/drivers/ilo/Makefile.sources @@ -1,6 +1,4 @@ C_SOURCES := \ - ilo_3d.c \ - ilo_3d.h \ ilo_3d_pipeline.c \ ilo_3d_pipeline_gen6.c \ ilo_3d_pipeline_gen6.h \ @@ -29,6 +27,8 @@ C_SOURCES := \ ilo_context.h \ ilo_cp.c \ ilo_cp.h \ + ilo_draw.c \ + ilo_draw.h \ ilo_format.c \ ilo_format.h \ ilo_gpgpu.c \ diff --git a/src/gallium/drivers/ilo/ilo_blitter_rectlist.c b/src/gallium/drivers/ilo/ilo_blitter_rectlist.c index 989b2f377ce..3b988682058 100644 --- a/src/gallium/drivers/ilo/ilo_blitter_rectlist.c +++ b/src/gallium/drivers/ilo/ilo_blitter_rectlist.c @@ -28,8 +28,8 @@ #include "util/u_draw.h" #include "util/u_pack_color.h" -#include "ilo_3d.h" #include "ilo_builder_3d_top.h" /* for ve_init_cso_with_components() */ +#include "ilo_draw.h" #include "ilo_state.h" #include "ilo_state_gen.h" /* for zs_align_surface() */ #include "ilo_blit.h" diff --git a/src/gallium/drivers/ilo/ilo_context.c b/src/gallium/drivers/ilo/ilo_context.c index a4a4dc2986b..7b6b27e74d0 100644 --- a/src/gallium/drivers/ilo/ilo_context.c +++ b/src/gallium/drivers/ilo/ilo_context.c @@ -27,10 +27,10 @@ #include "util/u_upload_mgr.h" -#include "ilo_3d.h" #include "ilo_blit.h" #include "ilo_blitter.h" #include "ilo_cp.h" +#include "ilo_draw.h" #include "ilo_gpgpu.h" #include "ilo_query.h" #include "ilo_resource.h" diff --git a/src/gallium/drivers/ilo/ilo_3d.c b/src/gallium/drivers/ilo/ilo_draw.c similarity index 99% rename from src/gallium/drivers/ilo/ilo_3d.c rename to src/gallium/drivers/ilo/ilo_draw.c index e708cbc7743..a155a41ac1b 100644 --- a/src/gallium/drivers/ilo/ilo_3d.c +++ b/src/gallium/drivers/ilo/ilo_draw.c @@ -35,7 +35,7 @@ #include "ilo_query.h" #include "ilo_shader.h" #include "ilo_state.h" -#include "ilo_3d.h" +#include "ilo_draw.h" static void ilo_3d_own_render_ring(struct ilo_3d *hw3d) diff --git a/src/gallium/drivers/ilo/ilo_3d.h b/src/gallium/drivers/ilo/ilo_draw.h similarity index 97% rename from src/gallium/drivers/ilo/ilo_3d.h rename to src/gallium/drivers/ilo/ilo_draw.h index 56502383074..2f68c5ea091 100644 --- a/src/gallium/drivers/ilo/ilo_3d.h +++ b/src/gallium/drivers/ilo/ilo_draw.h @@ -25,8 +25,8 @@ * Chia-I Wu */ -#ifndef ILO_3D_H -#define ILO_3D_H +#ifndef ILO_DRAW_H +#define ILO_DRAW_H #include "ilo_common.h" #include "ilo_cp.h" @@ -77,4 +77,4 @@ ilo_3d_process_query(struct pipe_context *pipe, struct ilo_query *q); void ilo_init_3d_functions(struct ilo_context *ilo); -#endif /* ILO_3D_H */ +#endif /* ILO_DRAW_H */ diff --git a/src/gallium/drivers/ilo/ilo_query.c b/src/gallium/drivers/ilo/ilo_query.c index e0cd4ee7554..8ab333e43c6 100644 --- a/src/gallium/drivers/ilo/ilo_query.c +++ b/src/gallium/drivers/ilo/ilo_query.c @@ -27,9 +27,9 @@ #include "intel_winsys.h" -#include "ilo_3d.h" #include "ilo_context.h" #include "ilo_cp.h" +#include "ilo_draw.h" #include "ilo_query.h" static const struct { -- 2.30.2