i965: Replace #include "intel_context.h" with brw_context.h.

brw_context.h includes intel_context.h, but additionally makes the
brw_context structure available.  Switching this allows us to start
using brw_context in more places.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Chris Forbes <chrisf@ijw.co.nz>
Acked-by: Paul Berry <stereotype441@gmail.com>
Acked-by: Anuj Phogat <anuj.phogat@gmail.com>

diff --git a/src/mesa/drivers/dri/i965/brw_clear.c b/src/mesa/drivers/dri/i965/brw_clear.c
index 4fa92a9716a2aff1fd0730c4e1cd45576093353c..0f3f7d94191126a541436fe4224babf8840698c8 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_clear.c
+++ b/src/mesa/drivers/dri/i965/brw_clear.c
@@ -33,7 +33,6 @@
 #include "drivers/common/meta.h"
 
 #include "intel_batchbuffer.h"
-#include "intel_context.h"
 #include "intel_blit.h"
 #include "intel_fbo.h"
 #include "intel_mipmap_tree.h"

diff --git a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp
index e5c8372aeed2a86f6268dc5e742537ad2231630a..eb7851ba56754a0eb63f0beb1c6d9ea3b349f2d4 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp
@@ -39,7 +39,7 @@
 
 extern "C" {
 #include "main/core.h"
-#include "intel_context.h"
+#include "brw_context.h"
 }
 #include "glsl/ir.h"
 #include "glsl/ir_visitor.h"

diff --git a/src/mesa/drivers/dri/i965/brw_tex.c b/src/mesa/drivers/dri/i965/brw_tex.c
index 39dfd34f4c9573effc6b2d2f87392428e2f0be67..53c41e235c51603b611eadc7e33b1a082877fdee 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_tex.c
+++ b/src/mesa/drivers/dri/i965/brw_tex.c
@@ -34,7 +34,6 @@
 #include "main/mtypes.h"
 #include "main/teximage.h"
 
-#include "intel_context.h"
 #include "intel_regions.h"
 #include "intel_tex.h"
 #include "brw_context.h"

diff --git a/src/mesa/drivers/dri/i965/brw_tex_layout.c b/src/mesa/drivers/dri/i965/brw_tex_layout.c
index 0a46d1c403269e2e4a5e346fc7dd05e3b207dca0..ac02b5c94d136730139be762f7a7519a7c614592 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_tex_layout.c
+++ b/src/mesa/drivers/dri/i965/brw_tex_layout.c
@@ -33,7 +33,7 @@
  */
 
 #include "intel_mipmap_tree.h"
-#include "intel_context.h"
+#include "brw_context.h"
 #include "main/macros.h"
 
 #define FILE_DEBUG_FLAG DEBUG_MIPTREE

diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
index 409df29c7d1b4c29493759068751f023921cf3ee..4da37c11a83fc33b2f674352f72fdbab204d4711 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
@@ -25,7 +25,6 @@
  * 
  **************************************************************************/
 
-#include "intel_context.h"
 #include "intel_batchbuffer.h"
 #include "intel_buffer_objects.h"
 #include "intel_reg.h"

diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.h b/src/mesa/drivers/dri/i965/intel_batchbuffer.h
index 08455453d3762a6fc64d8a7c509df2ede86b4402..8f915bf56868f934c449c8d2391b2220884786a6 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_batchbuffer.h
+++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.h
@@ -3,7 +3,7 @@
 
 #include "main/mtypes.h"
 
-#include "intel_context.h"
+#include "brw_context.h"
 #include "intel_bufmgr.h"
 #include "intel_reg.h"
 

diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/intel_blit.c
index ee444044d525085f71f72f2b64d27e7ceb3af865..e063062e2ee38010a38e7d7c7bfab0866e934185 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_blit.c
+++ b/src/mesa/drivers/dri/i965/intel_blit.c
@@ -32,9 +32,9 @@
 #include "main/colormac.h"
 #include "main/fbobject.h"
 
+#include "brw_context.h"
 #include "intel_blit.h"
 #include "intel_buffers.h"
-#include "intel_context.h"
 #include "intel_fbo.h"
 #include "intel_reg.h"
 #include "intel_regions.h"

diff --git a/src/mesa/drivers/dri/i965/intel_blit.h b/src/mesa/drivers/dri/i965/intel_blit.h
index 3dc95d266b9b48d03ed7bb4e901fdea697687b5d..91f10a87840abaf72b52b90250c7865549b8b535 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_blit.h
+++ b/src/mesa/drivers/dri/i965/intel_blit.h
@@ -28,7 +28,7 @@
 #ifndef INTEL_BLIT_H
 #define INTEL_BLIT_H
 
-#include "intel_context.h"
+#include "brw_context.h"
 
 bool
 intelEmitCopyBlit(struct intel_context *intel,

diff --git a/src/mesa/drivers/dri/i965/intel_buffer_objects.c b/src/mesa/drivers/dri/i965/intel_buffer_objects.c
index 466fdfe8dae98a9b85382aaa9b889ce3c7881e68..d23df75c19638fcb4ff7b4f4fd1bb21659cc78a9 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/i965/intel_buffer_objects.c
@@ -31,10 +31,10 @@
 #include "main/macros.h"
 #include "main/bufferobj.h"
 
+#include "brw_context.h"
 #include "intel_blit.h"
 #include "intel_buffer_objects.h"
 #include "intel_batchbuffer.h"
-#include "intel_context.h"
 #include "intel_fbo.h"
 #include "intel_mipmap_tree.h"
 #include "intel_regions.h"

diff --git a/src/mesa/drivers/dri/i965/intel_buffers.c b/src/mesa/drivers/dri/i965/intel_buffers.c
index 6e6be6af4e93f678e9c563ac5a55d4a242db83e0..4608471d8193ec26071ff3c85dc63475ccb8984c 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_buffers.c
+++ b/src/mesa/drivers/dri/i965/intel_buffers.c
@@ -25,7 +25,7 @@
  * 
  **************************************************************************/
 
-#include "intel_context.h"
+#include "brw_context.h"
 #include "intel_buffers.h"
 #include "intel_fbo.h"
 #include "intel_mipmap_tree.h"

diff --git a/src/mesa/drivers/dri/i965/intel_buffers.h b/src/mesa/drivers/dri/i965/intel_buffers.h
index eb030f1918759952e46913661ca96878a2685be0..0ec495e065d99242df495eecac4b168988374c28 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_buffers.h
+++ b/src/mesa/drivers/dri/i965/intel_buffers.h
@@ -31,7 +31,7 @@
 
 #include "dri_util.h"
 #include "drm.h"
-#include "intel_context.h"
+#include "brw_context.h"
 
 struct intel_context;
 struct intel_framebuffer;

diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index ded1e702ac7229895896e0d7f4db615f933aeb56..7468b40ccfce608ea9fbc6a2923f1c3ae666ee4e 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -27,8 +27,8 @@
 
 #include "main/version.h"
 
+#include "brw_context.h"
 #include "intel_chipset.h"
-#include "intel_context.h"
 #include "intel_reg.h"
 #include "utils.h"
 

diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c
index 14d94e0dc95e8cd8a86870f95eae5a4d07b22ecd..84dbbc1e0324b20ad3ed40af59d14f55f5ec6a25 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_fbo.c
+++ b/src/mesa/drivers/dri/i965/intel_fbo.c
@@ -40,7 +40,6 @@
 #include "swrast/swrast.h"
 #include "drivers/common/meta.h"
 
-#include "intel_context.h"
 #include "intel_batchbuffer.h"
 #include "intel_buffers.h"
 #include "intel_blit.h"

diff --git a/src/mesa/drivers/dri/i965/intel_fbo.h b/src/mesa/drivers/dri/i965/intel_fbo.h
index af3a835d82a77e43ce44eac2e6045094479e241a..339879cecb299d0f24b7845e9fc297d8f8c025cc 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_fbo.h
+++ b/src/mesa/drivers/dri/i965/intel_fbo.h
@@ -32,7 +32,7 @@
 #include <assert.h>
 #include "main/formats.h"
 #include "main/macros.h"
-#include "intel_context.h"
+#include "brw_context.h"
 #include "intel_mipmap_tree.h"
 #include "intel_screen.h"
 

diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index af869905a96d0df8d5277701c0778b3679d25d0b..65b03198e5defb5e0cc0ee04ca90a196f2b3c549 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -30,7 +30,6 @@
 
 #include "intel_batchbuffer.h"
 #include "intel_chipset.h"
-#include "intel_context.h"
 #include "intel_mipmap_tree.h"
 #include "intel_regions.h"
 #include "intel_resolve_map.h"
@@ -38,6 +37,7 @@
 #include "intel_blit.h"
 
 #include "brw_blorp.h"
+#include "brw_context.h"
 
 #include "main/enums.h"
 #include "main/formats.h"

diff --git a/src/mesa/drivers/dri/i965/intel_pixel.c b/src/mesa/drivers/dri/i965/intel_pixel.c
index f58cb855e60bb6b03c03291b5ba82c191261e020..623f4f46fdc9bc18d3f9cca690237a95146a8045 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_pixel.c
+++ b/src/mesa/drivers/dri/i965/intel_pixel.c
@@ -32,7 +32,7 @@
 #include "main/context.h"
 #include "swrast/swrast.h"
 
-#include "intel_context.h"
+#include "brw_context.h"
 #include "intel_pixel.h"
 #include "intel_regions.h"
 

diff --git a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
index 8c0edf2dd8592d7f5a28bbc3b103cde81ca0465f..772959b589ede32900d359066df71b581599e7cd 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
+++ b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
@@ -41,8 +41,8 @@
 #include "swrast/swrast.h"
 #include "drivers/common/meta.h"
 
+#include "brw_context.h"
 #include "intel_screen.h"
-#include "intel_context.h"
 #include "intel_batchbuffer.h"
 #include "intel_blit.h"
 #include "intel_fbo.h"

diff --git a/src/mesa/drivers/dri/i965/intel_pixel_copy.c b/src/mesa/drivers/dri/i965/intel_pixel_copy.c
index ba8e06f1f955e5647e5e27d2ee11cc07478b4e6c..79dbeb20cd1cf74bc995661e29513ff39a2f17ad 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_pixel_copy.c
+++ b/src/mesa/drivers/dri/i965/intel_pixel_copy.c
@@ -33,7 +33,7 @@
 #include "main/fbobject.h"
 #include "drivers/common/meta.h"
 
-#include "intel_context.h"
+#include "brw_context.h"
 #include "intel_buffers.h"
 #include "intel_mipmap_tree.h"
 #include "intel_regions.h"

diff --git a/src/mesa/drivers/dri/i965/intel_pixel_draw.c b/src/mesa/drivers/dri/i965/intel_pixel_draw.c
index 2ec7ed8e269062e69a77e565754e16fade99519f..af618a29ad21321f7a6b1e69c36de53d5a40173b 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_pixel_draw.c
+++ b/src/mesa/drivers/dri/i965/intel_pixel_draw.c
@@ -35,7 +35,7 @@
 #include "swrast/swrast.h"
 #include "drivers/common/meta.h"
 
-#include "intel_context.h"
+#include "brw_context.h"
 #include "intel_pixel.h"
 
 void

diff --git a/src/mesa/drivers/dri/i965/intel_pixel_read.c b/src/mesa/drivers/dri/i965/intel_pixel_read.c
index e9733a651c51a73fb9d67b7be1a846da0f58bbb2..7ada13763102ddb178bcdc1cc60140b6b431d169 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_pixel_read.c
+++ b/src/mesa/drivers/dri/i965/intel_pixel_read.c
@@ -35,8 +35,8 @@
 #include "main/readpix.h"
 #include "main/state.h"
 
+#include "brw_context.h"
 #include "intel_screen.h"
-#include "intel_context.h"
 #include "intel_blit.h"
 #include "intel_buffers.h"
 #include "intel_fbo.h"

diff --git a/src/mesa/drivers/dri/i965/intel_regions.c b/src/mesa/drivers/dri/i965/intel_regions.c
index 44f7030c712f4cc5a6d285709d3afc59f0c9f012..a6b80fdbf817d835a0f5c562080d91a4f6dfb447 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_regions.c
+++ b/src/mesa/drivers/dri/i965/intel_regions.c
@@ -43,7 +43,7 @@
 #include <errno.h>
 
 #include "main/hash.h"
-#include "intel_context.h"
+#include "brw_context.h"
 #include "intel_regions.h"
 #include "intel_blit.h"
 #include "intel_buffer_objects.h"

diff --git a/src/mesa/drivers/dri/i965/intel_state.c b/src/mesa/drivers/dri/i965/intel_state.c
index 3bb0fc196d3f34944d9db7dc823e799c0fce2655..c593e288170f38df866f5be44a2fec721545b399 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_state.c
+++ b/src/mesa/drivers/dri/i965/intel_state.c
@@ -34,7 +34,7 @@
 #include "main/dd.h"
 
 #include "intel_screen.h"
-#include "intel_context.h"
+#include "brw_context.h"
 #include "brw_defines.h"
 
 int

diff --git a/src/mesa/drivers/dri/i965/intel_syncobj.c b/src/mesa/drivers/dri/i965/intel_syncobj.c
index 9657d9af959b06e5334e2e2233654ce46d74fe48..c9bafbd96eb8459acd4417f5beccff1dc4ac888a 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_syncobj.c
+++ b/src/mesa/drivers/dri/i965/intel_syncobj.c
@@ -41,7 +41,7 @@
 #include "main/simple_list.h"
 #include "main/imports.h"
 
-#include "intel_context.h"
+#include "brw_context.h"
 #include "intel_batchbuffer.h"
 #include "intel_reg.h"
 

diff --git a/src/mesa/drivers/dri/i965/intel_tex.c b/src/mesa/drivers/dri/i965/intel_tex.c
index 24f13dfee8993933345666fb0f0847223594978d..8d07718811774eb52e71470ba362ab8b939930ef 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_tex.c
+++ b/src/mesa/drivers/dri/i965/intel_tex.c
@@ -4,7 +4,7 @@
 #include "main/teximage.h"
 #include "main/mipmap.h"
 #include "drivers/common/meta.h"
-#include "intel_context.h"
+#include "brw_context.h"
 #include "intel_mipmap_tree.h"
 #include "intel_tex.h"
 #include "intel_fbo.h"

diff --git a/src/mesa/drivers/dri/i965/intel_tex.h b/src/mesa/drivers/dri/i965/intel_tex.h
index c6302c3db707d6aeaa234b06d6845c9bef2be261..19385dba4a4b79f7a56c7fc894bcdabe7405960b 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_tex.h
+++ b/src/mesa/drivers/dri/i965/intel_tex.h
@@ -30,7 +30,7 @@
 
 #include "main/mtypes.h"
 #include "main/formats.h"
-#include "intel_context.h"
+#include "brw_context.h"
 
 struct intel_renderbuffer;
 

diff --git a/src/mesa/drivers/dri/i965/intel_tex_copy.c b/src/mesa/drivers/dri/i965/intel_tex_copy.c
index 935cccb19a0d972180477c5bca5f7a40b73d3e7c..72a4431ebd59702f2a72f5206734eafdc438ba78 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_tex_copy.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_copy.c
@@ -35,7 +35,6 @@
 #include "drivers/common/meta.h"
 
 #include "intel_screen.h"
-#include "intel_context.h"
 #include "intel_mipmap_tree.h"
 #include "intel_regions.h"
 #include "intel_fbo.h"

diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c
index 5a10a37b29942fe2bcc237660e8f1ec9377070ca..92f1ccede95429bff036a89a4739a12f141b1b2a 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_tex_image.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_image.c
@@ -15,7 +15,6 @@
 #include "main/teximage.h"
 #include "main/texstore.h"
 
-#include "intel_context.h"
 #include "intel_mipmap_tree.h"
 #include "intel_buffer_objects.h"
 #include "intel_batchbuffer.h"

diff --git a/src/mesa/drivers/dri/i965/intel_tex_subimage.c b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
index f936e9b17e6602085e3a67cbbcb2902a63323fc7..c18525c66d3a27c2cb15e39c22faadd0f5dcc941 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_tex_subimage.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
@@ -35,8 +35,8 @@
 #include "main/texcompress.h"
 #include "main/enums.h"
 
+#include "brw_context.h"
 #include "intel_batchbuffer.h"
-#include "intel_context.h"
 #include "intel_tex.h"
 #include "intel_mipmap_tree.h"
 #include "intel_blit.h"

diff --git a/src/mesa/drivers/dri/i965/intel_tex_validate.c b/src/mesa/drivers/dri/i965/intel_tex_validate.c
index 049d2472da08ff3b1bdfd1cd21c699acdaf4ca44..e678d80cfce13049678c6dd5be858f6bea272518 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_tex_validate.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_validate.c
@@ -3,7 +3,7 @@
 #include "main/samplerobj.h"
 #include "main/texobj.h"
 
-#include "intel_context.h"
+#include "brw_context.h"
 #include "intel_mipmap_tree.h"
 #include "intel_blit.h"
 #include "intel_tex.h"