From 9b72bf5bd22c14c4cc17b6945d4b74f4c0eae80a Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Fri, 1 May 2015 15:33:56 +0800 Subject: [PATCH] ilo: move command builder to core --- src/gallium/drivers/ilo/Makefile.sources | 20 +++++++++---------- .../drivers/ilo/{ => core}/ilo_builder.c | 0 .../drivers/ilo/{ => core}/ilo_builder.h | 7 +++++-- .../drivers/ilo/{ => core}/ilo_builder_3d.h | 3 ++- .../ilo/{ => core}/ilo_builder_3d_bottom.h | 9 +++++---- .../ilo/{ => core}/ilo_builder_3d_top.h | 12 +++++------ .../drivers/ilo/{ => core}/ilo_builder_blt.h | 5 +++-- .../ilo/{ => core}/ilo_builder_decode.c | 5 +++-- .../ilo/{ => core}/ilo_builder_media.h | 7 ++++--- .../drivers/ilo/{ => core}/ilo_builder_mi.h | 5 +++-- .../ilo/{ => core}/ilo_builder_render.h | 5 +++-- src/gallium/drivers/ilo/ilo_blitter_blt.c | 4 ++-- src/gallium/drivers/ilo/ilo_cp.c | 2 +- src/gallium/drivers/ilo/ilo_cp.h | 2 +- src/gallium/drivers/ilo/ilo_render.c | 8 ++++---- src/gallium/drivers/ilo/ilo_render_dynamic.c | 5 +++-- src/gallium/drivers/ilo/ilo_render_gen.h | 7 ++++--- src/gallium/drivers/ilo/ilo_render_gen6.c | 6 +++--- src/gallium/drivers/ilo/ilo_render_gen7.c | 4 ++-- src/gallium/drivers/ilo/ilo_render_gen8.c | 4 ++-- src/gallium/drivers/ilo/ilo_render_media.c | 6 +++--- src/gallium/drivers/ilo/ilo_render_surface.c | 3 ++- src/gallium/drivers/ilo/ilo_shader.c | 6 +++--- 23 files changed, 74 insertions(+), 61 deletions(-) rename src/gallium/drivers/ilo/{ => core}/ilo_builder.c (100%) rename src/gallium/drivers/ilo/{ => core}/ilo_builder.h (99%) rename src/gallium/drivers/ilo/{ => core}/ilo_builder_3d.h (98%) rename src/gallium/drivers/ilo/{ => core}/ilo_builder_3d_bottom.h (99%) rename src/gallium/drivers/ilo/{ => core}/ilo_builder_3d_top.h (99%) rename src/gallium/drivers/ilo/{ => core}/ilo_builder_blt.h (99%) rename src/gallium/drivers/ilo/{ => core}/ilo_builder_decode.c (99%) rename src/gallium/drivers/ilo/{ => core}/ilo_builder_media.h (98%) rename src/gallium/drivers/ilo/{ => core}/ilo_builder_mi.h (98%) rename src/gallium/drivers/ilo/{ => core}/ilo_builder_render.h (99%) diff --git a/src/gallium/drivers/ilo/Makefile.sources b/src/gallium/drivers/ilo/Makefile.sources index 1743f7c7659..91a6f65f2e9 100644 --- a/src/gallium/drivers/ilo/Makefile.sources +++ b/src/gallium/drivers/ilo/Makefile.sources @@ -1,5 +1,15 @@ C_SOURCES := \ core/ilo_buffer.h \ + core/ilo_builder.c \ + core/ilo_builder.h \ + core/ilo_builder_3d.h \ + core/ilo_builder_3d_bottom.h \ + core/ilo_builder_3d_top.h \ + core/ilo_builder_blt.h \ + core/ilo_builder_decode.c \ + core/ilo_builder_media.h \ + core/ilo_builder_mi.h \ + core/ilo_builder_render.h \ core/ilo_core.h \ core/ilo_debug.c \ core/ilo_debug.h \ @@ -21,16 +31,6 @@ C_SOURCES := \ ilo_blitter_blt.c \ ilo_blitter_pipe.c \ ilo_blitter_rectlist.c \ - ilo_builder.c \ - ilo_builder.h \ - ilo_builder_3d.h \ - ilo_builder_3d_bottom.h \ - ilo_builder_3d_top.h \ - ilo_builder_blt.h \ - ilo_builder_decode.c \ - ilo_builder_media.h \ - ilo_builder_mi.h \ - ilo_builder_render.h \ ilo_common.h \ ilo_context.c \ ilo_context.h \ diff --git a/src/gallium/drivers/ilo/ilo_builder.c b/src/gallium/drivers/ilo/core/ilo_builder.c similarity index 100% rename from src/gallium/drivers/ilo/ilo_builder.c rename to src/gallium/drivers/ilo/core/ilo_builder.c diff --git a/src/gallium/drivers/ilo/ilo_builder.h b/src/gallium/drivers/ilo/core/ilo_builder.h similarity index 99% rename from src/gallium/drivers/ilo/ilo_builder.h rename to src/gallium/drivers/ilo/core/ilo_builder.h index 3045f5f0604..6e26f22aff1 100644 --- a/src/gallium/drivers/ilo/ilo_builder.h +++ b/src/gallium/drivers/ilo/core/ilo_builder.h @@ -28,8 +28,11 @@ #ifndef ILO_BUILDER_H #define ILO_BUILDER_H -#include "core/intel_winsys.h" -#include "ilo_common.h" +#include "intel_winsys.h" + +#include "ilo_core.h" +#include "ilo_debug.h" +#include "ilo_dev.h" enum ilo_builder_writer_type { ILO_BUILDER_WRITER_BATCH, diff --git a/src/gallium/drivers/ilo/ilo_builder_3d.h b/src/gallium/drivers/ilo/core/ilo_builder_3d.h similarity index 98% rename from src/gallium/drivers/ilo/ilo_builder_3d.h rename to src/gallium/drivers/ilo/core/ilo_builder_3d.h index 9f80398204a..6cf1732ee1c 100644 --- a/src/gallium/drivers/ilo/ilo_builder_3d.h +++ b/src/gallium/drivers/ilo/core/ilo_builder_3d.h @@ -30,7 +30,8 @@ #include "genhw/genhw.h" -#include "ilo_common.h" +#include "ilo_core.h" +#include "ilo_dev.h" #include "ilo_builder_3d_top.h" #include "ilo_builder_3d_bottom.h" diff --git a/src/gallium/drivers/ilo/ilo_builder_3d_bottom.h b/src/gallium/drivers/ilo/core/ilo_builder_3d_bottom.h similarity index 99% rename from src/gallium/drivers/ilo/ilo_builder_3d_bottom.h rename to src/gallium/drivers/ilo/core/ilo_builder_3d_bottom.h index ace2304276c..16ec4afd15b 100644 --- a/src/gallium/drivers/ilo/ilo_builder_3d_bottom.h +++ b/src/gallium/drivers/ilo/core/ilo_builder_3d_bottom.h @@ -29,11 +29,12 @@ #define ILO_BUILDER_3D_BOTTOM_H #include "genhw/genhw.h" -#include "core/ilo_format.h" -#include "core/intel_winsys.h" +#include "../ilo_shader.h" +#include "intel_winsys.h" -#include "ilo_common.h" -#include "ilo_shader.h" +#include "ilo_core.h" +#include "ilo_dev.h" +#include "ilo_format.h" #include "ilo_builder.h" #include "ilo_builder_3d_top.h" diff --git a/src/gallium/drivers/ilo/ilo_builder_3d_top.h b/src/gallium/drivers/ilo/core/ilo_builder_3d_top.h similarity index 99% rename from src/gallium/drivers/ilo/ilo_builder_3d_top.h rename to src/gallium/drivers/ilo/core/ilo_builder_3d_top.h index bc6925db217..05dbce7c905 100644 --- a/src/gallium/drivers/ilo/ilo_builder_3d_top.h +++ b/src/gallium/drivers/ilo/core/ilo_builder_3d_top.h @@ -29,13 +29,13 @@ #define ILO_BUILDER_3D_TOP_H #include "genhw/genhw.h" -#include "core/ilo_state_3d.h" -#include "core/intel_winsys.h" +#include "../ilo_resource.h" +#include "../ilo_shader.h" +#include "intel_winsys.h" -#include "ilo_common.h" -#include "ilo_resource.h" -#include "ilo_shader.h" -#include "ilo_state.h" +#include "ilo_core.h" +#include "ilo_dev.h" +#include "ilo_state_3d.h" #include "ilo_builder.h" static inline void diff --git a/src/gallium/drivers/ilo/ilo_builder_blt.h b/src/gallium/drivers/ilo/core/ilo_builder_blt.h similarity index 99% rename from src/gallium/drivers/ilo/ilo_builder_blt.h rename to src/gallium/drivers/ilo/core/ilo_builder_blt.h index 72aa5c35afa..4cc55984334 100644 --- a/src/gallium/drivers/ilo/ilo_builder_blt.h +++ b/src/gallium/drivers/ilo/core/ilo_builder_blt.h @@ -29,9 +29,10 @@ #define ILO_BUILDER_BLT_H #include "genhw/genhw.h" -#include "core/intel_winsys.h" +#include "intel_winsys.h" -#include "ilo_common.h" +#include "ilo_core.h" +#include "ilo_dev.h" #include "ilo_builder.h" enum gen6_blt_mask { diff --git a/src/gallium/drivers/ilo/ilo_builder_decode.c b/src/gallium/drivers/ilo/core/ilo_builder_decode.c similarity index 99% rename from src/gallium/drivers/ilo/ilo_builder_decode.c rename to src/gallium/drivers/ilo/core/ilo_builder_decode.c index 039346aa5de..cedaab1559d 100644 --- a/src/gallium/drivers/ilo/ilo_builder_decode.c +++ b/src/gallium/drivers/ilo/core/ilo_builder_decode.c @@ -28,8 +28,9 @@ #include #include #include "genhw/genhw.h" -#include "shader/toy_compiler.h" -#include "core/intel_winsys.h" +#include "../shader/toy_compiler.h" + +#include "intel_winsys.h" #include "ilo_builder.h" static const uint32_t * diff --git a/src/gallium/drivers/ilo/ilo_builder_media.h b/src/gallium/drivers/ilo/core/ilo_builder_media.h similarity index 98% rename from src/gallium/drivers/ilo/ilo_builder_media.h rename to src/gallium/drivers/ilo/core/ilo_builder_media.h index ed269441f9d..7fbe6d41635 100644 --- a/src/gallium/drivers/ilo/ilo_builder_media.h +++ b/src/gallium/drivers/ilo/core/ilo_builder_media.h @@ -29,10 +29,11 @@ #define ILO_BUILDER_MEDIA_H #include "genhw/genhw.h" -#include "core/intel_winsys.h" +#include "../ilo_shader.h" +#include "intel_winsys.h" -#include "ilo_common.h" -#include "ilo_shader.h" +#include "ilo_core.h" +#include "ilo_dev.h" #include "ilo_builder.h" struct gen6_idrt_data { diff --git a/src/gallium/drivers/ilo/ilo_builder_mi.h b/src/gallium/drivers/ilo/core/ilo_builder_mi.h similarity index 98% rename from src/gallium/drivers/ilo/ilo_builder_mi.h rename to src/gallium/drivers/ilo/core/ilo_builder_mi.h index a34edc7d7e0..7d1d2c9a072 100644 --- a/src/gallium/drivers/ilo/ilo_builder_mi.h +++ b/src/gallium/drivers/ilo/core/ilo_builder_mi.h @@ -29,9 +29,10 @@ #define ILO_BUILDER_MI_H #include "genhw/genhw.h" -#include "core/intel_winsys.h" +#include "intel_winsys.h" -#include "ilo_common.h" +#include "ilo_core.h" +#include "ilo_dev.h" #include "ilo_builder.h" static inline void diff --git a/src/gallium/drivers/ilo/ilo_builder_render.h b/src/gallium/drivers/ilo/core/ilo_builder_render.h similarity index 99% rename from src/gallium/drivers/ilo/ilo_builder_render.h rename to src/gallium/drivers/ilo/core/ilo_builder_render.h index 33d5a9249fb..e2191496439 100644 --- a/src/gallium/drivers/ilo/ilo_builder_render.h +++ b/src/gallium/drivers/ilo/core/ilo_builder_render.h @@ -29,9 +29,10 @@ #define ILO_BUILDER_RENDER_H #include "genhw/genhw.h" -#include "core/intel_winsys.h" +#include "intel_winsys.h" -#include "ilo_common.h" +#include "ilo_core.h" +#include "ilo_dev.h" #include "ilo_builder.h" static inline void diff --git a/src/gallium/drivers/ilo/ilo_blitter_blt.c b/src/gallium/drivers/ilo/ilo_blitter_blt.c index 965f7f2b748..d55dc35e360 100644 --- a/src/gallium/drivers/ilo/ilo_blitter_blt.c +++ b/src/gallium/drivers/ilo/ilo_blitter_blt.c @@ -26,10 +26,10 @@ */ #include "genhw/genhw.h" +#include "core/ilo_builder_mi.h" +#include "core/ilo_builder_blt.h" #include "util/u_pack_color.h" -#include "ilo_builder_mi.h" -#include "ilo_builder_blt.h" #include "ilo_context.h" #include "ilo_cp.h" #include "ilo_blit.h" diff --git a/src/gallium/drivers/ilo/ilo_cp.c b/src/gallium/drivers/ilo/ilo_cp.c index a73c528caab..1f5d4ec7658 100644 --- a/src/gallium/drivers/ilo/ilo_cp.c +++ b/src/gallium/drivers/ilo/ilo_cp.c @@ -25,9 +25,9 @@ * Chia-I Wu */ +#include "core/ilo_builder_mi.h" #include "core/intel_winsys.h" -#include "ilo_builder_mi.h" #include "ilo_shader.h" #include "ilo_cp.h" diff --git a/src/gallium/drivers/ilo/ilo_cp.h b/src/gallium/drivers/ilo/ilo_cp.h index eab4b29b725..016f5e0f9ed 100644 --- a/src/gallium/drivers/ilo/ilo_cp.h +++ b/src/gallium/drivers/ilo/ilo_cp.h @@ -28,9 +28,9 @@ #ifndef ILO_CP_H #define ILO_CP_H +#include "core/ilo_builder.h" #include "core/intel_winsys.h" -#include "ilo_builder.h" #include "ilo_common.h" struct ilo_cp; diff --git a/src/gallium/drivers/ilo/ilo_render.c b/src/gallium/drivers/ilo/ilo_render.c index 227faed8c58..f5be3360f05 100644 --- a/src/gallium/drivers/ilo/ilo_render.c +++ b/src/gallium/drivers/ilo/ilo_render.c @@ -26,12 +26,12 @@ */ #include "genhw/genhw.h" -#include "util/u_prim.h" +#include "core/ilo_builder.h" +#include "core/ilo_builder_mi.h" +#include "core/ilo_builder_render.h" #include "core/intel_winsys.h" +#include "util/u_prim.h" -#include "ilo_builder.h" -#include "ilo_builder_mi.h" -#include "ilo_builder_render.h" #include "ilo_query.h" #include "ilo_render_gen.h" diff --git a/src/gallium/drivers/ilo/ilo_render_dynamic.c b/src/gallium/drivers/ilo/ilo_render_dynamic.c index 24a3825ebbb..ef92b12da83 100644 --- a/src/gallium/drivers/ilo/ilo_render_dynamic.c +++ b/src/gallium/drivers/ilo/ilo_render_dynamic.c @@ -25,10 +25,11 @@ * Chia-I Wu */ +#include "core/ilo_builder_3d.h" +#include "core/ilo_builder_media.h" + #include "ilo_common.h" #include "ilo_blitter.h" -#include "ilo_builder_3d.h" -#include "ilo_builder_media.h" #include "ilo_state.h" #include "ilo_render_gen.h" diff --git a/src/gallium/drivers/ilo/ilo_render_gen.h b/src/gallium/drivers/ilo/ilo_render_gen.h index 72c9bc01677..acfe8be3088 100644 --- a/src/gallium/drivers/ilo/ilo_render_gen.h +++ b/src/gallium/drivers/ilo/ilo_render_gen.h @@ -28,10 +28,11 @@ #ifndef ILO_RENDER_GEN_H #define ILO_RENDER_GEN_H +#include "core/ilo_builder.h" +#include "core/ilo_builder_3d.h" +#include "core/ilo_builder_render.h" + #include "ilo_common.h" -#include "ilo_builder.h" -#include "ilo_builder_3d.h" -#include "ilo_builder_render.h" #include "ilo_state.h" #include "ilo_render.h" diff --git a/src/gallium/drivers/ilo/ilo_render_gen6.c b/src/gallium/drivers/ilo/ilo_render_gen6.c index 1c101acb867..47f711e7956 100644 --- a/src/gallium/drivers/ilo/ilo_render_gen6.c +++ b/src/gallium/drivers/ilo/ilo_render_gen6.c @@ -26,13 +26,13 @@ */ #include "genhw/genhw.h" +#include "core/ilo_builder_3d.h" +#include "core/ilo_builder_mi.h" +#include "core/ilo_builder_render.h" #include "util/u_dual_blend.h" #include "util/u_prim.h" #include "ilo_blitter.h" -#include "ilo_builder_3d.h" -#include "ilo_builder_mi.h" -#include "ilo_builder_render.h" #include "ilo_query.h" #include "ilo_shader.h" #include "ilo_state.h" diff --git a/src/gallium/drivers/ilo/ilo_render_gen7.c b/src/gallium/drivers/ilo/ilo_render_gen7.c index 8801d147217..07fe7c83536 100644 --- a/src/gallium/drivers/ilo/ilo_render_gen7.c +++ b/src/gallium/drivers/ilo/ilo_render_gen7.c @@ -26,11 +26,11 @@ */ #include "genhw/genhw.h" +#include "core/ilo_builder_3d.h" +#include "core/ilo_builder_render.h" #include "util/u_dual_blend.h" #include "ilo_blitter.h" -#include "ilo_builder_3d.h" -#include "ilo_builder_render.h" #include "ilo_shader.h" #include "ilo_state.h" #include "ilo_render_gen.h" diff --git a/src/gallium/drivers/ilo/ilo_render_gen8.c b/src/gallium/drivers/ilo/ilo_render_gen8.c index f6d8d6666a3..715b93611f1 100644 --- a/src/gallium/drivers/ilo/ilo_render_gen8.c +++ b/src/gallium/drivers/ilo/ilo_render_gen8.c @@ -26,11 +26,11 @@ */ #include "genhw/genhw.h" +#include "core/ilo_builder_3d.h" +#include "core/ilo_builder_render.h" #include "util/u_dual_blend.h" #include "ilo_blitter.h" -#include "ilo_builder_3d.h" -#include "ilo_builder_render.h" #include "ilo_shader.h" #include "ilo_state.h" #include "ilo_render_gen.h" diff --git a/src/gallium/drivers/ilo/ilo_render_media.c b/src/gallium/drivers/ilo/ilo_render_media.c index f6b466c2996..387920a912c 100644 --- a/src/gallium/drivers/ilo/ilo_render_media.c +++ b/src/gallium/drivers/ilo/ilo_render_media.c @@ -26,10 +26,10 @@ */ #include "genhw/genhw.h" +#include "core/ilo_builder_media.h" +#include "core/ilo_builder_mi.h" +#include "core/ilo_builder_render.h" -#include "ilo_builder_media.h" -#include "ilo_builder_mi.h" -#include "ilo_builder_render.h" #include "ilo_state.h" #include "ilo_render_gen.h" diff --git a/src/gallium/drivers/ilo/ilo_render_surface.c b/src/gallium/drivers/ilo/ilo_render_surface.c index 97660d0a2ed..b345dfb4fc4 100644 --- a/src/gallium/drivers/ilo/ilo_render_surface.c +++ b/src/gallium/drivers/ilo/ilo_render_surface.c @@ -25,9 +25,10 @@ * Chia-I Wu */ +#include "core/ilo_builder_3d.h" + #include "ilo_common.h" #include "ilo_blitter.h" -#include "ilo_builder_3d.h" #include "ilo_state.h" #include "ilo_render_gen.h" diff --git a/src/gallium/drivers/ilo/ilo_shader.c b/src/gallium/drivers/ilo/ilo_shader.c index 8a2926c1945..799db2cbfcb 100644 --- a/src/gallium/drivers/ilo/ilo_shader.c +++ b/src/gallium/drivers/ilo/ilo_shader.c @@ -26,12 +26,12 @@ */ #include "genhw/genhw.h" /* for SBE setup */ -#include "tgsi/tgsi_parse.h" +#include "core/ilo_builder.h" #include "core/ilo_state_3d.h" #include "core/intel_winsys.h" - #include "shader/ilo_shader_internal.h" -#include "ilo_builder.h" +#include "tgsi/tgsi_parse.h" + #include "ilo_state.h" #include "ilo_shader.h" -- 2.30.2