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.

diff --git a/src/gallium/drivers/ilo/Makefile.sources b/src/gallium/drivers/ilo/Makefile.sources
index b07362f..dbdfffe 100644 (file)
--- 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 e0e9f53..6e58a6b 100644 (file)
--- 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 4f203d1..cad8bf2 100644 (file)
--- 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 b968beb..9fa5305 100644 (file)
--- 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 327f698..72aa5c3 100644 (file)
--- 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 0bc0bb4..039346a 100644 (file)
--- a/src/gallium/drivers/ilo/ilo_builder_decode.c
+++ b/src/gallium/drivers/ilo/ilo_builder_decode.c
@@ -29,7 +29,7 @@
 #include <stdarg.h>
 #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 f5d634f..ed26944 100644 (file)
--- 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 65ffc65..a34edc7 100644 (file)
--- 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 34a2e2c..33d5a92 100644 (file)
--- 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 9d2dffd..4cbb2d7 100644 (file)
--- a/src/gallium/drivers/ilo/ilo_cp.c
+++ b/src/gallium/drivers/ilo/ilo_cp.c
@@ -25,7 +25,7 @@
  *    Chia-I Wu <olv@lunarg.com>
  */
 
-#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 dcab55b..364a06a 100644 (file)
--- 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 02e5225..fc91fd3 100644 (file)
--- 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 7a2e503..b3329bc 100644 (file)
--- a/src/gallium/drivers/ilo/ilo_query.c
+++ b/src/gallium/drivers/ilo/ilo_query.c
@@ -25,7 +25,7 @@
  *    Chia-I Wu <olv@lunarg.com>
  */
 
-#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 af18e89..227faed 100644 (file)
--- 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 be42386..930f4e9 100644 (file)
--- 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 80ea4c7..d34c839 100644 (file)
--- 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 0798ccc..aa7826b 100644 (file)
--- 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 cb4b89a..78f55a9 100644 (file)
--- 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 b5ffceb..1c5aabe 100644 (file)
--- 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 {