diff options
Diffstat (limited to 'src/mesa/drivers/dri')
29 files changed, 23 insertions, 29 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_clear.c b/src/mesa/drivers/dri/i965/brw_clear.c index 4fa92a9716a..0f3f7d94191 100644 --- 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 e5c8372aeed..eb7851ba567 100644 --- 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 39dfd34f4c9..53c41e235c5 100644 --- 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 0a46d1c4032..ac02b5c94d1 100644 --- 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 409df29c7d1..4da37c11a83 100644 --- 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 08455453d37..8f915bf5686 100644 --- 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 ee444044d52..e063062e2ee 100644 --- 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 3dc95d266b9..91f10a87840 100644 --- 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 466fdfe8dae..d23df75c196 100644 --- 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 6e6be6af4e9..4608471d819 100644 --- 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 eb030f19187..0ec495e065d 100644 --- 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 ded1e702ac7..7468b40ccfc 100644 --- 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 14d94e0dc95..84dbbc1e032 100644 --- 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 af3a835d82a..339879cecb2 100644 --- 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 af869905a96..65b03198e5d 100644 --- 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 f58cb855e60..623f4f46fdc 100644 --- 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 8c0edf2dd85..772959b589e 100644 --- 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 ba8e06f1f95..79dbeb20cd1 100644 --- 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 2ec7ed8e269..af618a29ad2 100644 --- 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 e9733a651c5..7ada1376310 100644 --- 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 44f7030c712..a6b80fdbf81 100644 --- 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 3bb0fc196d3..c593e288170 100644 --- 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 9657d9af959..c9bafbd96eb 100644 --- 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 24f13dfee89..8d077188117 100644 --- 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 c6302c3db70..19385dba4a4 100644 --- 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 935cccb19a0..72a4431ebd5 100644 --- 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 5a10a37b299..92f1ccede95 100644 --- 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 f936e9b17e6..c18525c66d3 100644 --- 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 049d2472da0..e678d80cfce 100644 --- 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" |