From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 9 Aug 2016 00:30:30 +0000 (-0700)
Subject: i965: Stop including brw_defines.h in brw_state.h
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8455f9430f4aed84ab184f39ce5c4e779bc9dcb3;p=mesa.git

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 c3af167bd34..90f03452315 100644
--- 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 8990485be70..eb138b3c02e 100644
--- 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 abdcf17e40c..344a40c95b6 100644
--- 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 d35d6c6169a..8fe293dc051 100644
--- 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"