i965: Rename files with "intel_" prefix to "brw_"

v2: Rename intel_batchbuffer.c to intel_batch.c and
    intel_batchbuffer.h to intel_batch.h

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9510>

src/mesa/drivers/dri/i965/brw_batch.c

@@ -23,11 +23,11 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
 #include "brw_bufmgr.h"
-#include "intel_buffers.h"
-#include "intel_fbo.h"
+#include "brw_buffers.h"
+#include "brw_fbo.h"
 #include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_state.h"

src/mesa/drivers/dri/i965/brw_batch.h

@@ -1,5 +1,5 @@
-#ifndef INTEL_BATCHBUFFER_H
-#define INTEL_BATCHBUFFER_H
+#ifndef BRW_BATCH_H
+#define BRW_BATCH_H
 
 #include "main/mtypes.h"
 

src/mesa/drivers/dri/i965/brw_binding_tables.c

@@ -42,7 +42,7 @@
 #include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_state.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 /**
  * Upload a shader stage's binding table as indirect state.

src/mesa/drivers/dri/i965/brw_blit.c

@@ -31,11 +31,11 @@
 
 #include "brw_context.h"
 #include "brw_defines.h"
-#include "intel_blit.h"
-#include "intel_buffers.h"
-#include "intel_fbo.h"
-#include "intel_batchbuffer.h"
-#include "intel_mipmap_tree.h"
+#include "brw_blit.h"
+#include "brw_buffers.h"
+#include "brw_fbo.h"
+#include "brw_batch.h"
+#include "brw_mipmap_tree.h"
 
 #define FILE_DEBUG_FLAG DEBUG_BLIT
 

src/mesa/drivers/dri/i965/brw_blit.h

@@ -23,8 +23,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef INTEL_BLIT_H
-#define INTEL_BLIT_H
+#ifndef BRW_BLIT_H
+#define BRW_BLIT_H
 
 #include "brw_context.h"
 

src/mesa/drivers/dri/i965/brw_blorp.c

@@ -36,8 +36,8 @@
 #include "brw_defines.h"
 #include "brw_meta_util.h"
 #include "brw_state.h"
-#include "intel_buffer_objects.h"
-#include "intel_fbo.h"
+#include "brw_buffer_objects.h"
+#include "brw_fbo.h"
 #include "dev/gen_debug.h"
 
 #define FILE_DEBUG_FLAG DEBUG_BLORP

src/mesa/drivers/dri/i965/brw_blorp.h

@@ -25,7 +25,7 @@
 #define BRW_BLORP_H
 
 #include "blorp/blorp.h"
-#include "intel_mipmap_tree.h"
+#include "brw_mipmap_tree.h"
 #include "program/prog_instruction.h"
 
 #ifdef __cplusplus

src/mesa/drivers/dri/i965/brw_buffer_objects.c

@@ -38,8 +38,8 @@
 
 #include "brw_context.h"
 #include "brw_blorp.h"
-#include "intel_buffer_objects.h"
-#include "intel_batchbuffer.h"
+#include "brw_buffer_objects.h"
+#include "brw_batch.h"
 
 static void
 mark_buffer_gpu_usage(struct brw_buffer_object *intel_obj,

src/mesa/drivers/dri/i965/brw_buffer_objects.h

@@ -23,8 +23,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef INTEL_BUFFEROBJ_H
-#define INTEL_BUFFEROBJ_H
+#ifndef BRW_BUFFEROBJ_H
+#define BRW_BUFFEROBJ_H
 
 #include "main/mtypes.h"
 

src/mesa/drivers/dri/i965/brw_buffers.c

@@ -24,9 +24,9 @@
  */
 
 #include "brw_context.h"
-#include "intel_buffers.h"
-#include "intel_fbo.h"
-#include "intel_mipmap_tree.h"
+#include "brw_buffers.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
 
 #include "main/fbobject.h"
 #include "main/framebuffer.h"

src/mesa/drivers/dri/i965/brw_buffers.h

@@ -23,8 +23,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef INTEL_BUFFERS_H
-#define INTEL_BUFFERS_H
+#ifndef BRW_BUFFERS_H
+#define BRW_BUFFERS_H
 
 #include "dri_util.h"
 #include "drm-uapi/drm.h"
@@ -32,4 +32,4 @@
 
 extern void brw_init_buffer_functions(struct dd_function_table *functions);
 
-#endif /* INTEL_BUFFERS_H */
+#endif /* BRW_BUFFERS_H */

src/mesa/drivers/dri/i965/brw_bufmgr.h

@@ -31,8 +31,8 @@
  * Public definitions of Intel-specific bufmgr functions.
  */
 
-#ifndef INTEL_BUFMGR_H
-#define INTEL_BUFMGR_H
+#ifndef BRW_BUFMGR_H
+#define BRW_BUFMGR_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -402,4 +402,4 @@ bool brw_using_softpin(struct brw_bufmgr *bufmgr);
 #if defined(__cplusplus)
 }
 #endif
-#endif /* INTEL_BUFMGR_H */
+#endif /* BRW_BUFMGR_H */

src/mesa/drivers/dri/i965/brw_clear.c

@@ -29,9 +29,9 @@
 #include "swrast/swrast.h"
 #include "drivers/common/meta.h"
 
-#include "intel_batchbuffer.h"
-#include "intel_fbo.h"
-#include "intel_mipmap_tree.h"
+#include "brw_batch.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
 
 #include "brw_context.h"
 #include "brw_blorp.h"

src/mesa/drivers/dri/i965/brw_clip.c

@@ -32,7 +32,7 @@
 #include "main/macros.h"
 #include "main/enums.h"
 
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 #include "brw_defines.h"
 #include "brw_context.h"

src/mesa/drivers/dri/i965/brw_compute.c

@@ -29,8 +29,8 @@
 #include "brw_context.h"
 #include "brw_draw.h"
 #include "brw_state.h"
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
 #include "brw_defines.h"
 
 

src/mesa/drivers/dri/i965/brw_conditional_render.c

@@ -34,7 +34,7 @@
 
 #include "brw_context.h"
 #include "brw_defines.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 static void
 set_predicate_enable(struct brw_context *brw,

src/mesa/drivers/dri/i965/brw_context.c

@@ -59,15 +59,15 @@
 #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"
-#include "intel_mipmap_tree.h"
-#include "intel_pixel.h"
-#include "intel_image.h"
-#include "intel_tex.h"
-#include "intel_tex_obj.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
+#include "brw_buffers.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
+#include "brw_pixel.h"
+#include "brw_image.h"
+#include "brw_tex.h"
+#include "brw_tex_obj.h"
 
 #include "swrast_setup/swrast_setup.h"
 #include "tnl/tnl.h"

src/mesa/drivers/dri/i965/brw_context.h

@@ -48,8 +48,8 @@
 
 #include "dev/gen_debug.h"
 #include "common/intel_decoder.h"
-#include "intel_screen.h"
-#include "intel_tex_obj.h"
+#include "brw_screen.h"
+#include "brw_tex_obj.h"
 #include "perf/gen_perf.h"
 #include "perf/gen_perf_query.h"
 

src/mesa/drivers/dri/i965/brw_copy_image.c

@@ -26,10 +26,10 @@
  */
 
 #include "brw_blorp.h"
-#include "intel_fbo.h"
-#include "intel_tex.h"
-#include "intel_blit.h"
-#include "intel_mipmap_tree.h"
+#include "brw_fbo.h"
+#include "brw_tex.h"
+#include "brw_blit.h"
+#include "brw_mipmap_tree.h"
 #include "main/formats.h"
 #include "main/teximage.h"
 #include "drivers/common/meta.h"

src/mesa/drivers/dri/i965/brw_cs.c

@@ -25,9 +25,9 @@
 #include "brw_context.h"
 #include "brw_cs.h"
 #include "brw_wm.h"
-#include "intel_mipmap_tree.h"
+#include "brw_mipmap_tree.h"
 #include "brw_state.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 #include "compiler/brw_nir.h"
 #include "brw_program.h"
 #include "compiler/glsl/ir_uniform.h"

src/mesa/drivers/dri/i965/brw_curbe.c

@@ -58,8 +58,8 @@
 #include "program/prog_print.h"
 #include "program/prog_statevars.h"
 #include "util/bitscan.h"
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
 #include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_state.h"

src/mesa/drivers/dri/i965/brw_draw.c

@@ -51,11 +51,11 @@
 #include "brw_context.h"
 #include "brw_state.h"
 
-#include "intel_batchbuffer.h"
-#include "intel_buffers.h"
-#include "intel_fbo.h"
-#include "intel_mipmap_tree.h"
-#include "intel_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_buffers.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
+#include "brw_buffer_objects.h"
 
 #define FILE_DEBUG_FLAG DEBUG_PRIMS
 

src/mesa/drivers/dri/i965/brw_draw_upload.c

@@ -36,8 +36,8 @@
 #include "brw_context.h"
 #include "brw_state.h"
 
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
 
 static const GLuint double_types_float[5] = {
    0,

src/mesa/drivers/dri/i965/brw_extensions.c

@@ -27,7 +27,7 @@
 
 #include "brw_context.h"
 #include "brw_defines.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 /**
  * Initializes potential list of extensions if ctx == NULL, or actually enables

src/mesa/drivers/dri/i965/brw_fbo.c

@@ -40,14 +40,14 @@
 #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"
-#include "intel_mipmap_tree.h"
-#include "intel_image.h"
-#include "intel_screen.h"
-#include "intel_tex.h"
+#include "brw_batch.h"
+#include "brw_buffers.h"
+#include "brw_blit.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
+#include "brw_image.h"
+#include "brw_screen.h"
+#include "brw_tex.h"
 #include "brw_context.h"
 #include "brw_defines.h"
 

src/mesa/drivers/dri/i965/brw_fbo.h

@@ -23,16 +23,16 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef INTEL_FBO_H
-#define INTEL_FBO_H
+#ifndef BRW_FBO_H
+#define BRW_FBO_H
 
 #include <stdbool.h>
 #include <assert.h>
 #include "main/formats.h"
 #include "main/macros.h"
 #include "brw_context.h"
-#include "intel_mipmap_tree.h"
-#include "intel_screen.h"
+#include "brw_mipmap_tree.h"
+#include "brw_screen.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -252,4 +252,4 @@ brw_quantize_num_samples(struct brw_screen *intel, unsigned num_samples);
 }
 #endif
 
-#endif /* INTEL_FBO_H */
+#endif /* BRW_FBO_H */

src/mesa/drivers/dri/i965/brw_ff_gs.c

@@ -33,7 +33,7 @@
 #include "main/enums.h"
 #include "main/transformfeedback.h"
 
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 #include "brw_defines.h"
 #include "brw_context.h"

src/mesa/drivers/dri/i965/brw_ff_gs_emit.c

@@ -34,7 +34,7 @@
 #include "main/enums.h"
 
 #include "program/program.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 #include "brw_defines.h"
 #include "brw_context.h"

src/mesa/drivers/dri/i965/brw_generate_mipmap.c

@@ -25,7 +25,7 @@
 #include "main/teximage.h"
 #include "brw_blorp.h"
 #include "brw_context.h"
-#include "intel_tex.h"
+#include "brw_tex.h"
 #include "drivers/common/meta.h"
 
 #define FILE_DEBUG_FLAG DEBUG_BLORP

src/mesa/drivers/dri/i965/brw_image.h

@@ -23,8 +23,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef INTEL_IMAGE_H
-#define INTEL_IMAGE_H
+#ifndef BRW_IMAGE_H
+#define BRW_IMAGE_H
 
 /** @file intel_image.h
  *

src/mesa/drivers/dri/i965/brw_meta_util.c

@@ -23,7 +23,7 @@
 
 #include "brw_context.h"
 #include "brw_defines.h"
-#include "intel_fbo.h"
+#include "brw_fbo.h"
 #include "brw_meta_util.h"
 #include "brw_state.h"
 #include "main/blend.h"

src/mesa/drivers/dri/i965/brw_meta_util.h

@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 #include "main/mtypes.h"
-#include "intel_mipmap_tree.h"
+#include "brw_mipmap_tree.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mesa/drivers/dri/i965/brw_mipmap_tree.c

@@ -27,12 +27,12 @@
 #include <GL/internal/dri_interface.h>
 #include "drm-uapi/drm_fourcc.h"
 
-#include "intel_batchbuffer.h"
-#include "intel_image.h"
-#include "intel_mipmap_tree.h"
-#include "intel_tex.h"
-#include "intel_blit.h"
-#include "intel_fbo.h"
+#include "brw_batch.h"
+#include "brw_image.h"
+#include "brw_mipmap_tree.h"
+#include "brw_tex.h"
+#include "brw_blit.h"
+#include "brw_fbo.h"
 
 #include "brw_blorp.h"
 #include "brw_context.h"

src/mesa/drivers/dri/i965/brw_mipmap_tree.h

@@ -41,8 +41,8 @@
  * that there's a single miptree for the complete texture.
  */
 
-#ifndef INTEL_MIPMAP_TREE_H
-#define INTEL_MIPMAP_TREE_H
+#ifndef BRW_MIPMAP_TREE_H
+#define BRW_MIPMAP_TREE_H
 
 #include <assert.h>
 

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 "brw_batch.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
 
 #include "brw_context.h"
 #include "brw_state.h"

src/mesa/drivers/dri/i965/brw_object_purgeable.c

@@ -32,9 +32,9 @@
 #include "main/bufferobj.h"
 
 #include "brw_context.h"
-#include "intel_buffer_objects.h"
-#include "intel_fbo.h"
-#include "intel_mipmap_tree.h"
+#include "brw_buffer_objects.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
 
 static GLenum
 brw_buffer_purgeable(struct brw_bo *buffer)

src/mesa/drivers/dri/i965/brw_performance_query.c

@@ -70,7 +70,7 @@
 
 #include "brw_context.h"
 #include "brw_defines.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 #include "perf/gen_perf.h"
 #include "perf/gen_perf_regs.h"

src/mesa/drivers/dri/i965/brw_pipe_control.c

@@ -24,8 +24,8 @@
 #include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_state.h"
-#include "intel_batchbuffer.h"
-#include "intel_fbo.h"
+#include "brw_batch.h"
+#include "brw_fbo.h"
 
 /**
  * Emit a PIPE_CONTROL with various flushing flags.

src/mesa/drivers/dri/i965/brw_pixel.c

@@ -32,7 +32,7 @@
 #include "swrast/swrast.h"
 
 #include "brw_context.h"
-#include "intel_pixel.h"
+#include "brw_pixel.h"
 
 #define FILE_DEBUG_FLAG DEBUG_PIXEL
 

src/mesa/drivers/dri/i965/brw_pixel.h

@@ -23,8 +23,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef INTEL_PIXEL_H
-#define INTEL_PIXEL_H
+#ifndef BRW_PIXEL_H
+#define BRW_PIXEL_H
 
 #include "main/mtypes.h"
 

src/mesa/drivers/dri/i965/brw_pixel_bitmap.c

@@ -40,13 +40,13 @@
 #include "drivers/common/meta.h"
 
 #include "brw_context.h"
-#include "intel_screen.h"
-#include "intel_batchbuffer.h"
-#include "intel_blit.h"
-#include "intel_fbo.h"
-#include "intel_image.h"
-#include "intel_buffers.h"
-#include "intel_pixel.h"
+#include "brw_screen.h"
+#include "brw_batch.h"
+#include "brw_blit.h"
+#include "brw_fbo.h"
+#include "brw_image.h"
+#include "brw_buffers.h"
+#include "brw_pixel.h"
 
 
 #define FILE_DEBUG_FLAG DEBUG_PIXEL

src/mesa/drivers/dri/i965/brw_pixel_copy.c

@@ -32,12 +32,12 @@
 #include "drivers/common/meta.h"
 
 #include "brw_context.h"
-#include "intel_buffers.h"
-#include "intel_mipmap_tree.h"
-#include "intel_pixel.h"
-#include "intel_fbo.h"
-#include "intel_blit.h"
-#include "intel_batchbuffer.h"
+#include "brw_buffers.h"
+#include "brw_mipmap_tree.h"
+#include "brw_pixel.h"
+#include "brw_fbo.h"
+#include "brw_blit.h"
+#include "brw_batch.h"
 
 #define FILE_DEBUG_FLAG DEBUG_PIXEL
 

src/mesa/drivers/dri/i965/brw_pixel_draw.c

@@ -37,13 +37,13 @@
 #include "drivers/common/meta.h"
 
 #include "brw_context.h"
-#include "intel_screen.h"
-#include "intel_blit.h"
-#include "intel_buffers.h"
-#include "intel_fbo.h"
-#include "intel_mipmap_tree.h"
-#include "intel_pixel.h"
-#include "intel_buffer_objects.h"
+#include "brw_screen.h"
+#include "brw_blit.h"
+#include "brw_buffers.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
+#include "brw_pixel.h"
+#include "brw_buffer_objects.h"
 
 #define FILE_DEBUG_FLAG DEBUG_PIXEL
 

src/mesa/drivers/dri/i965/brw_pixel_read.c

@@ -37,13 +37,13 @@
 
 #include "brw_context.h"
 #include "brw_blorp.h"
-#include "intel_screen.h"
-#include "intel_batchbuffer.h"
-#include "intel_buffers.h"
-#include "intel_fbo.h"
-#include "intel_mipmap_tree.h"
-#include "intel_pixel.h"
-#include "intel_buffer_objects.h"
+#include "brw_screen.h"
+#include "brw_batch.h"
+#include "brw_buffers.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
+#include "brw_pixel.h"
+#include "brw_buffer_objects.h"
 
 #define FILE_DEBUG_FLAG DEBUG_PIXEL
 

src/mesa/drivers/dri/i965/brw_primitive_restart.c

@@ -33,7 +33,7 @@
 #include "brw_defines.h"
 #include "brw_draw.h"
 
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 /**
  * Check if the hardware's cut index support can handle the primitive

src/mesa/drivers/dri/i965/brw_program.c

@@ -47,7 +47,7 @@
 #include "brw_context.h"
 #include "compiler/brw_nir.h"
 #include "brw_defines.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 #include "brw_cs.h"
 #include "brw_gs.h"

src/mesa/drivers/dri/i965/brw_program_cache.c

@@ -46,7 +46,7 @@
 
 #include "main/streaming-load-memcpy.h"
 #include "x86/common_x86_asm.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 #include "brw_state.h"
 #include "brw_wm.h"
 #include "brw_gs.h"

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 "brw_batch.h"
 
 /* As best we know currently, the Gen HW timestamps are 36bits across
  * all platforms, which we need to account for when calculating a

src/mesa/drivers/dri/i965/brw_screen.c

@@ -113,14 +113,14 @@ static const __DRIconfigOptionsExtension brw_config_options = {
    .getXml = brw_driconf_get_xml,
 };
 
-#include "intel_batchbuffer.h"
-#include "intel_buffers.h"
+#include "brw_batch.h"
+#include "brw_buffers.h"
 #include "brw_bufmgr.h"
-#include "intel_fbo.h"
-#include "intel_mipmap_tree.h"
-#include "intel_screen.h"
-#include "intel_tex.h"
-#include "intel_image.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
+#include "brw_screen.h"
+#include "brw_tex.h"
+#include "brw_image.h"
 
 #include "brw_context.h"
 

src/mesa/drivers/dri/i965/brw_sf.c

@@ -36,7 +36,7 @@
 #include "main/fbobject.h"
 #include "main/state.h"
 
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 #include "brw_defines.h"
 #include "brw_context.h"

src/mesa/drivers/dri/i965/brw_state.c

@@ -28,7 +28,7 @@
 #include "main/enums.h"
 #include "main/dd.h"
 
-#include "intel_screen.h"
+#include "brw_screen.h"
 #include "brw_context.h"
 #include "brw_defines.h"
 

src/mesa/drivers/dri/i965/brw_state_upload.c

@@ -36,8 +36,8 @@
 #include "brw_state.h"
 #include "brw_program.h"
 #include "drivers/common/meta.h"
-#include "intel_batchbuffer.h"
-#include "intel_buffers.h"
+#include "brw_batch.h"
+#include "brw_buffers.h"
 #include "brw_vs.h"
 #include "brw_ff_gs.h"
 #include "brw_gs.h"

src/mesa/drivers/dri/i965/brw_sync.c

@@ -43,7 +43,7 @@
 #include "util/os_file.h"
 
 #include "brw_context.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 struct brw_fence {
    struct brw_context *brw;

src/mesa/drivers/dri/i965/brw_tex.c

@@ -6,10 +6,10 @@
 #include "drivers/common/meta.h"
 #include "brw_context.h"
 #include "brw_defines.h"
-#include "intel_buffer_objects.h"
-#include "intel_mipmap_tree.h"
-#include "intel_tex.h"
-#include "intel_fbo.h"
+#include "brw_buffer_objects.h"
+#include "brw_mipmap_tree.h"
+#include "brw_tex.h"
+#include "brw_fbo.h"
 #include "util/u_memory.h"
 
 #define FILE_DEBUG_FLAG DEBUG_TEXTURE

src/mesa/drivers/dri/i965/brw_tex.h

@@ -29,7 +29,7 @@
 #include "main/mtypes.h"
 #include "main/formats.h"
 #include "brw_context.h"
-#include "intel_mipmap_tree.h"
+#include "brw_mipmap_tree.h"
 
 void brw_init_texture_functions(struct dd_function_table *functions);
 

src/mesa/drivers/dri/i965/brw_tex_copy.c

@@ -33,10 +33,10 @@
 
 #include "drivers/common/meta.h"
 
-#include "intel_screen.h"
-#include "intel_mipmap_tree.h"
-#include "intel_fbo.h"
-#include "intel_tex.h"
+#include "brw_screen.h"
+#include "brw_mipmap_tree.h"
+#include "brw_fbo.h"
+#include "brw_tex.h"
 #include "brw_context.h"
 
 #define FILE_DEBUG_FLAG DEBUG_TEXTURE

src/mesa/drivers/dri/i965/brw_tex_image.c

@@ -18,12 +18,12 @@
 
 #include "drivers/common/meta.h"
 
-#include "intel_mipmap_tree.h"
-#include "intel_buffer_objects.h"
-#include "intel_batchbuffer.h"
-#include "intel_tex.h"
-#include "intel_fbo.h"
-#include "intel_image.h"
+#include "brw_mipmap_tree.h"
+#include "brw_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_tex.h"
+#include "brw_fbo.h"
+#include "brw_image.h"
 #include "brw_context.h"
 #include "brw_blorp.h"
 

src/mesa/drivers/dri/i965/brw_tex_obj.h

@@ -23,8 +23,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef _INTEL_TEX_OBJ_H
-#define _INTEL_TEX_OBJ_H
+#ifndef _BRW_TEX_OBJ_H
+#define _BRW_TEX_OBJ_H
 
 #include "swrast/s_context.h"
 
@@ -98,4 +98,4 @@ brw_texture_image(struct gl_texture_image *img)
 }
 #endif
 
-#endif /* _INTEL_TEX_OBJ_H */
+#endif /* _BRW_TEX_OBJ_H */

src/mesa/drivers/dri/i965/brw_tex_validate.c

@@ -28,8 +28,8 @@
 #include "main/texobj.h"
 
 #include "brw_context.h"
-#include "intel_mipmap_tree.h"
-#include "intel_tex.h"
+#include "brw_mipmap_tree.h"
+#include "brw_tex.h"
 
 #define FILE_DEBUG_FLAG DEBUG_TEXTURE
 

src/mesa/drivers/dri/i965/brw_upload.c

@@ -31,7 +31,7 @@
 #include "main/macros.h"
 #include "brw_bufmgr.h"
 #include "brw_context.h"
-#include "intel_buffer_objects.h"
+#include "brw_buffer_objects.h"
 
 void
 brw_upload_finish(struct brw_uploader *upload)

src/mesa/drivers/dri/i965/brw_urb.c

@@ -31,7 +31,7 @@
 
 
 
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 #include "brw_context.h"
 #include "brw_state.h"
 #include "brw_defines.h"

src/mesa/drivers/dri/i965/brw_vs_surface_state.c

@@ -35,7 +35,7 @@
 
 #include "brw_context.h"
 #include "brw_state.h"
-#include "intel_buffer_objects.h"
+#include "brw_buffer_objects.h"
 
 
 /* Creates a new VS constant buffer reflecting the current VS program's

src/mesa/drivers/dri/i965/brw_wm.c

@@ -33,9 +33,9 @@
 #include "main/framebuffer.h"
 #include "program/prog_parameter.h"
 #include "program/program.h"
-#include "intel_mipmap_tree.h"
-#include "intel_image.h"
-#include "intel_fbo.h"
+#include "brw_mipmap_tree.h"
+#include "brw_image.h"
+#include "brw_fbo.h"
 #include "compiler/brw_nir.h"
 #include "brw_program.h"
 

src/mesa/drivers/dri/i965/brw_wm_surface_state.c

@@ -44,11 +44,11 @@
 
 #include "isl/isl.h"
 
-#include "intel_mipmap_tree.h"
-#include "intel_batchbuffer.h"
-#include "intel_tex.h"
-#include "intel_fbo.h"
-#include "intel_buffer_objects.h"
+#include "brw_mipmap_tree.h"
+#include "brw_batch.h"
+#include "brw_tex.h"
+#include "brw_fbo.h"
+#include "brw_buffer_objects.h"
 
 #include "brw_context.h"
 #include "brw_state.h"

src/mesa/drivers/dri/i965/gen6_clip_state.c

@@ -30,7 +30,7 @@
 #include "brw_defines.h"
 #include "compiler/brw_eu_defines.h"
 #include "brw_util.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 #include "main/fbobject.h"
 #include "main/framebuffer.h"
 

src/mesa/drivers/dri/i965/gen6_constant_state.c

@@ -26,8 +26,8 @@
 #include "brw_state.h"
 #include "brw_defines.h"
 #include "brw_program.h"
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
 #include "program/prog_parameter.h"
 #include "main/shaderapi.h"
 

src/mesa/drivers/dri/i965/gen6_multisample_state.c

@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 #include "brw_context.h"
 #include "brw_defines.h"

src/mesa/drivers/dri/i965/gen6_queryobj.c

@@ -35,8 +35,8 @@
 #include "brw_defines.h"
 #include "brw_state.h"
 #include "perf/gen_perf_regs.h"
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
 
 static inline void
 set_query_availability(struct brw_context *brw, struct brw_query_object *query,

src/mesa/drivers/dri/i965/gen6_sampler_state.c

@@ -28,7 +28,7 @@
 #include "brw_context.h"
 #include "brw_state.h"
 #include "brw_defines.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 static void
 upload_sampler_state_pointers(struct brw_context *brw)

src/mesa/drivers/dri/i965/gen6_sol.c

@@ -29,7 +29,7 @@
 #include "main/bufferobj.h"
 #include "main/macros.h"
 #include "brw_context.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 #include "brw_defines.h"
 #include "brw_state.h"
 #include "main/transformfeedback.h"

src/mesa/drivers/dri/i965/gen6_urb.c

@@ -26,7 +26,7 @@
  */
 
 #include "main/macros.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 #include "brw_context.h"
 #include "brw_state.h"
 #include "brw_defines.h"

src/mesa/drivers/dri/i965/gen7_l3_state.c

@@ -26,7 +26,7 @@
 #include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_state.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 /**
  * Calculate the desired L3 partitioning based on the current state of the

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 "brw_batch.h"
+#include "brw_buffer_objects.h"
 #include "main/transformfeedback.h"
 
 void

src/mesa/drivers/dri/i965/gen7_urb.c

@@ -22,7 +22,7 @@
  */
 
 #include "main/macros.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 #include "brw_context.h"
 #include "brw_state.h"
 #include "brw_defines.h"

src/mesa/drivers/dri/i965/gen8_depth_state.c

@@ -21,9 +21,9 @@
  * IN THE SOFTWARE.
  */
 
-#include "intel_batchbuffer.h"
-#include "intel_mipmap_tree.h"
-#include "intel_fbo.h"
+#include "brw_batch.h"
+#include "brw_mipmap_tree.h"
+#include "brw_fbo.h"
 #include "brw_context.h"
 #include "brw_state.h"
 #include "brw_defines.h"

src/mesa/drivers/dri/i965/gen8_multisample_state.c

@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 #include "brw_context.h"
 #include "brw_defines.h"

src/mesa/drivers/dri/i965/genX_blorp_exec.c

@@ -23,9 +23,9 @@
 
 #include <assert.h>
 
-#include "intel_batchbuffer.h"
-#include "intel_mipmap_tree.h"
-#include "intel_fbo.h"
+#include "brw_batch.h"
+#include "brw_mipmap_tree.h"
+#include "brw_fbo.h"
 
 #include "brw_context.h"
 #include "brw_state.h"

src/mesa/drivers/dri/i965/genX_boilerplate.h

@@ -28,7 +28,7 @@
 #include "genxml/gen_macros.h"
 
 #include "brw_context.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 UNUSED static void *
 emit_dwords(struct brw_context *brw, unsigned n)

src/mesa/drivers/dri/i965/genX_state_upload.c

@@ -46,9 +46,9 @@
 #include "brw_wm.h"
 #include "brw_util.h"
 
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
-#include "intel_fbo.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
+#include "brw_fbo.h"
 
 #include "main/enums.h"
 #include "main/fbobject.h"

src/mesa/drivers/dri/i965/hsw_queryobj.c

@@ -28,8 +28,8 @@
  */
 #include "brw_context.h"
 #include "brw_defines.h"
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
 
 /*
  * GPR0 = 80 * GPR0;

src/mesa/drivers/dri/i965/hsw_sol.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 "brw_batch.h"
+#include "brw_buffer_objects.h"
 #include "main/transformfeedback.h"
 
 /**

src/mesa/drivers/dri/i965/meson.build

@@ -96,37 +96,37 @@ files_i965 = files(
   'gen8_multisample_state.c',
   'hsw_queryobj.c',
   'hsw_sol.c',
-  'intel_batchbuffer.c',
-  'intel_batchbuffer.h',
-  'intel_blit.c',
-  'intel_blit.h',
-  'intel_buffer_objects.c',
-  'intel_buffer_objects.h',
-  'intel_buffers.c',
-  'intel_buffers.h',
-  'intel_copy_image.c',
-  'intel_extensions.c',
-  'intel_fbo.c',
-  'intel_fbo.h',
-  'intel_image.h',
-  'intel_mipmap_tree.c',
-  'intel_mipmap_tree.h',
-  'intel_pixel_bitmap.c',
-  'intel_pixel.c',
-  'intel_pixel_copy.c',
-  'intel_pixel_draw.c',
-  'intel_pixel.h',
-  'intel_pixel_read.c',
-  'intel_screen.c',
-  'intel_screen.h',
-  'intel_state.c',
-  'intel_tex.c',
-  'intel_tex_copy.c',
-  'intel_tex.h',
-  'intel_tex_image.c',
-  'intel_tex_obj.h',
-  'intel_tex_validate.c',
-  'intel_upload.c',
+  'brw_batch.c',
+  'brw_batch.h',
+  'brw_blit.c',
+  'brw_blit.h',
+  'brw_buffer_objects.c',
+  'brw_buffer_objects.h',
+  'brw_buffers.c',
+  'brw_buffers.h',
+  'brw_copy_image.c',
+  'brw_extensions.c',
+  'brw_fbo.c',
+  'brw_fbo.h',
+  'brw_image.h',
+  'brw_mipmap_tree.c',
+  'brw_mipmap_tree.h',
+  'brw_pixel_bitmap.c',
+  'brw_pixel.c',
+  'brw_pixel_copy.c',
+  'brw_pixel_draw.c',
+  'brw_pixel.h',
+  'brw_pixel_read.c',
+  'brw_screen.c',
+  'brw_screen.h',
+  'brw_state.c',
+  'brw_tex.c',
+  'brw_tex_copy.c',
+  'brw_tex.h',
+  'brw_tex_image.c',
+  'brw_tex_obj.h',
+  'brw_tex_validate.c',
+  'brw_upload.c',
   'libdrm_macros.h',
 )