From 12a2fe538909991dc983de5b6573794ee574048d Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 19 Aug 2016 01:58:41 -0700
Subject: [PATCH] i965/blorp: Get rid of most brw and mesa includes

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
---
 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 16ccd34aab1..1c4102f7333 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"
 
 void
 blorp_init(struct blorp_context *blorp, void *driver_ctx,
diff --git a/src/mesa/drivers/dri/i965/blorp_blit.c b/src/mesa/drivers/dri/i965/blorp_blit.c
index c5f8272cfd0..00cdc0911e2 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 d145cce666d..9f57d9a7775 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 a25291b7674..273b476b617 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.30.2