ilo: rename ilo_3d_pipeline*.[ch] to ilo_render*.[ch]

They are used to build render engine commands, which can be more than 3D.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>

diff --git a/src/gallium/drivers/ilo/Makefile.sources b/src/gallium/drivers/ilo/Makefile.sources
index a6477e7..845b023 100644 (file)
--- a/src/gallium/drivers/ilo/Makefile.sources
+++ b/src/gallium/drivers/ilo/Makefile.sources
@@ -1,10 +1,4 @@
 C_SOURCES := \
-       ilo_3d_pipeline.c \
-       ilo_3d_pipeline_gen6.c \
-       ilo_3d_pipeline_gen6.h \
-       ilo_3d_pipeline_gen7.c \
-       ilo_3d_pipeline_gen7.h \
-       ilo_3d_pipeline.h \
        ilo_blit.c \
        ilo_blit.h \
        ilo_blitter.c \
@@ -40,6 +34,12 @@ C_SOURCES := \
        ilo_query.h \
        ilo_resource.c \
        ilo_resource.h \
+       ilo_render.c \
+       ilo_render.h \
+       ilo_render_gen.h \
+       ilo_render_gen6.c \
+       ilo_render_gen7.c \
+       ilo_render_gen7.h \
        ilo_screen.c \
        ilo_screen.h \
        ilo_shader.c \

diff --git a/src/gallium/drivers/ilo/ilo_draw.c b/src/gallium/drivers/ilo/ilo_draw.c
index a155a41..19ea6a7 100644 (file)
--- a/src/gallium/drivers/ilo/ilo_draw.c
+++ b/src/gallium/drivers/ilo/ilo_draw.c
@@ -28,7 +28,7 @@
 #include "util/u_prim.h"
 #include "intel_winsys.h"
 
-#include "ilo_3d_pipeline.h"
+#include "ilo_render.h"
 #include "ilo_blit.h"
 #include "ilo_context.h"
 #include "ilo_cp.h"

diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline.c b/src/gallium/drivers/ilo/ilo_render.c
similarity index 97%
rename from src/gallium/drivers/ilo/ilo_3d_pipeline.c
rename to src/gallium/drivers/ilo/ilo_render.c
index 74553dc..2893a4f 100644 (file)
--- a/src/gallium/drivers/ilo/ilo_3d_pipeline.c
+++ b/src/gallium/drivers/ilo/ilo_render.c
@@ -28,9 +28,9 @@
 #include "intel_winsys.h"
 
 #include "ilo_builder.h"
-#include "ilo_3d_pipeline_gen6.h"
-#include "ilo_3d_pipeline_gen7.h"
-#include "ilo_3d_pipeline.h"
+#include "ilo_render_gen.h"
+#include "ilo_render_gen7.h"
+#include "ilo_render.h"
 
 /* in U0.4 */
 struct sample_position {

diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline.h b/src/gallium/drivers/ilo/ilo_render.h
similarity index 98%
rename from src/gallium/drivers/ilo/ilo_3d_pipeline.h
rename to src/gallium/drivers/ilo/ilo_render.h
index e85bb8a..eccf727 100644 (file)
--- a/src/gallium/drivers/ilo/ilo_3d_pipeline.h
+++ b/src/gallium/drivers/ilo/ilo_render.h
@@ -25,8 +25,8 @@
  *    Chia-I Wu <olv@lunarg.com>
  */
 
-#ifndef ILO_3D_PIPELINE_H
-#define ILO_3D_PIPELINE_H
+#ifndef ILO_RENDER_H
+#define ILO_RENDER_H
 
 #include "ilo_common.h"
 #include "ilo_state.h"
@@ -214,4 +214,4 @@ ilo_3d_pipeline_get_sample_position(struct ilo_3d_pipeline *p,
                                     unsigned sample_index,
                                     float *x, float *y);
 
-#endif /* ILO_3D_PIPELINE_H */
+#endif /* ILO_RENDER_H */

diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.h b/src/gallium/drivers/ilo/ilo_render_gen.h
similarity index 98%
rename from src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.h
rename to src/gallium/drivers/ilo/ilo_render_gen.h
index 85a8985..a622633 100644 (file)
--- a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.h
+++ b/src/gallium/drivers/ilo/ilo_render_gen.h
@@ -25,8 +25,8 @@
  *    Chia-I Wu <olv@lunarg.com>
  */
 
-#ifndef ILO_3D_PIPELINE_GEN6_H
-#define ILO_3D_PIPELINE_GEN6_H
+#ifndef ILO_RENDER_GEN_H
+#define ILO_RENDER_GEN_H
 
 #include "ilo_common.h"
 
@@ -162,4 +162,4 @@ ilo_3d_pipeline_emit_query_gen6(struct ilo_3d_pipeline *p,
 void
 ilo_3d_pipeline_init_gen6(struct ilo_3d_pipeline *p);
 
-#endif /* ILO_3D_PIPELINE_GEN6_H */
+#endif /* ILO_RENDER_GEN_H */

diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c b/src/gallium/drivers/ilo/ilo_render_gen6.c
similarity index 99%
rename from src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c
rename to src/gallium/drivers/ilo/ilo_render_gen6.c
index e5cd937..e706533 100644 (file)
--- a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c
+++ b/src/gallium/drivers/ilo/ilo_render_gen6.c
@@ -36,8 +36,8 @@
 #include "ilo_query.h"
 #include "ilo_shader.h"
 #include "ilo_state.h"
-#include "ilo_3d_pipeline.h"
-#include "ilo_3d_pipeline_gen6.h"
+#include "ilo_render.h"
+#include "ilo_render_gen.h"
 
 /**
  * A wrapper for gen6_PIPE_CONTROL().

diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.c b/src/gallium/drivers/ilo/ilo_render_gen7.c
similarity index 99%
rename from src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.c
rename to src/gallium/drivers/ilo/ilo_render_gen7.c
index 51f663b..7ecea1e 100644 (file)
--- a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.c
+++ b/src/gallium/drivers/ilo/ilo_render_gen7.c
@@ -33,9 +33,9 @@
 #include "ilo_builder_render.h"
 #include "ilo_shader.h"
 #include "ilo_state.h"
-#include "ilo_3d_pipeline.h"
-#include "ilo_3d_pipeline_gen6.h"
-#include "ilo_3d_pipeline_gen7.h"
+#include "ilo_render.h"
+#include "ilo_render_gen.h"
+#include "ilo_render_gen7.h"
 
 /**
  * A wrapper for gen6_PIPE_CONTROL().

diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.h b/src/gallium/drivers/ilo/ilo_render_gen7.h
similarity index 93%
rename from src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.h
rename to src/gallium/drivers/ilo/ilo_render_gen7.h
index a59f966..cceb48a 100644 (file)
--- a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.h
+++ b/src/gallium/drivers/ilo/ilo_render_gen7.h
@@ -25,8 +25,8 @@
  *    Chia-I Wu <olv@lunarg.com>
  */
 
-#ifndef ILO_3D_PIPELINE_GEN7_H
-#define ILO_3D_PIPELINE_GEN7_H
+#ifndef ILO_RENDER_GEN7_H
+#define ILO_RENDER_GEN7_H
 
 #include "ilo_common.h"
 
@@ -35,4 +35,4 @@ struct ilo_3d_pipeline;
 void
 ilo_3d_pipeline_init_gen7(struct ilo_3d_pipeline *p);
 
-#endif /* ILO_3D_PIPELINE_GEN7_H */
+#endif /* ILO_RENDER_GEN7_H */