From bbe91576b7f5d69dc201f411cce5e619498cfef5 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Sun, 8 Mar 2015 04:26:45 +0800 Subject: [PATCH] ilo: move intel_winsys.h to core Add a new subdirectory and start moving files that do not depend on ilo_screen/ilo_context to it. --- src/gallium/drivers/ilo/Makefile.sources | 2 +- src/gallium/drivers/ilo/{ => core}/intel_winsys.h | 0 src/gallium/drivers/ilo/ilo_builder.h | 2 +- src/gallium/drivers/ilo/ilo_builder_3d_bottom.h | 2 +- src/gallium/drivers/ilo/ilo_builder_3d_top.h | 2 +- src/gallium/drivers/ilo/ilo_builder_blt.h | 2 +- src/gallium/drivers/ilo/ilo_builder_decode.c | 2 +- src/gallium/drivers/ilo/ilo_builder_media.h | 2 +- src/gallium/drivers/ilo/ilo_builder_mi.h | 2 +- src/gallium/drivers/ilo/ilo_builder_render.h | 2 +- src/gallium/drivers/ilo/ilo_cp.c | 2 +- src/gallium/drivers/ilo/ilo_cp.h | 2 +- src/gallium/drivers/ilo/ilo_draw.c | 2 +- src/gallium/drivers/ilo/ilo_query.c | 2 +- src/gallium/drivers/ilo/ilo_render.c | 2 +- src/gallium/drivers/ilo/ilo_resource.h | 2 +- src/gallium/drivers/ilo/ilo_screen.c | 2 +- src/gallium/drivers/ilo/ilo_shader.c | 2 +- src/gallium/drivers/ilo/ilo_state_3d.h | 2 +- src/gallium/winsys/intel/drm/intel_drm_winsys.c | 2 +- 20 files changed, 19 insertions(+), 19 deletions(-) rename src/gallium/drivers/ilo/{ => core}/intel_winsys.h (100%) diff --git a/src/gallium/drivers/ilo/Makefile.sources b/src/gallium/drivers/ilo/Makefile.sources index b07362f4f9a..dbdfffe7a4f 100644 --- a/src/gallium/drivers/ilo/Makefile.sources +++ b/src/gallium/drivers/ilo/Makefile.sources @@ -1,4 +1,5 @@ C_SOURCES := \ + core/intel_winsys.h \ ilo_blit.c \ ilo_blit.h \ ilo_blitter.c \ @@ -56,7 +57,6 @@ C_SOURCES := \ ilo_transfer.h \ ilo_video.c \ ilo_video.h \ - intel_winsys.h \ \ shader/ilo_shader_cs.c \ shader/ilo_shader_fs.c \ diff --git a/src/gallium/drivers/ilo/intel_winsys.h b/src/gallium/drivers/ilo/core/intel_winsys.h similarity index 100% rename from src/gallium/drivers/ilo/intel_winsys.h rename to src/gallium/drivers/ilo/core/intel_winsys.h diff --git a/src/gallium/drivers/ilo/ilo_builder.h b/src/gallium/drivers/ilo/ilo_builder.h index e0e9f535928..6e58a6b45da 100644 --- a/src/gallium/drivers/ilo/ilo_builder.h +++ b/src/gallium/drivers/ilo/ilo_builder.h @@ -28,7 +28,7 @@ #ifndef ILO_BUILDER_H #define ILO_BUILDER_H -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_common.h" enum ilo_builder_writer_type { diff --git a/src/gallium/drivers/ilo/ilo_builder_3d_bottom.h b/src/gallium/drivers/ilo/ilo_builder_3d_bottom.h index 4f203d1e9f5..cad8bf275e9 100644 --- a/src/gallium/drivers/ilo/ilo_builder_3d_bottom.h +++ b/src/gallium/drivers/ilo/ilo_builder_3d_bottom.h @@ -29,7 +29,7 @@ #define ILO_BUILDER_3D_BOTTOM_H #include "genhw/genhw.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_common.h" #include "ilo_format.h" diff --git a/src/gallium/drivers/ilo/ilo_builder_3d_top.h b/src/gallium/drivers/ilo/ilo_builder_3d_top.h index b968beb35c5..9fa53050dff 100644 --- a/src/gallium/drivers/ilo/ilo_builder_3d_top.h +++ b/src/gallium/drivers/ilo/ilo_builder_3d_top.h @@ -29,7 +29,7 @@ #define ILO_BUILDER_3D_TOP_H #include "genhw/genhw.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_common.h" #include "ilo_resource.h" diff --git a/src/gallium/drivers/ilo/ilo_builder_blt.h b/src/gallium/drivers/ilo/ilo_builder_blt.h index 327f6988cba..72aa5c35afa 100644 --- a/src/gallium/drivers/ilo/ilo_builder_blt.h +++ b/src/gallium/drivers/ilo/ilo_builder_blt.h @@ -29,7 +29,7 @@ #define ILO_BUILDER_BLT_H #include "genhw/genhw.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_common.h" #include "ilo_builder.h" diff --git a/src/gallium/drivers/ilo/ilo_builder_decode.c b/src/gallium/drivers/ilo/ilo_builder_decode.c index 0bc0bb46767..039346aa5de 100644 --- a/src/gallium/drivers/ilo/ilo_builder_decode.c +++ b/src/gallium/drivers/ilo/ilo_builder_decode.c @@ -29,7 +29,7 @@ #include #include "genhw/genhw.h" #include "shader/toy_compiler.h" -#include "intel_winsys.h" +#include "core/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/ilo_builder_media.h index f5d634f28e1..ed269441f9d 100644 --- a/src/gallium/drivers/ilo/ilo_builder_media.h +++ b/src/gallium/drivers/ilo/ilo_builder_media.h @@ -29,7 +29,7 @@ #define ILO_BUILDER_MEDIA_H #include "genhw/genhw.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_common.h" #include "ilo_shader.h" diff --git a/src/gallium/drivers/ilo/ilo_builder_mi.h b/src/gallium/drivers/ilo/ilo_builder_mi.h index 65ffc65e8b1..a34edc7d7e0 100644 --- a/src/gallium/drivers/ilo/ilo_builder_mi.h +++ b/src/gallium/drivers/ilo/ilo_builder_mi.h @@ -29,7 +29,7 @@ #define ILO_BUILDER_MI_H #include "genhw/genhw.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_common.h" #include "ilo_builder.h" diff --git a/src/gallium/drivers/ilo/ilo_builder_render.h b/src/gallium/drivers/ilo/ilo_builder_render.h index 34a2e2c2486..33d5a9249fb 100644 --- a/src/gallium/drivers/ilo/ilo_builder_render.h +++ b/src/gallium/drivers/ilo/ilo_builder_render.h @@ -29,7 +29,7 @@ #define ILO_BUILDER_RENDER_H #include "genhw/genhw.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_common.h" #include "ilo_builder.h" diff --git a/src/gallium/drivers/ilo/ilo_cp.c b/src/gallium/drivers/ilo/ilo_cp.c index 9d2dffd5e16..4cbb2d75c9e 100644 --- a/src/gallium/drivers/ilo/ilo_cp.c +++ b/src/gallium/drivers/ilo/ilo_cp.c @@ -25,7 +25,7 @@ * Chia-I Wu */ -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_builder_mi.h" #include "ilo_shader.h" diff --git a/src/gallium/drivers/ilo/ilo_cp.h b/src/gallium/drivers/ilo/ilo_cp.h index dcab55b6ee2..364a06a3b44 100644 --- a/src/gallium/drivers/ilo/ilo_cp.h +++ b/src/gallium/drivers/ilo/ilo_cp.h @@ -28,7 +28,7 @@ #ifndef ILO_CP_H #define ILO_CP_H -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_builder.h" #include "ilo_common.h" diff --git a/src/gallium/drivers/ilo/ilo_draw.c b/src/gallium/drivers/ilo/ilo_draw.c index 02e5225f4cd..fc91fd312d2 100644 --- a/src/gallium/drivers/ilo/ilo_draw.c +++ b/src/gallium/drivers/ilo/ilo_draw.c @@ -26,7 +26,7 @@ */ #include "util/u_prim.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_render.h" #include "ilo_blit.h" diff --git a/src/gallium/drivers/ilo/ilo_query.c b/src/gallium/drivers/ilo/ilo_query.c index 7a2e5030e00..b3329bc3ce1 100644 --- a/src/gallium/drivers/ilo/ilo_query.c +++ b/src/gallium/drivers/ilo/ilo_query.c @@ -25,7 +25,7 @@ * Chia-I Wu */ -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_context.h" #include "ilo_cp.h" diff --git a/src/gallium/drivers/ilo/ilo_render.c b/src/gallium/drivers/ilo/ilo_render.c index af18e89744f..227faed8c58 100644 --- a/src/gallium/drivers/ilo/ilo_render.c +++ b/src/gallium/drivers/ilo/ilo_render.c @@ -27,7 +27,7 @@ #include "genhw/genhw.h" #include "util/u_prim.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_builder.h" #include "ilo_builder_mi.h" diff --git a/src/gallium/drivers/ilo/ilo_resource.h b/src/gallium/drivers/ilo/ilo_resource.h index be42386b8e8..930f4e9c9af 100644 --- a/src/gallium/drivers/ilo/ilo_resource.h +++ b/src/gallium/drivers/ilo/ilo_resource.h @@ -28,7 +28,7 @@ #ifndef ILO_RESOURCE_H #define ILO_RESOURCE_H -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_common.h" #include "ilo_layout.h" diff --git a/src/gallium/drivers/ilo/ilo_screen.c b/src/gallium/drivers/ilo/ilo_screen.c index 80ea4c75241..d34c8394e64 100644 --- a/src/gallium/drivers/ilo/ilo_screen.c +++ b/src/gallium/drivers/ilo/ilo_screen.c @@ -31,7 +31,7 @@ #include "vl/vl_decoder.h" #include "vl/vl_video_buffer.h" #include "genhw/genhw.h" /* for GEN6_REG_TIMESTAMP */ -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_context.h" #include "ilo_format.h" diff --git a/src/gallium/drivers/ilo/ilo_shader.c b/src/gallium/drivers/ilo/ilo_shader.c index 0798ccc8186..aa7826b6c32 100644 --- a/src/gallium/drivers/ilo/ilo_shader.c +++ b/src/gallium/drivers/ilo/ilo_shader.c @@ -27,7 +27,7 @@ #include "genhw/genhw.h" /* for SBE setup */ #include "tgsi/tgsi_parse.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "shader/ilo_shader_internal.h" #include "ilo_builder.h" diff --git a/src/gallium/drivers/ilo/ilo_state_3d.h b/src/gallium/drivers/ilo/ilo_state_3d.h index cb4b89a7c04..78f55a96af8 100644 --- a/src/gallium/drivers/ilo/ilo_state_3d.h +++ b/src/gallium/drivers/ilo/ilo_state_3d.h @@ -29,7 +29,7 @@ #define ILO_STATE_3D_H #include "genhw/genhw.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_common.h" #include "ilo_state.h" diff --git a/src/gallium/winsys/intel/drm/intel_drm_winsys.c b/src/gallium/winsys/intel/drm/intel_drm_winsys.c index b5ffceb7e65..1c5aabe3304 100644 --- a/src/gallium/winsys/intel/drm/intel_drm_winsys.c +++ b/src/gallium/winsys/intel/drm/intel_drm_winsys.c @@ -41,7 +41,7 @@ #include "util/u_inlines.h" #include "util/u_memory.h" #include "util/u_debug.h" -#include "ilo/intel_winsys.h" +#include "ilo/core/intel_winsys.h" #include "intel_drm_public.h" struct intel_winsys {