[Mesa-dev] [PATCH 25/31] i965/blorp: Get rid of most brw and mesa includes

[Jason Ekstrand]

---
 src/mesa/drivers/dri/i965/blorp.c       |  3 ---
 src/mesa/drivers/dri/i965/blorp_blit.c  |  7 -------
 src/mesa/drivers/dri/i965/blorp_clear.c | 11 +----------
 src/mesa/drivers/dri/i965/blorp_priv.h  |  1 +
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/blorp.c b/src/mesa/drivers/dri/i965/blorp.c
index 7b2fc7f..ffc9c7c 100644
--- a/src/mesa/drivers/dri/i965/blorp.c
+++ b/src/mesa/drivers/dri/i965/blorp.c
@@ -22,13 +22,10 @@
  */
 
 #include <errno.h>
-#include "intel_batchbuffer.h"
-#include "intel_fbo.h"
 
 #include "blorp_priv.h"
 #include "brw_compiler.h"
 #include "brw_nir.h"
-#include "brw_state.h"
 
 static uint32_t blorp_hash_key(const void *void_key);
 static bool blorp_key_equal(const void *void_a, const void *void_b);
diff --git a/src/mesa/drivers/dri/i965/blorp_blit.c b/src/mesa/drivers/dri/i965/blorp_blit.c
index 72358d7..b89d828 100644
--- a/src/mesa/drivers/dri/i965/blorp_blit.c
+++ b/src/mesa/drivers/dri/i965/blorp_blit.c
@@ -21,17 +21,10 @@
  * IN THE SOFTWARE.
  */
 
-#include "main/context.h"
-#include "main/teximage.h"
-#include "main/fbobject.h"
-
 #include "program/prog_instruction.h"
 #include "compiler/nir/nir_builder.h"
 
-#include "intel_fbo.h"
-
 #include "blorp_priv.h"
-#include "brw_context.h"
 #include "brw_meta_util.h"
 
 #define FILE_DEBUG_FLAG DEBUG_BLORP
diff --git a/src/mesa/drivers/dri/i965/blorp_clear.c b/src/mesa/drivers/dri/i965/blorp_clear.c
index 2c34b63..ecb3e08 100644
--- a/src/mesa/drivers/dri/i965/blorp_clear.c
+++ b/src/mesa/drivers/dri/i965/blorp_clear.c
@@ -21,20 +21,11 @@
  * IN THE SOFTWARE.
  */
 
-#include "main/teximage.h"
-#include "main/blend.h"
-#include "main/fbobject.h"
-#include "main/renderbuffer.h"
-#include "main/glformats.h"
-
 #include "util/ralloc.h"
 
-#include "intel_fbo.h"
-
 #include "blorp_priv.h"
 #include "brw_meta_util.h"
-#include "brw_context.h"
-#include "brw_eu.h"
+#include "brw_defines.h"
 
 #include "nir_builder.h"
 
diff --git a/src/mesa/drivers/dri/i965/blorp_priv.h b/src/mesa/drivers/dri/i965/blorp_priv.h
index 6aa20b2..74ad8ee 100644
--- a/src/mesa/drivers/dri/i965/blorp_priv.h
+++ b/src/mesa/drivers/dri/i965/blorp_priv.h
@@ -26,6 +26,7 @@
 #include <stdint.h>
 
 #include "compiler/nir/nir.h"
+#include "brw_compiler.h"
 
 #include "blorp.h"
 
-- 
2.5.0.400.gff86faf