Mesa (master): ilo: clean up GPE header inclusions

[Chia-I Wu]

Module: Mesa
Branch: master
Commit: 19204081ce7edce1d9847d3826f355fde65d4783
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=19204081ce7edce1d9847d3826f355fde65d4783

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Thu Aug  8 13:30:54 2013 +0800

ilo: clean up GPE header inclusions

This reduces the number of source files need to be recompiled when GPE
functions are changed other than regular clean ups.

---

 src/gallium/drivers/ilo/ilo_3d_pipeline.h      |    4 +---
 src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c |    1 +
 src/gallium/drivers/ilo/ilo_gpe_gen6.c         |    1 -
 src/gallium/drivers/ilo/ilo_gpe_gen6.h         |   10 +---------
 src/gallium/drivers/ilo/ilo_gpe_gen7.c         |    1 -
 src/gallium/drivers/ilo/ilo_gpe_gen7.h         |    5 +++++
 6 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline.h b/src/gallium/drivers/ilo/ilo_3d_pipeline.h
index ae4c759..ba3a4be 100644
--- a/src/gallium/drivers/ilo/ilo_3d_pipeline.h
+++ b/src/gallium/drivers/ilo/ilo_3d_pipeline.h
@@ -29,9 +29,7 @@
 #define ILO_3D_PIPELINE_H
 
 #include "ilo_common.h"
-#include "ilo_context.h"
-#include "ilo_gpe_gen6.h"
-#include "ilo_gpe_gen7.h"
+#include "ilo_gpe.h"
 
 struct intel_bo;
 struct ilo_cp;
diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c
index 36441b8..4215199 100644
--- a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c
+++ b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c
@@ -33,6 +33,7 @@
 #include "ilo_context.h"
 #include "ilo_cp.h"
 #include "ilo_gpe_gen6.h"
+#include "ilo_gpe_gen7.h"
 #include "ilo_shader.h"
 #include "ilo_state.h"
 #include "ilo_3d_pipeline.h"
diff --git a/src/gallium/drivers/ilo/ilo_gpe_gen6.c b/src/gallium/drivers/ilo/ilo_gpe_gen6.c
index c086ae5..143e6fe 100644
--- a/src/gallium/drivers/ilo/ilo_gpe_gen6.c
+++ b/src/gallium/drivers/ilo/ilo_gpe_gen6.c
@@ -31,7 +31,6 @@
 #include "intel_reg.h"
 
 #include "ilo_context.h"
-#include "ilo_cp.h"
 #include "ilo_format.h"
 #include "ilo_resource.h"
 #include "ilo_shader.h"
diff --git a/src/gallium/drivers/ilo/ilo_gpe_gen6.h b/src/gallium/drivers/ilo/ilo_gpe_gen6.h
index 9e5be13..c4d7cac 100644
--- a/src/gallium/drivers/ilo/ilo_gpe_gen6.h
+++ b/src/gallium/drivers/ilo/ilo_gpe_gen6.h
@@ -28,10 +28,9 @@
 #ifndef ILO_GPE_GEN6_H
 #define ILO_GPE_GEN6_H
 
-#include "util/u_dual_blend.h"
-#include "util/u_half.h"
 #include "brw_defines.h"
 #include "intel_reg.h"
+#include "intel_winsys.h"
 
 #include "ilo_common.h"
 #include "ilo_cp.h"
@@ -116,13 +115,6 @@ enum ilo_gpe_gen6_state {
    ILO_GPE_GEN6_STATE_COUNT,
 };
 
-enum intel_tiling_mode;
-
-struct intel_bo;
-struct ilo_cp;
-struct ilo_texture;
-struct ilo_shader;
-
 /**
  * GEN6 graphics processing engine
  *
diff --git a/src/gallium/drivers/ilo/ilo_gpe_gen7.c b/src/gallium/drivers/ilo/ilo_gpe_gen7.c
index cfabe8b..54846ec 100644
--- a/src/gallium/drivers/ilo/ilo_gpe_gen7.c
+++ b/src/gallium/drivers/ilo/ilo_gpe_gen7.c
@@ -29,7 +29,6 @@
 #include "brw_defines.h"
 #include "intel_reg.h"
 
-#include "ilo_cp.h"
 #include "ilo_format.h"
 #include "ilo_resource.h"
 #include "ilo_shader.h"
diff --git a/src/gallium/drivers/ilo/ilo_gpe_gen7.h b/src/gallium/drivers/ilo/ilo_gpe_gen7.h
index a14c9f4..0f667c1 100644
--- a/src/gallium/drivers/ilo/ilo_gpe_gen7.h
+++ b/src/gallium/drivers/ilo/ilo_gpe_gen7.h
@@ -28,7 +28,12 @@
 #ifndef ILO_GPE_GEN7_H
 #define ILO_GPE_GEN7_H
 
+#include "intel_winsys.h"
+
 #include "ilo_common.h"
+#include "ilo_cp.h"
+#include "ilo_resource.h"
+#include "ilo_shader.h"
 #include "ilo_gpe_gen6.h"
 
 /**