From: Chia-I Wu <olvaffe@gmail.com>
Date: Thu, 18 Jun 2015 14:48:14 +0000 (+0800)
Subject: ilo: clean up header includes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=028590cbc758e877b963ba430f0a0cb49e882a6b;p=mesa.git

ilo: clean up header includes

Core is more self-contained now.
---

diff --git a/src/gallium/drivers/ilo/core/ilo_builder_3d_bottom.h b/src/gallium/drivers/ilo/core/ilo_builder_3d_bottom.h
index f7f95f493b7..6d9e3699125 100644
--- a/src/gallium/drivers/ilo/core/ilo_builder_3d_bottom.h
+++ b/src/gallium/drivers/ilo/core/ilo_builder_3d_bottom.h
@@ -38,6 +38,7 @@
 #include "ilo_state_sbe.h"
 #include "ilo_state_shader.h"
 #include "ilo_state_viewport.h"
+#include "ilo_state_zs.h"
 #include "ilo_builder.h"
 #include "ilo_builder_3d_top.h"
 
diff --git a/src/gallium/drivers/ilo/core/ilo_builder_3d_top.h b/src/gallium/drivers/ilo/core/ilo_builder_3d_top.h
index a8873ed5e2f..42d171fc0d2 100644
--- a/src/gallium/drivers/ilo/core/ilo_builder_3d_top.h
+++ b/src/gallium/drivers/ilo/core/ilo_builder_3d_top.h
@@ -29,8 +29,6 @@
 #define ILO_BUILDER_3D_TOP_H
 
 #include "genhw/genhw.h"
-#include "../ilo_resource.h"
-#include "../ilo_state.h"
 #include "intel_winsys.h"
 
 #include "ilo_core.h"
@@ -38,6 +36,7 @@
 #include "ilo_state_sampler.h"
 #include "ilo_state_shader.h"
 #include "ilo_state_sol.h"
+#include "ilo_state_surface.h"
 #include "ilo_state_urb.h"
 #include "ilo_state_vf.h"
 #include "ilo_builder.h"
diff --git a/src/gallium/drivers/ilo/ilo_render_gen6.c b/src/gallium/drivers/ilo/ilo_render_gen6.c
index 0623714c19f..b2bc2dcface 100644
--- a/src/gallium/drivers/ilo/ilo_render_gen6.c
+++ b/src/gallium/drivers/ilo/ilo_render_gen6.c
@@ -33,6 +33,7 @@
 
 #include "ilo_blitter.h"
 #include "ilo_query.h"
+#include "ilo_resource.h"
 #include "ilo_shader.h"
 #include "ilo_state.h"
 #include "ilo_render_gen.h"
diff --git a/src/gallium/drivers/ilo/ilo_render_gen7.c b/src/gallium/drivers/ilo/ilo_render_gen7.c
index 7d0e4c44829..4c54edeeb96 100644
--- a/src/gallium/drivers/ilo/ilo_render_gen7.c
+++ b/src/gallium/drivers/ilo/ilo_render_gen7.c
@@ -30,6 +30,7 @@
 #include "core/ilo_builder_render.h"
 
 #include "ilo_blitter.h"
+#include "ilo_resource.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 8956e5f6b2e..f86871f852f 100644
--- a/src/gallium/drivers/ilo/ilo_render_gen8.c
+++ b/src/gallium/drivers/ilo/ilo_render_gen8.c
@@ -30,6 +30,7 @@
 #include "core/ilo_builder_render.h"
 
 #include "ilo_blitter.h"
+#include "ilo_resource.h"
 #include "ilo_shader.h"
 #include "ilo_state.h"
 #include "ilo_render_gen.h"