Upcoming patches eliminate the intel_batchbuffer interface and one of
the minor changes that causes a lot of churn is the removal of the
header, along with the occassional need to now call intel_reg.h
themselves. This patch moves the individual includes into brw_context.h.
Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
---
src/mesa/drivers/dri/i965/brw_binding_tables.c | 3 ++-
src/mesa/drivers/dri/i965/brw_blorp.cpp | 1 -
src/mesa/drivers/dri/i965/brw_cc.c | 1 -
src/mesa/drivers/dri/i965/brw_clear.c | 1 -
src/mesa/drivers/dri/i965/brw_clip.c | 2 --
src/mesa/drivers/dri/i965/brw_clip_line.c | 2 --
src/mesa/drivers/dri/i965/brw_clip_point.c | 2 --
src/mesa/drivers/dri/i965/brw_clip_tri.c | 2 --
src/mesa/drivers/dri/i965/brw_clip_unfilled.c | 2 --
src/mesa/drivers/dri/i965/brw_clip_util.c | 2 --
src/mesa/drivers/dri/i965/brw_compute.c | 1 -
src/mesa/drivers/dri/i965/brw_conditional_render.c | 2 +-
src/mesa/drivers/dri/i965/brw_context.c | 1 -
src/mesa/drivers/dri/i965/brw_context.h | 3 +++
src/mesa/drivers/dri/i965/brw_cs.cpp | 1 -
src/mesa/drivers/dri/i965/brw_curbe.c | 1 -
src/mesa/drivers/dri/i965/brw_draw.c | 2 +-
src/mesa/drivers/dri/i965/brw_draw_upload.c | 1 -
src/mesa/drivers/dri/i965/brw_ff_gs.c | 2 --
src/mesa/drivers/dri/i965/brw_ff_gs_emit.c | 1 -
src/mesa/drivers/dri/i965/brw_meta_fast_clear.c | 1 -
src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c | 1 -
src/mesa/drivers/dri/i965/brw_meta_updownsample.c | 1 -
src/mesa/drivers/dri/i965/brw_misc_state.c | 2 +-
src/mesa/drivers/dri/i965/brw_performance_monitor.c | 3 ++-
src/mesa/drivers/dri/i965/brw_pipe_control.c | 1 -
src/mesa/drivers/dri/i965/brw_primitive_restart.c | 2 --
src/mesa/drivers/dri/i965/brw_program.c | 3 ++-
src/mesa/drivers/dri/i965/brw_queryobj.c | 2 +-
src/mesa/drivers/dri/i965/brw_sampler_state.c | 2 +-
src/mesa/drivers/dri/i965/brw_sf.c | 2 --
src/mesa/drivers/dri/i965/brw_sf_emit.c | 2 --
src/mesa/drivers/dri/i965/brw_state_batch.c | 1 -
src/mesa/drivers/dri/i965/brw_state_cache.c | 1 -
src/mesa/drivers/dri/i965/brw_state_dump.c | 1 -
src/mesa/drivers/dri/i965/brw_state_upload.c | 2 +-
src/mesa/drivers/dri/i965/brw_urb.c | 3 ++-
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 1 -
src/mesa/drivers/dri/i965/gen6_blorp.cpp | 1 -
src/mesa/drivers/dri/i965/gen6_cc.c | 1 -
src/mesa/drivers/dri/i965/gen6_clip_state.c | 1 -
src/mesa/drivers/dri/i965/gen6_depth_state.c | 1 -
src/mesa/drivers/dri/i965/gen6_depthstencil.c | 1 -
src/mesa/drivers/dri/i965/gen6_gs_state.c | 1 -
src/mesa/drivers/dri/i965/gen6_multisample_state.c | 2 --
src/mesa/drivers/dri/i965/gen6_queryobj.c | 1 -
src/mesa/drivers/dri/i965/gen6_sampler_state.c | 1 -
src/mesa/drivers/dri/i965/gen6_scissor_state.c | 1 -
src/mesa/drivers/dri/i965/gen6_sf_state.c | 1 -
src/mesa/drivers/dri/i965/gen6_sol.c | 1 -
src/mesa/drivers/dri/i965/gen6_surface_state.c | 1 -
src/mesa/drivers/dri/i965/gen6_urb.c | 1 -
src/mesa/drivers/dri/i965/gen6_viewport_state.c | 1 -
src/mesa/drivers/dri/i965/gen6_vs_state.c | 2 +-
src/mesa/drivers/dri/i965/gen6_wm_state.c | 1 -
src/mesa/drivers/dri/i965/gen7_blorp.cpp | 1 -
src/mesa/drivers/dri/i965/gen7_disable.c | 1 -
src/mesa/drivers/dri/i965/gen7_gs_state.c | 1 -
src/mesa/drivers/dri/i965/gen7_misc_state.c | 1 -
src/mesa/drivers/dri/i965/gen7_sf_state.c | 1 -
src/mesa/drivers/dri/i965/gen7_sol_state.c | 2 +-
src/mesa/drivers/dri/i965/gen7_urb.c | 1 -
src/mesa/drivers/dri/i965/gen7_viewport_state.c | 1 -
src/mesa/drivers/dri/i965/gen7_vs_state.c | 1 -
src/mesa/drivers/dri/i965/gen7_wm_state.c | 1 -
src/mesa/drivers/dri/i965/gen7_wm_surface_state.c | 1 -
src/mesa/drivers/dri/i965/gen8_blend_state.c | 1 -
src/mesa/drivers/dri/i965/gen8_depth_state.c | 2 +-
src/mesa/drivers/dri/i965/gen8_disable.c | 1 -
src/mesa/drivers/dri/i965/gen8_draw_upload.c | 1 -
src/mesa/drivers/dri/i965/gen8_gs_state.c | 1 -
src/mesa/drivers/dri/i965/gen8_misc_state.c | 1 -
src/mesa/drivers/dri/i965/gen8_multisample_state.c | 2 --
src/mesa/drivers/dri/i965/gen8_ps_state.c | 1 -
src/mesa/drivers/dri/i965/gen8_sf_state.c | 1 -
src/mesa/drivers/dri/i965/gen8_sol_state.c | 1 -
src/mesa/drivers/dri/i965/gen8_surface_state.c | 1 -
src/mesa/drivers/dri/i965/gen8_viewport_state.c | 1 -
src/mesa/drivers/dri/i965/gen8_vs_state.c | 1 -
src/mesa/drivers/dri/i965/gen8_wm_depth_stencil.c | 1 -
src/mesa/drivers/dri/i965/intel_batchbuffer.h | 3 ++-
src/mesa/drivers/dri/i965/intel_blit.c | 1 -
src/mesa/drivers/dri/i965/intel_buffer_objects.c | 1 -
src/mesa/drivers/dri/i965/intel_buffer_objects.h | 3 ++-
src/mesa/drivers/dri/i965/intel_extensions.c | 1 -
src/mesa/drivers/dri/i965/intel_fbo.c | 1 -
src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 1 -
src/mesa/drivers/dri/i965/intel_pixel_bitmap.c | 1 -
src/mesa/drivers/dri/i965/intel_pixel_copy.c | 1 -
src/mesa/drivers/dri/i965/intel_pixel_read.c | 1 -
src/mesa/drivers/dri/i965/intel_screen.c | 2 +-
src/mesa/drivers/dri/i965/intel_syncobj.c | 1 -
src/mesa/drivers/dri/i965/intel_tex_image.c | 1 -
src/mesa/drivers/dri/i965/intel_tex_subimage.c | 1 -
src/mesa/drivers/dri/i965/intel_upload.c | 1 -
95 files changed, 25 insertions(+), 106 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_binding_tables.c
b/src/mesa/drivers/dri/i965/brw_binding_tables.c
index b188fc7..9fe4bc8 100644
--- a/src/mesa/drivers/dri/i965/brw_binding_tables.c
+++ b/src/mesa/drivers/dri/i965/brw_binding_tables.c
@@ -42,7 +42,8 @@
#include "brw_context.h"
#include "brw_defines.h"
#include "brw_state.h"
-#include "intel_batchbuffer.h"
+
+#include "intel_reg.h"
static const GLuint stage_to_bt_edit[] = {
[MESA_SHADER_VERTEX] = _3DSTATE_BINDING_TABLE_EDIT_VS,
diff --git a/src/mesa/drivers/dri/i965/brw_blorp.cpp
b/src/mesa/drivers/dri/i965/brw_blorp.cpp
index eac1f00..3804f24 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp.cpp
@@ -22,7 +22,6 @@
*/
#include <errno.h>
-#include "intel_batchbuffer.h"
#include "intel_fbo.h"
#include "brw_blorp.h"
diff --git a/src/mesa/drivers/dri/i965/brw_cc.c
b/src/mesa/drivers/dri/i965/brw_cc.c
index 354c733..6fa1048 100644
--- a/src/mesa/drivers/dri/i965/brw_cc.c
+++ b/src/mesa/drivers/dri/i965/brw_cc.c
@@ -36,7 +36,6 @@
#include "brw_util.h"
#include "main/macros.h"
#include "main/stencil.h"
-#include "intel_batchbuffer.h"
static void
brw_upload_cc_vp(struct brw_context *brw)
diff --git a/src/mesa/drivers/dri/i965/brw_clear.c
b/src/mesa/drivers/dri/i965/brw_clear.c
index f981388..571e692 100644
--- a/src/mesa/drivers/dri/i965/brw_clear.c
+++ b/src/mesa/drivers/dri/i965/brw_clear.c
@@ -32,7 +32,6 @@
#include "swrast/swrast.h"
#include "drivers/common/meta.h"
-#include "intel_batchbuffer.h"
#include "intel_blit.h"
#include "intel_fbo.h"
#include "intel_mipmap_tree.h"
diff --git a/src/mesa/drivers/dri/i965/brw_clip.c
b/src/mesa/drivers/dri/i965/brw_clip.c
index 3a73c64..e044375 100644
--- a/src/mesa/drivers/dri/i965/brw_clip.c
+++ b/src/mesa/drivers/dri/i965/brw_clip.c
@@ -33,8 +33,6 @@
#include "main/macros.h"
#include "main/enums.h"
-#include "intel_batchbuffer.h"
-
#include "brw_defines.h"
#include "brw_context.h"
#include "brw_eu.h"
diff --git a/src/mesa/drivers/dri/i965/brw_clip_line.c
b/src/mesa/drivers/dri/i965/brw_clip_line.c
index 8e34f7c..65db789 100644
--- a/src/mesa/drivers/dri/i965/brw_clip_line.c
+++ b/src/mesa/drivers/dri/i965/brw_clip_line.c
@@ -34,8 +34,6 @@
#include "main/enums.h"
#include "program/program.h"
-#include "intel_batchbuffer.h"
-
#include "brw_defines.h"
#include "brw_context.h"
#include "brw_eu.h"
diff --git a/src/mesa/drivers/dri/i965/brw_clip_point.c
b/src/mesa/drivers/dri/i965/brw_clip_point.c
index 81487d3..9c886ff 100644
--- a/src/mesa/drivers/dri/i965/brw_clip_point.c
+++ b/src/mesa/drivers/dri/i965/brw_clip_point.c
@@ -34,8 +34,6 @@
#include "main/enums.h"
#include "program/program.h"
-#include "intel_batchbuffer.h"
-
#include "brw_defines.h"
#include "brw_context.h"
#include "brw_eu.h"
diff --git a/src/mesa/drivers/dri/i965/brw_clip_tri.c
b/src/mesa/drivers/dri/i965/brw_clip_tri.c
index cca7eb1..64db7e4 100644
--- a/src/mesa/drivers/dri/i965/brw_clip_tri.c
+++ b/src/mesa/drivers/dri/i965/brw_clip_tri.c
@@ -34,8 +34,6 @@
#include "main/enums.h"
#include "program/program.h"
-#include "intel_batchbuffer.h"
-
#include "brw_defines.h"
#include "brw_context.h"
#include "brw_eu.h"
diff --git a/src/mesa/drivers/dri/i965/brw_clip_unfilled.c
b/src/mesa/drivers/dri/i965/brw_clip_unfilled.c
index 6baf620..48c2648 100644
--- a/src/mesa/drivers/dri/i965/brw_clip_unfilled.c
+++ b/src/mesa/drivers/dri/i965/brw_clip_unfilled.c
@@ -34,8 +34,6 @@
#include "main/enums.h"
#include "program/program.h"
-#include "intel_batchbuffer.h"
-
#include "brw_defines.h"
#include "brw_context.h"
#include "brw_eu.h"
diff --git a/src/mesa/drivers/dri/i965/brw_clip_util.c
b/src/mesa/drivers/dri/i965/brw_clip_util.c
index 40ad144..7b953b2 100644
--- a/src/mesa/drivers/dri/i965/brw_clip_util.c
+++ b/src/mesa/drivers/dri/i965/brw_clip_util.c
@@ -35,8 +35,6 @@
#include "main/enums.h"
#include "program/program.h"
-#include "intel_batchbuffer.h"
-
#include "brw_defines.h"
#include "brw_context.h"
#include "brw_eu.h"
diff --git a/src/mesa/drivers/dri/i965/brw_compute.c
b/src/mesa/drivers/dri/i965/brw_compute.c
index 5693ab5..3342f39 100644
--- a/src/mesa/drivers/dri/i965/brw_compute.c
+++ b/src/mesa/drivers/dri/i965/brw_compute.c
@@ -30,7 +30,6 @@
#include "brw_context.h"
#include "brw_draw.h"
#include "brw_state.h"
-#include "intel_batchbuffer.h"
#include "brw_defines.h"
diff --git a/src/mesa/drivers/dri/i965/brw_conditional_render.c
b/src/mesa/drivers/dri/i965/brw_conditional_render.c
index 6d37c3b..ffd10a6 100644
--- a/src/mesa/drivers/dri/i965/brw_conditional_render.c
+++ b/src/mesa/drivers/dri/i965/brw_conditional_render.c
@@ -35,7 +35,7 @@
#include "brw_context.h"
#include "brw_defines.h"
-#include "intel_batchbuffer.h"
+#include "intel_reg.h"
static void
set_predicate_enable(struct brw_context *brw,
diff --git a/src/mesa/drivers/dri/i965/brw_context.c
b/src/mesa/drivers/dri/i965/brw_context.c
index 72f3897..8e02c69 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -54,7 +54,6 @@
#include "brw_draw.h"
#include "brw_state.h"
-#include "intel_batchbuffer.h"
#include "intel_buffer_objects.h"
#include "intel_buffers.h"
#include "intel_fbo.h"
diff --git a/src/mesa/drivers/dri/i965/brw_context.h
b/src/mesa/drivers/dri/i965/brw_context.h
index 166b852..73fc7b8 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -2034,4 +2034,7 @@ void gen7_emit_cs_stall_flush(struct brw_context *brw);
}
#endif
+/* Temporary include to hide some mechanical changes for brw-batch */
+#include "intel_batchbuffer.h"
+
#endif
diff --git a/src/mesa/drivers/dri/i965/brw_cs.cpp
b/src/mesa/drivers/dri/i965/brw_cs.cpp
index 29ee75b..b0c0272 100644
--- a/src/mesa/drivers/dri/i965/brw_cs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_cs.cpp
@@ -30,7 +30,6 @@
#include "brw_wm.h"
#include "intel_mipmap_tree.h"
#include "brw_state.h"
-#include "intel_batchbuffer.h"
extern "C"
bool
diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c
b/src/mesa/drivers/dri/i965/brw_curbe.c
index a149ce3..d0c83af 100644
--- a/src/mesa/drivers/dri/i965/brw_curbe.c
+++ b/src/mesa/drivers/dri/i965/brw_curbe.c
@@ -57,7 +57,6 @@
#include "program/prog_parameter.h"
#include "program/prog_print.h"
#include "program/prog_statevars.h"
-#include "intel_batchbuffer.h"
#include "intel_buffer_objects.h"
#include "brw_context.h"
#include "brw_defines.h"
diff --git a/src/mesa/drivers/dri/i965/brw_draw.c
b/src/mesa/drivers/dri/i965/brw_draw.c
index e092ef4..611e585 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -48,11 +48,11 @@
#include "brw_state.h"
#include "brw_vs.h"
-#include "intel_batchbuffer.h"
#include "intel_buffers.h"
#include "intel_fbo.h"
#include "intel_mipmap_tree.h"
#include "intel_buffer_objects.h"
+#include "intel_reg.h"
#define FILE_DEBUG_FLAG DEBUG_PRIMS
diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c
b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index cbfd585..076f075 100644
--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@ -37,7 +37,6 @@
#include "brw_context.h"
#include "brw_state.h"
-#include "intel_batchbuffer.h"
#include "intel_buffer_objects.h"
static const GLuint double_types[5] = {
diff --git a/src/mesa/drivers/dri/i965/brw_ff_gs.c
b/src/mesa/drivers/dri/i965/brw_ff_gs.c
index f72f37f..bd452c3 100644
--- a/src/mesa/drivers/dri/i965/brw_ff_gs.c
+++ b/src/mesa/drivers/dri/i965/brw_ff_gs.c
@@ -34,8 +34,6 @@
#include "main/enums.h"
#include "main/transformfeedback.h"
-#include "intel_batchbuffer.h"
-
#include "brw_defines.h"
#include "brw_context.h"
#include "brw_eu.h"
diff --git a/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c
b/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c
index 50bda61..56a29b4 100644
--- a/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c
@@ -35,7 +35,6 @@
#include "main/enums.h"
#include "program/program.h"
-#include "intel_batchbuffer.h"
#include "brw_defines.h"
#include "brw_context.h"
diff --git a/src/mesa/drivers/dri/i965/brw_meta_fast_clear.c
b/src/mesa/drivers/dri/i965/brw_meta_fast_clear.c
index f5ecbb5..ac2e08d 100644
--- a/src/mesa/drivers/dri/i965/brw_meta_fast_clear.c
+++ b/src/mesa/drivers/dri/i965/brw_meta_fast_clear.c
@@ -49,7 +49,6 @@
#include "brw_context.h"
#include "brw_draw.h"
#include "intel_fbo.h"
-#include "intel_batchbuffer.h"
#include "brw_blorp.h"
diff --git a/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c
b/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c
index aa6df16..7f3577b 100644
--- a/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c
+++ b/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c
@@ -43,7 +43,6 @@
*/
#include "brw_context.h"
-#include "intel_batchbuffer.h"
#include "intel_fbo.h"
#include "main/blit.h"
diff --git a/src/mesa/drivers/dri/i965/brw_meta_updownsample.c
b/src/mesa/drivers/dri/i965/brw_meta_updownsample.c
index f39d50a..37a0968 100644
--- a/src/mesa/drivers/dri/i965/brw_meta_updownsample.c
+++ b/src/mesa/drivers/dri/i965/brw_meta_updownsample.c
@@ -22,7 +22,6 @@
*/
#include "brw_context.h"
-#include "intel_batchbuffer.h"
#include "intel_fbo.h"
#include "main/blit.h"
diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c
b/src/mesa/drivers/dri/i965/brw_misc_state.c
index e9d9467..122f450 100644
--- a/src/mesa/drivers/dri/i965/brw_misc_state.c
+++ b/src/mesa/drivers/dri/i965/brw_misc_state.c
@@ -31,9 +31,9 @@
-#include "intel_batchbuffer.h"
#include "intel_fbo.h"
#include "intel_mipmap_tree.h"
+#include "intel_reg.h"
#include "brw_context.h"
#include "brw_state.h"
diff --git a/src/mesa/drivers/dri/i965/brw_performance_monitor.c
b/src/mesa/drivers/dri/i965/brw_performance_monitor.c
index 7e90e8a..f5f180e 100644
--- a/src/mesa/drivers/dri/i965/brw_performance_monitor.c
+++ b/src/mesa/drivers/dri/i965/brw_performance_monitor.c
@@ -54,7 +54,8 @@
#include "brw_context.h"
#include "brw_defines.h"
-#include "intel_batchbuffer.h"
+
+#include "intel_reg.h"
#define FILE_DEBUG_FLAG DEBUG_PERFMON
diff --git a/src/mesa/drivers/dri/i965/brw_pipe_control.c
b/src/mesa/drivers/dri/i965/brw_pipe_control.c
index 872bfe8..366f987 100644
--- a/src/mesa/drivers/dri/i965/brw_pipe_control.c
+++ b/src/mesa/drivers/dri/i965/brw_pipe_control.c
@@ -22,7 +22,6 @@
*/
#include "brw_context.h"
-#include "intel_batchbuffer.h"
#include "intel_fbo.h"
#include "intel_reg.h"
diff --git a/src/mesa/drivers/dri/i965/brw_primitive_restart.c
b/src/mesa/drivers/dri/i965/brw_primitive_restart.c
index 6ed79d7..6ad184c 100644
--- a/src/mesa/drivers/dri/i965/brw_primitive_restart.c
+++ b/src/mesa/drivers/dri/i965/brw_primitive_restart.c
@@ -33,8 +33,6 @@
#include "brw_defines.h"
#include "brw_draw.h"
-#include "intel_batchbuffer.h"
-
/**
* Check if the hardware's cut index support can handle the primitive
* restart index value (pre-Haswell only).
diff --git a/src/mesa/drivers/dri/i965/brw_program.c
b/src/mesa/drivers/dri/i965/brw_program.c
index 467a893..2157b86 100644
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -45,7 +45,8 @@
#include "brw_shader.h"
#include "brw_nir.h"
#include "brw_wm.h"
-#include "intel_batchbuffer.h"
+
+#include "intel_reg.h"
static unsigned
get_new_program_id(struct intel_screen *screen)
diff --git a/src/mesa/drivers/dri/i965/brw_queryobj.c
b/src/mesa/drivers/dri/i965/brw_queryobj.c
index d6b012c..3c0547f 100644
--- a/src/mesa/drivers/dri/i965/brw_queryobj.c
+++ b/src/mesa/drivers/dri/i965/brw_queryobj.c
@@ -40,7 +40,7 @@
#include "brw_context.h"
#include "brw_defines.h"
#include "brw_state.h"
-#include "intel_batchbuffer.h"
+
#include "intel_reg.h"
/**
diff --git a/src/mesa/drivers/dri/i965/brw_sampler_state.c
b/src/mesa/drivers/dri/i965/brw_sampler_state.c
index 2021bb3..0385806 100644
--- a/src/mesa/drivers/dri/i965/brw_sampler_state.c
+++ b/src/mesa/drivers/dri/i965/brw_sampler_state.c
@@ -39,7 +39,7 @@
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
-#include "intel_batchbuffer.h"
+
#include "intel_mipmap_tree.h"
#include "main/macros.h"
diff --git a/src/mesa/drivers/dri/i965/brw_sf.c
b/src/mesa/drivers/dri/i965/brw_sf.c
index 872464c..52deb57 100644
--- a/src/mesa/drivers/dri/i965/brw_sf.c
+++ b/src/mesa/drivers/dri/i965/brw_sf.c
@@ -36,8 +36,6 @@
#include "main/enums.h"
#include "main/fbobject.h"
-#include "intel_batchbuffer.h"
-
#include "brw_defines.h"
#include "brw_context.h"
#include "brw_eu.h"
diff --git a/src/mesa/drivers/dri/i965/brw_sf_emit.c
b/src/mesa/drivers/dri/i965/brw_sf_emit.c
index b3ee5c1..28e2e56 100644
--- a/src/mesa/drivers/dri/i965/brw_sf_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_sf_emit.c
@@ -34,8 +34,6 @@
#include "main/macros.h"
#include "main/enums.h"
-#include "intel_batchbuffer.h"
-
#include "brw_defines.h"
#include "brw_context.h"
#include "brw_eu.h"
diff --git a/src/mesa/drivers/dri/i965/brw_state_batch.c
b/src/mesa/drivers/dri/i965/brw_state_batch.c
index d79e0ea..d785c89 100644
--- a/src/mesa/drivers/dri/i965/brw_state_batch.c
+++ b/src/mesa/drivers/dri/i965/brw_state_batch.c
@@ -30,7 +30,6 @@
*/
#include "brw_state.h"
-#include "intel_batchbuffer.h"
#include "main/imports.h"
#include "util/ralloc.h"
diff --git a/src/mesa/drivers/dri/i965/brw_state_cache.c
b/src/mesa/drivers/dri/i965/brw_state_cache.c
index 693441c..546efc5 100644
--- a/src/mesa/drivers/dri/i965/brw_state_cache.c
+++ b/src/mesa/drivers/dri/i965/brw_state_cache.c
@@ -45,7 +45,6 @@
*/
#include "main/imports.h"
-#include "intel_batchbuffer.h"
#include "brw_state.h"
#include "brw_vs.h"
#include "brw_wm.h"
diff --git a/src/mesa/drivers/dri/i965/brw_state_dump.c
b/src/mesa/drivers/dri/i965/brw_state_dump.c
index b6f4d59..620c7ca 100644
--- a/src/mesa/drivers/dri/i965/brw_state_dump.c
+++ b/src/mesa/drivers/dri/i965/brw_state_dump.c
@@ -26,7 +26,6 @@
*/
#include "main/mtypes.h"
-#include "intel_batchbuffer.h"
#include "brw_context.h"
#include "brw_defines.h"
diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c
b/src/mesa/drivers/dri/i965/brw_state_upload.c
index 6096b49..03e9c3b 100644
--- a/src/mesa/drivers/dri/i965/brw_state_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_state_upload.c
@@ -34,8 +34,8 @@
#include "brw_context.h"
#include "brw_state.h"
#include "drivers/common/meta.h"
-#include "intel_batchbuffer.h"
#include "intel_buffers.h"
+#include "intel_reg.h"
#include "brw_vs.h"
#include "brw_ff_gs.h"
#include "brw_gs.h"
diff --git a/src/mesa/drivers/dri/i965/brw_urb.c
b/src/mesa/drivers/dri/i965/brw_urb.c
index 6078c38..f01bcfb 100644
--- a/src/mesa/drivers/dri/i965/brw_urb.c
+++ b/src/mesa/drivers/dri/i965/brw_urb.c
@@ -31,11 +31,12 @@
-#include "intel_batchbuffer.h"
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
+#include "intel_reg.h"
+
#define VS 0
#define GS 1
#define CLP 2
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index 72aad96..3250eb8 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -38,7 +38,6 @@
#include "main/framebuffer.h"
#include "intel_mipmap_tree.h"
-#include "intel_batchbuffer.h"
#include "intel_tex.h"
#include "intel_fbo.h"
#include "intel_buffer_objects.h"
diff --git a/src/mesa/drivers/dri/i965/gen6_blorp.cpp
b/src/mesa/drivers/dri/i965/gen6_blorp.cpp
index 54c4a6d..8154bc1 100644
--- a/src/mesa/drivers/dri/i965/gen6_blorp.cpp
+++ b/src/mesa/drivers/dri/i965/gen6_blorp.cpp
@@ -23,7 +23,6 @@
#include <assert.h>
-#include "intel_batchbuffer.h"
#include "intel_fbo.h"
#include "intel_mipmap_tree.h"
diff --git a/src/mesa/drivers/dri/i965/gen6_cc.c
b/src/mesa/drivers/dri/i965/gen6_cc.c
index 3bab8f4..50e7332 100644
--- a/src/mesa/drivers/dri/i965/gen6_cc.c
+++ b/src/mesa/drivers/dri/i965/gen6_cc.c
@@ -29,7 +29,6 @@
#include "brw_state.h"
#include "brw_defines.h"
#include "brw_util.h"
-#include "intel_batchbuffer.h"
#include "main/macros.h"
#include "main/enums.h"
#include "main/glformats.h"
diff --git a/src/mesa/drivers/dri/i965/gen6_clip_state.c
b/src/mesa/drivers/dri/i965/gen6_clip_state.c
index 9a29366..d7fe872 100644
--- a/src/mesa/drivers/dri/i965/gen6_clip_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_clip_state.c
@@ -29,7 +29,6 @@
#include "brw_state.h"
#include "brw_defines.h"
#include "brw_util.h"
-#include "intel_batchbuffer.h"
#include "main/fbobject.h"
#include "main/framebuffer.h"
diff --git a/src/mesa/drivers/dri/i965/gen6_depth_state.c
b/src/mesa/drivers/dri/i965/gen6_depth_state.c
index febd478..e375ef9 100644
--- a/src/mesa/drivers/dri/i965/gen6_depth_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_depth_state.c
@@ -22,7 +22,6 @@
*/
-#include "intel_batchbuffer.h"
#include "intel_fbo.h"
#include "intel_mipmap_tree.h"
diff --git a/src/mesa/drivers/dri/i965/gen6_depthstencil.c
b/src/mesa/drivers/dri/i965/gen6_depthstencil.c
index 2c625c9..ed731c5 100644
--- a/src/mesa/drivers/dri/i965/gen6_depthstencil.c
+++ b/src/mesa/drivers/dri/i965/gen6_depthstencil.c
@@ -25,7 +25,6 @@
*
*/
-#include "intel_batchbuffer.h"
#include "intel_fbo.h"
#include "brw_context.h"
#include "brw_defines.h"
diff --git a/src/mesa/drivers/dri/i965/gen6_gs_state.c
b/src/mesa/drivers/dri/i965/gen6_gs_state.c
index eb4c586..3d4bb68 100644
--- a/src/mesa/drivers/dri/i965/gen6_gs_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_gs_state.c
@@ -28,7 +28,6 @@
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
-#include "intel_batchbuffer.h"
static void
gen6_upload_gs_push_constants(struct brw_context *brw)
diff --git a/src/mesa/drivers/dri/i965/gen6_multisample_state.c
b/src/mesa/drivers/dri/i965/gen6_multisample_state.c
index 8444c0c..209f1f5 100644
--- a/src/mesa/drivers/dri/i965/gen6_multisample_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_multisample_state.c
@@ -21,8 +21,6 @@
* IN THE SOFTWARE.
*/
-#include "intel_batchbuffer.h"
-
#include "brw_context.h"
#include "brw_defines.h"
#include "brw_multisample_state.h"
diff --git a/src/mesa/drivers/dri/i965/gen6_queryobj.c
b/src/mesa/drivers/dri/i965/gen6_queryobj.c
index 9f4a5db..f474c4b 100644
--- a/src/mesa/drivers/dri/i965/gen6_queryobj.c
+++ b/src/mesa/drivers/dri/i965/gen6_queryobj.c
@@ -36,7 +36,6 @@
#include "brw_context.h"
#include "brw_defines.h"
#include "brw_state.h"
-#include "intel_batchbuffer.h"
#include "intel_reg.h"
/*
diff --git a/src/mesa/drivers/dri/i965/gen6_sampler_state.c
b/src/mesa/drivers/dri/i965/gen6_sampler_state.c
index 9e7da58..ecc6b21 100644
--- a/src/mesa/drivers/dri/i965/gen6_sampler_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_sampler_state.c
@@ -28,7 +28,6 @@
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
-#include "intel_batchbuffer.h"
static void
upload_sampler_state_pointers(struct brw_context *brw)
diff --git a/src/mesa/drivers/dri/i965/gen6_scissor_state.c
b/src/mesa/drivers/dri/i965/gen6_scissor_state.c
index 17b4a7f..4a343f4 100644
--- a/src/mesa/drivers/dri/i965/gen6_scissor_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_scissor_state.c
@@ -28,7 +28,6 @@
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
-#include "intel_batchbuffer.h"
#include "main/fbobject.h"
#include "main/framebuffer.h"
diff --git a/src/mesa/drivers/dri/i965/gen6_sf_state.c
b/src/mesa/drivers/dri/i965/gen6_sf_state.c
index 4068f28..61e70e4 100644
--- a/src/mesa/drivers/dri/i965/gen6_sf_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_sf_state.c
@@ -32,7 +32,6 @@
#include "main/macros.h"
#include "main/fbobject.h"
#include "main/framebuffer.h"
-#include "intel_batchbuffer.h"
/**
* Determine the appropriate attribute override value to store into the
diff --git a/src/mesa/drivers/dri/i965/gen6_sol.c
b/src/mesa/drivers/dri/i965/gen6_sol.c
index 3899ce9..f8fb389 100644
--- a/src/mesa/drivers/dri/i965/gen6_sol.c
+++ b/src/mesa/drivers/dri/i965/gen6_sol.c
@@ -29,7 +29,6 @@
#include "main/bufferobj.h"
#include "main/macros.h"
#include "brw_context.h"
-#include "intel_batchbuffer.h"
#include "brw_defines.h"
#include "brw_state.h"
#include "main/transformfeedback.h"
diff --git a/src/mesa/drivers/dri/i965/gen6_surface_state.c
b/src/mesa/drivers/dri/i965/gen6_surface_state.c
index 39de62f..ba3980d 100644
--- a/src/mesa/drivers/dri/i965/gen6_surface_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_surface_state.c
@@ -30,7 +30,6 @@
#include "program/prog_parameter.h"
#include "intel_mipmap_tree.h"
-#include "intel_batchbuffer.h"
#include "intel_tex.h"
#include "intel_fbo.h"
#include "intel_buffer_objects.h"
diff --git a/src/mesa/drivers/dri/i965/gen6_urb.c
b/src/mesa/drivers/dri/i965/gen6_urb.c
index c7311fd..78cb973 100644
--- a/src/mesa/drivers/dri/i965/gen6_urb.c
+++ b/src/mesa/drivers/dri/i965/gen6_urb.c
@@ -26,7 +26,6 @@
*/
#include "main/macros.h"
-#include "intel_batchbuffer.h"
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
diff --git a/src/mesa/drivers/dri/i965/gen6_viewport_state.c
b/src/mesa/drivers/dri/i965/gen6_viewport_state.c
index 11b9a36..d9b939b 100644
--- a/src/mesa/drivers/dri/i965/gen6_viewport_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_viewport_state.c
@@ -28,7 +28,6 @@
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
-#include "intel_batchbuffer.h"
#include "main/fbobject.h"
#include "main/framebuffer.h"
#include "main/viewport.h"
diff --git a/src/mesa/drivers/dri/i965/gen6_vs_state.c
b/src/mesa/drivers/dri/i965/gen6_vs_state.c
index 35d10ef..89bb426 100644
--- a/src/mesa/drivers/dri/i965/gen6_vs_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_vs_state.c
@@ -29,9 +29,9 @@
#include "brw_state.h"
#include "brw_defines.h"
#include "brw_util.h"
+#include "intel_reg.h"
#include "program/prog_parameter.h"
#include "program/prog_statevars.h"
-#include "intel_batchbuffer.h"
#include "glsl/glsl_parser_extras.h"
/**
diff --git a/src/mesa/drivers/dri/i965/gen6_wm_state.c
b/src/mesa/drivers/dri/i965/gen6_wm_state.c
index d1748ba..e3b6054 100644
--- a/src/mesa/drivers/dri/i965/gen6_wm_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_wm_state.c
@@ -34,7 +34,6 @@
#include "program/prog_parameter.h"
#include "program/prog_statevars.h"
#include "main/framebuffer.h"
-#include "intel_batchbuffer.h"
static void
gen6_upload_wm_push_constants(struct brw_context *brw)
diff --git a/src/mesa/drivers/dri/i965/gen7_blorp.cpp
b/src/mesa/drivers/dri/i965/gen7_blorp.cpp
index 9822dc1..4fa97e5 100644
--- a/src/mesa/drivers/dri/i965/gen7_blorp.cpp
+++ b/src/mesa/drivers/dri/i965/gen7_blorp.cpp
@@ -23,7 +23,6 @@
#include <assert.h>
-#include "intel_batchbuffer.h"
#include "intel_fbo.h"
#include "intel_mipmap_tree.h"
diff --git a/src/mesa/drivers/dri/i965/gen7_disable.c
b/src/mesa/drivers/dri/i965/gen7_disable.c
index bb50969..9e25b38 100644
--- a/src/mesa/drivers/dri/i965/gen7_disable.c
+++ b/src/mesa/drivers/dri/i965/gen7_disable.c
@@ -24,7 +24,6 @@
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
-#include "intel_batchbuffer.h"
static void
disable_stages(struct brw_context *brw)
diff --git a/src/mesa/drivers/dri/i965/gen7_gs_state.c
b/src/mesa/drivers/dri/i965/gen7_gs_state.c
index 8d6d3fe..02add4c 100644
--- a/src/mesa/drivers/dri/i965/gen7_gs_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_gs_state.c
@@ -24,7 +24,6 @@
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
-#include "intel_batchbuffer.h"
static void
upload_gs_state(struct brw_context *brw)
diff --git a/src/mesa/drivers/dri/i965/gen7_misc_state.c
b/src/mesa/drivers/dri/i965/gen7_misc_state.c
index a14d4a0..f792cc6 100644
--- a/src/mesa/drivers/dri/i965/gen7_misc_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_misc_state.c
@@ -22,7 +22,6 @@
*/
#include "main/mtypes.h"
-#include "intel_batchbuffer.h"
#include "intel_mipmap_tree.h"
#include "intel_fbo.h"
#include "brw_context.h"
diff --git a/src/mesa/drivers/dri/i965/gen7_sf_state.c
b/src/mesa/drivers/dri/i965/gen7_sf_state.c
index 698b3d4..661b3cc 100644
--- a/src/mesa/drivers/dri/i965/gen7_sf_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_sf_state.c
@@ -28,7 +28,6 @@
#include "main/macros.h"
#include "main/fbobject.h"
#include "main/framebuffer.h"
-#include "intel_batchbuffer.h"
static void
upload_sbe_state(struct brw_context *brw)
diff --git a/src/mesa/drivers/dri/i965/gen7_sol_state.c
b/src/mesa/drivers/dri/i965/gen7_sol_state.c
index da6f2dd..67004b5 100644
--- a/src/mesa/drivers/dri/i965/gen7_sol_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_sol_state.c
@@ -31,8 +31,8 @@
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
-#include "intel_batchbuffer.h"
#include "intel_buffer_objects.h"
+#include "intel_reg.h"
#include "main/transformfeedback.h"
static void
diff --git a/src/mesa/drivers/dri/i965/gen7_urb.c
b/src/mesa/drivers/dri/i965/gen7_urb.c
index 6916217..897df6c 100644
--- a/src/mesa/drivers/dri/i965/gen7_urb.c
+++ b/src/mesa/drivers/dri/i965/gen7_urb.c
@@ -22,7 +22,6 @@
*/
#include "main/macros.h"
-#include "intel_batchbuffer.h"
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
diff --git a/src/mesa/drivers/dri/i965/gen7_viewport_state.c
b/src/mesa/drivers/dri/i965/gen7_viewport_state.c
index c75dc99..5e50730 100644
--- a/src/mesa/drivers/dri/i965/gen7_viewport_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_viewport_state.c
@@ -24,7 +24,6 @@
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
-#include "intel_batchbuffer.h"
#include "main/fbobject.h"
#include "main/framebuffer.h"
#include "main/viewport.h"
diff --git a/src/mesa/drivers/dri/i965/gen7_vs_state.c
b/src/mesa/drivers/dri/i965/gen7_vs_state.c
index 00bc6f2..1099c8b 100644
--- a/src/mesa/drivers/dri/i965/gen7_vs_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_vs_state.c
@@ -27,7 +27,6 @@
#include "brw_util.h"
#include "program/prog_parameter.h"
#include "program/prog_statevars.h"
-#include "intel_batchbuffer.h"
void
diff --git a/src/mesa/drivers/dri/i965/gen7_wm_state.c
b/src/mesa/drivers/dri/i965/gen7_wm_state.c
index d7be58d..3c8d516 100644
--- a/src/mesa/drivers/dri/i965/gen7_wm_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_wm_state.c
@@ -31,7 +31,6 @@
#include "program/prog_parameter.h"
#include "program/prog_statevars.h"
#include "main/framebuffer.h"
-#include "intel_batchbuffer.h"
static void
upload_wm_state(struct brw_context *brw)
diff --git a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
index 15ab2b0..5a9241d 100644
--- a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
@@ -28,7 +28,6 @@
#include "program/prog_parameter.h"
#include "intel_mipmap_tree.h"
-#include "intel_batchbuffer.h"
#include "intel_tex.h"
#include "intel_fbo.h"
#include "intel_buffer_objects.h"
diff --git a/src/mesa/drivers/dri/i965/gen8_blend_state.c
b/src/mesa/drivers/dri/i965/gen8_blend_state.c
index 786c79a..31a3deb 100644
--- a/src/mesa/drivers/dri/i965/gen8_blend_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_blend_state.c
@@ -26,7 +26,6 @@
#include "brw_defines.h"
#include "brw_util.h"
#include "brw_wm.h"
-#include "intel_batchbuffer.h"
#include "main/macros.h"
#include "main/enums.h"
#include "main/glformats.h"
diff --git a/src/mesa/drivers/dri/i965/gen8_depth_state.c
b/src/mesa/drivers/dri/i965/gen8_depth_state.c
index 8f23702..480eaab 100644
--- a/src/mesa/drivers/dri/i965/gen8_depth_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_depth_state.c
@@ -21,10 +21,10 @@
* IN THE SOFTWARE.
*/
-#include "intel_batchbuffer.h"
#include "intel_mipmap_tree.h"
#include "intel_fbo.h"
#include "intel_resolve_map.h"
+#include "intel_reg.h"
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
diff --git a/src/mesa/drivers/dri/i965/gen8_disable.c
b/src/mesa/drivers/dri/i965/gen8_disable.c
index 32508e3..6790bbe 100644
--- a/src/mesa/drivers/dri/i965/gen8_disable.c
+++ b/src/mesa/drivers/dri/i965/gen8_disable.c
@@ -24,7 +24,6 @@
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
-#include "intel_batchbuffer.h"
static void
disable_stages(struct brw_context *brw)
diff --git a/src/mesa/drivers/dri/i965/gen8_draw_upload.c
b/src/mesa/drivers/dri/i965/gen8_draw_upload.c
index 1af90ec..dc5e915 100644
--- a/src/mesa/drivers/dri/i965/gen8_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/gen8_draw_upload.c
@@ -32,7 +32,6 @@
#include "brw_context.h"
#include "brw_state.h"
-#include "intel_batchbuffer.h"
#include "intel_buffer_objects.h"
static void
diff --git a/src/mesa/drivers/dri/i965/gen8_gs_state.c
b/src/mesa/drivers/dri/i965/gen8_gs_state.c
index 26a02d3..e5c3d23 100644
--- a/src/mesa/drivers/dri/i965/gen8_gs_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_gs_state.c
@@ -24,7 +24,6 @@
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
-#include "intel_batchbuffer.h"
static void
gen8_upload_gs_state(struct brw_context *brw)
diff --git a/src/mesa/drivers/dri/i965/gen8_misc_state.c
b/src/mesa/drivers/dri/i965/gen8_misc_state.c
index b20038e..83376cd 100644
--- a/src/mesa/drivers/dri/i965/gen8_misc_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_misc_state.c
@@ -21,7 +21,6 @@
* IN THE SOFTWARE.
*/
-#include "intel_batchbuffer.h"
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
diff --git a/src/mesa/drivers/dri/i965/gen8_multisample_state.c
b/src/mesa/drivers/dri/i965/gen8_multisample_state.c
index 75cbe06..0508a58 100644
--- a/src/mesa/drivers/dri/i965/gen8_multisample_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_multisample_state.c
@@ -21,8 +21,6 @@
* IN THE SOFTWARE.
*/
-#include "intel_batchbuffer.h"
-
#include "brw_context.h"
#include "brw_defines.h"
#include "brw_multisample_state.h"
diff --git a/src/mesa/drivers/dri/i965/gen8_ps_state.c
b/src/mesa/drivers/dri/i965/gen8_ps_state.c
index d544509..ae2cb37 100644
--- a/src/mesa/drivers/dri/i965/gen8_ps_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_ps_state.c
@@ -25,7 +25,6 @@
#include "program/program.h"
#include "brw_state.h"
#include "brw_defines.h"
-#include "intel_batchbuffer.h"
void
gen8_upload_ps_extra(struct brw_context *brw,
diff --git a/src/mesa/drivers/dri/i965/gen8_sf_state.c
b/src/mesa/drivers/dri/i965/gen8_sf_state.c
index 6b655ee..d9c7cfc 100644
--- a/src/mesa/drivers/dri/i965/gen8_sf_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_sf_state.c
@@ -27,7 +27,6 @@
#include "brw_util.h"
#include "main/macros.h"
#include "main/fbobject.h"
-#include "intel_batchbuffer.h"
static void
upload_sbe(struct brw_context *brw)
diff --git a/src/mesa/drivers/dri/i965/gen8_sol_state.c
b/src/mesa/drivers/dri/i965/gen8_sol_state.c
index 58ead68..b2f9c2e 100644
--- a/src/mesa/drivers/dri/i965/gen8_sol_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_sol_state.c
@@ -31,7 +31,6 @@
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
-#include "intel_batchbuffer.h"
#include "intel_buffer_objects.h"
#include "main/transformfeedback.h"
diff --git a/src/mesa/drivers/dri/i965/gen8_surface_state.c
b/src/mesa/drivers/dri/i965/gen8_surface_state.c
index 6c4d3e1..228bee7 100644
--- a/src/mesa/drivers/dri/i965/gen8_surface_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_surface_state.c
@@ -29,7 +29,6 @@
#include "program/prog_parameter.h"
#include "intel_mipmap_tree.h"
-#include "intel_batchbuffer.h"
#include "intel_tex.h"
#include "intel_fbo.h"
#include "intel_buffer_objects.h"
diff --git a/src/mesa/drivers/dri/i965/gen8_viewport_state.c
b/src/mesa/drivers/dri/i965/gen8_viewport_state.c
index 2692ad5..b340011 100644
--- a/src/mesa/drivers/dri/i965/gen8_viewport_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_viewport_state.c
@@ -24,7 +24,6 @@
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
-#include "intel_batchbuffer.h"
#include "main/fbobject.h"
#include "main/framebuffer.h"
#include "main/viewport.h"
diff --git a/src/mesa/drivers/dri/i965/gen8_vs_state.c
b/src/mesa/drivers/dri/i965/gen8_vs_state.c
index 28f5add..f14951d 100644
--- a/src/mesa/drivers/dri/i965/gen8_vs_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_vs_state.c
@@ -27,7 +27,6 @@
#include "brw_util.h"
#include "program/prog_parameter.h"
#include "program/prog_statevars.h"
-#include "intel_batchbuffer.h"
static void
upload_vs_state(struct brw_context *brw)
diff --git a/src/mesa/drivers/dri/i965/gen8_wm_depth_stencil.c
b/src/mesa/drivers/dri/i965/gen8_wm_depth_stencil.c
index 2c843b2..0f1128a 100644
--- a/src/mesa/drivers/dri/i965/gen8_wm_depth_stencil.c
+++ b/src/mesa/drivers/dri/i965/gen8_wm_depth_stencil.c
@@ -21,7 +21,6 @@
* IN THE SOFTWARE.
*/
-#include "intel_batchbuffer.h"
#include "intel_fbo.h"
#include "brw_context.h"
#include "brw_defines.h"
diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.h
b/src/mesa/drivers/dri/i965/intel_batchbuffer.h
index 84add92..c258579 100644
--- a/src/mesa/drivers/dri/i965/intel_batchbuffer.h
+++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.h
@@ -5,7 +5,6 @@
#include "brw_context.h"
#include "intel_bufmgr.h"
-#include "intel_reg.h"
#ifdef __cplusplus
extern "C" {
@@ -34,6 +33,8 @@ extern "C" {
#define BATCH_RESERVED 152
struct intel_batchbuffer;
+struct brw_context;
+enum brw_gpu_ring;
void intel_batchbuffer_emit_render_ring_prelude(struct brw_context *brw);
void intel_batchbuffer_init(struct brw_context *brw);
diff --git a/src/mesa/drivers/dri/i965/intel_blit.c
b/src/mesa/drivers/dri/i965/intel_blit.c
index 6d92580..90cb0ea 100644
--- a/src/mesa/drivers/dri/i965/intel_blit.c
+++ b/src/mesa/drivers/dri/i965/intel_blit.c
@@ -39,7 +39,6 @@
#include "intel_buffers.h"
#include "intel_fbo.h"
#include "intel_reg.h"
-#include "intel_batchbuffer.h"
#include "intel_mipmap_tree.h"
#define FILE_DEBUG_FLAG DEBUG_BLIT
diff --git a/src/mesa/drivers/dri/i965/intel_buffer_objects.c
b/src/mesa/drivers/dri/i965/intel_buffer_objects.c
index ff05b5c..77f634c 100644
--- a/src/mesa/drivers/dri/i965/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/i965/intel_buffer_objects.c
@@ -39,7 +39,6 @@
#include "brw_context.h"
#include "intel_blit.h"
#include "intel_buffer_objects.h"
-#include "intel_batchbuffer.h"
/**
* Map a buffer object; issue performance warnings if mapping causes stalls.
diff --git a/src/mesa/drivers/dri/i965/intel_buffer_objects.h
b/src/mesa/drivers/dri/i965/intel_buffer_objects.h
index 5eaf9dc..d46feac 100644
--- a/src/mesa/drivers/dri/i965/intel_buffer_objects.h
+++ b/src/mesa/drivers/dri/i965/intel_buffer_objects.h
@@ -30,7 +30,8 @@
#include "main/mtypes.h"
-struct brw_context;
+#include "brw_context.h"
+
struct gl_buffer_object;
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c
b/src/mesa/drivers/dri/i965/intel_extensions.c
index e7828c7..f10e69b 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -28,7 +28,6 @@
#include "main/version.h"
#include "brw_context.h"
-#include "intel_batchbuffer.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 72648b0..47518d9 100644
--- a/src/mesa/drivers/dri/i965/intel_fbo.c
+++ b/src/mesa/drivers/dri/i965/intel_fbo.c
@@ -43,7 +43,6 @@
#include "swrast/swrast.h"
#include "drivers/common/meta.h"
-#include "intel_batchbuffer.h"
#include "intel_buffers.h"
#include "intel_blit.h"
#include "intel_fbo.h"
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index e85c3f0..45a244e 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -28,7 +28,6 @@
#include <GL/gl.h>
#include <GL/internal/dri_interface.h>
-#include "intel_batchbuffer.h"
#include "intel_mipmap_tree.h"
#include "intel_resolve_map.h"
#include "intel_tex.h"
diff --git a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
index 224dc65..dd5ae1d 100644
--- a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
+++ b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
@@ -44,7 +44,6 @@
#include "brw_context.h"
#include "intel_screen.h"
-#include "intel_batchbuffer.h"
#include "intel_blit.h"
#include "intel_fbo.h"
#include "intel_image.h"
diff --git a/src/mesa/drivers/dri/i965/intel_pixel_copy.c
b/src/mesa/drivers/dri/i965/intel_pixel_copy.c
index ce053ed..668c29b 100644
--- a/src/mesa/drivers/dri/i965/intel_pixel_copy.c
+++ b/src/mesa/drivers/dri/i965/intel_pixel_copy.c
@@ -39,7 +39,6 @@
#include "intel_pixel.h"
#include "intel_fbo.h"
#include "intel_blit.h"
-#include "intel_batchbuffer.h"
#define FILE_DEBUG_FLAG DEBUG_PIXEL
diff --git a/src/mesa/drivers/dri/i965/intel_pixel_read.c
b/src/mesa/drivers/dri/i965/intel_pixel_read.c
index 3fe506e..6bc36de 100644
--- a/src/mesa/drivers/dri/i965/intel_pixel_read.c
+++ b/src/mesa/drivers/dri/i965/intel_pixel_read.c
@@ -39,7 +39,6 @@
#include "brw_context.h"
#include "intel_screen.h"
-#include "intel_batchbuffer.h"
#include "intel_blit.h"
#include "intel_buffers.h"
#include "intel_fbo.h"
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c
b/src/mesa/drivers/dri/i965/intel_screen.c
index 0b60f13..1d7e244 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -39,6 +39,7 @@
#include "swrast/s_renderbuffer.h"
#include "util/ralloc.h"
#include "brw_shader.h"
+#include "intel_reg.h"
#include "glsl/nir/nir.h"
#include "utils.h"
@@ -91,7 +92,6 @@ DRI_CONF_BEGIN
DRI_CONF_END
};
-#include "intel_batchbuffer.h"
#include "intel_buffers.h"
#include "intel_bufmgr.h"
#include "intel_fbo.h"
diff --git a/src/mesa/drivers/dri/i965/intel_syncobj.c
b/src/mesa/drivers/dri/i965/intel_syncobj.c
index c44c4be..3849e2e 100644
--- a/src/mesa/drivers/dri/i965/intel_syncobj.c
+++ b/src/mesa/drivers/dri/i965/intel_syncobj.c
@@ -41,7 +41,6 @@
#include "main/imports.h"
#include "brw_context.h"
-#include "intel_batchbuffer.h"
#include "intel_reg.h"
struct brw_fence {
diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c
b/src/mesa/drivers/dri/i965/intel_tex_image.c
index 93a8cde..7007490 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_image.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_image.c
@@ -19,7 +19,6 @@
#include "intel_mipmap_tree.h"
#include "intel_buffer_objects.h"
-#include "intel_batchbuffer.h"
#include "intel_tex.h"
#include "intel_blit.h"
#include "intel_fbo.h"
diff --git a/src/mesa/drivers/dri/i965/intel_tex_subimage.c
b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
index 31e511f..a688007 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_subimage.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
@@ -38,7 +38,6 @@
#include "drivers/common/meta.h"
#include "brw_context.h"
-#include "intel_batchbuffer.h"
#include "intel_tex.h"
#include "intel_mipmap_tree.h"
#include "intel_blit.h"
diff --git a/src/mesa/drivers/dri/i965/intel_upload.c
b/src/mesa/drivers/dri/i965/intel_upload.c
index 870aabc..308f210 100644
--- a/src/mesa/drivers/dri/i965/intel_upload.c
+++ b/src/mesa/drivers/dri/i965/intel_upload.c
@@ -36,7 +36,6 @@
#include "brw_context.h"
#include "intel_blit.h"
#include "intel_buffer_objects.h"
-#include "intel_batchbuffer.h"
#include "intel_fbo.h"
#include "intel_mipmap_tree.h"
--
2.5.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
