i965: Stop including brw_defines.h in brw_state.h

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i965/brw_meta_util.c b/src/mesa/drivers/dri/i965/brw_meta_util.c
index c3af167bd34ee7a3fdc5a94797215fa9730859a9..90f034523156249c871d9cf3e26552c1fc0aadf9 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_meta_util.c
+++ b/src/mesa/drivers/dri/i965/brw_meta_util.c
@@ -22,6 +22,7 @@
  */
 
 #include "brw_context.h"
+#include "brw_defines.h"
 #include "intel_fbo.h"
 #include "brw_meta_util.h"
 #include "brw_state.h"

diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h
index 8990485be70dd95cd8f86c0d9614a8082df640dc..eb138b3c02e256fbfe64926f15a9c3befb60a358 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_state.h
+++ b/src/mesa/drivers/dri/i965/brw_state.h
@@ -34,7 +34,6 @@
 #define BRW_STATE_H
 
 #include "brw_context.h"
-#include "brw_defines.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/mesa/drivers/dri/i965/gen6_blorp.c b/src/mesa/drivers/dri/i965/gen6_blorp.c
index abdcf17e40ceea5e953d717789e85a1db6f635e1..344a40c95b6b7350fa0dcc460020f52a6bdcc59a 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen6_blorp.c
+++ b/src/mesa/drivers/dri/i965/gen6_blorp.c
@@ -27,6 +27,7 @@
 #include "intel_mipmap_tree.h"
 
 #include "brw_context.h"
+#include "brw_defines.h"
 #include "brw_state.h"
 
 #include "blorp_priv.h"

diff --git a/src/mesa/drivers/dri/i965/gen7_blorp.c b/src/mesa/drivers/dri/i965/gen7_blorp.c
index d35d6c6169aadce64d2c486104d2c585ea7656f1..8fe293dc051515fa7a87c207e01544b904b292d7 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen7_blorp.c
+++ b/src/mesa/drivers/dri/i965/gen7_blorp.c
@@ -27,6 +27,7 @@
 #include "intel_mipmap_tree.h"
 
 #include "brw_context.h"
+#include "brw_defines.h"
 #include "brw_state.h"
 
 #include "blorp_priv.h"