From 9d95e1bd79a8b6a94e371b808f61d415d0ec1372 Mon Sep 17 00:00:00 2001 From: Anuj Phogat Date: Wed, 3 Mar 2021 09:27:36 -0800 Subject: [PATCH] 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 Reviewed-by: Kenneth Graunke Part-of: --- .../dri/i965/{intel_batchbuffer.c => brw_batch.c} | 8 +-- .../dri/i965/{intel_batchbuffer.h => brw_batch.h} | 4 +- src/mesa/drivers/dri/i965/brw_binding_tables.c | 2 +- .../drivers/dri/i965/{intel_blit.c => brw_blit.c} | 10 ++-- .../drivers/dri/i965/{intel_blit.h => brw_blit.h} | 4 +- src/mesa/drivers/dri/i965/brw_blorp.c | 4 +- src/mesa/drivers/dri/i965/brw_blorp.h | 2 +- ...intel_buffer_objects.c => brw_buffer_objects.c} | 4 +- ...intel_buffer_objects.h => brw_buffer_objects.h} | 4 +- .../dri/i965/{intel_buffers.c => brw_buffers.c} | 6 +-- .../dri/i965/{intel_buffers.h => brw_buffers.h} | 6 +-- src/mesa/drivers/dri/i965/brw_bufmgr.h | 6 +-- src/mesa/drivers/dri/i965/brw_clear.c | 6 +-- src/mesa/drivers/dri/i965/brw_clip.c | 2 +- src/mesa/drivers/dri/i965/brw_compute.c | 4 +- src/mesa/drivers/dri/i965/brw_conditional_render.c | 2 +- src/mesa/drivers/dri/i965/brw_context.c | 18 +++---- src/mesa/drivers/dri/i965/brw_context.h | 4 +- .../i965/{intel_copy_image.c => brw_copy_image.c} | 8 +-- src/mesa/drivers/dri/i965/brw_cs.c | 4 +- src/mesa/drivers/dri/i965/brw_curbe.c | 4 +- src/mesa/drivers/dri/i965/brw_draw.c | 10 ++-- src/mesa/drivers/dri/i965/brw_draw_upload.c | 4 +- .../i965/{intel_extensions.c => brw_extensions.c} | 2 +- .../drivers/dri/i965/{intel_fbo.c => brw_fbo.c} | 16 +++--- .../drivers/dri/i965/{intel_fbo.h => brw_fbo.h} | 10 ++-- src/mesa/drivers/dri/i965/brw_ff_gs.c | 2 +- src/mesa/drivers/dri/i965/brw_ff_gs_emit.c | 2 +- src/mesa/drivers/dri/i965/brw_generate_mipmap.c | 2 +- .../dri/i965/{intel_image.h => brw_image.h} | 4 +- src/mesa/drivers/dri/i965/brw_meta_util.c | 2 +- src/mesa/drivers/dri/i965/brw_meta_util.h | 2 +- .../{intel_mipmap_tree.c => brw_mipmap_tree.c} | 12 ++--- .../{intel_mipmap_tree.h => brw_mipmap_tree.h} | 4 +- src/mesa/drivers/dri/i965/brw_misc_state.c | 6 +-- src/mesa/drivers/dri/i965/brw_object_purgeable.c | 6 +-- src/mesa/drivers/dri/i965/brw_performance_query.c | 2 +- src/mesa/drivers/dri/i965/brw_pipe_control.c | 4 +- .../dri/i965/{intel_pixel.c => brw_pixel.c} | 2 +- .../dri/i965/{intel_pixel.h => brw_pixel.h} | 4 +- .../{intel_pixel_bitmap.c => brw_pixel_bitmap.c} | 14 ++--- .../i965/{intel_pixel_copy.c => brw_pixel_copy.c} | 12 ++--- .../i965/{intel_pixel_draw.c => brw_pixel_draw.c} | 14 ++--- .../i965/{intel_pixel_read.c => brw_pixel_read.c} | 14 ++--- src/mesa/drivers/dri/i965/brw_primitive_restart.c | 2 +- src/mesa/drivers/dri/i965/brw_program.c | 2 +- src/mesa/drivers/dri/i965/brw_program_cache.c | 2 +- src/mesa/drivers/dri/i965/brw_queryobj.c | 2 +- .../dri/i965/{intel_screen.c => brw_screen.c} | 14 ++--- .../dri/i965/{intel_screen.h => brw_screen.h} | 0 src/mesa/drivers/dri/i965/brw_sf.c | 2 +- .../dri/i965/{intel_state.c => brw_state.c} | 2 +- src/mesa/drivers/dri/i965/brw_state_upload.c | 4 +- src/mesa/drivers/dri/i965/brw_sync.c | 2 +- .../drivers/dri/i965/{intel_tex.c => brw_tex.c} | 8 +-- .../drivers/dri/i965/{intel_tex.h => brw_tex.h} | 2 +- .../dri/i965/{intel_tex_copy.c => brw_tex_copy.c} | 8 +-- .../i965/{intel_tex_image.c => brw_tex_image.c} | 12 ++--- .../dri/i965/{intel_tex_obj.h => brw_tex_obj.h} | 6 +-- .../{intel_tex_validate.c => brw_tex_validate.c} | 4 +- .../dri/i965/{intel_upload.c => brw_upload.c} | 2 +- src/mesa/drivers/dri/i965/brw_urb.c | 2 +- src/mesa/drivers/dri/i965/brw_vs_surface_state.c | 2 +- src/mesa/drivers/dri/i965/brw_wm.c | 6 +-- src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 10 ++-- src/mesa/drivers/dri/i965/gen6_clip_state.c | 2 +- src/mesa/drivers/dri/i965/gen6_constant_state.c | 4 +- src/mesa/drivers/dri/i965/gen6_multisample_state.c | 2 +- src/mesa/drivers/dri/i965/gen6_queryobj.c | 4 +- src/mesa/drivers/dri/i965/gen6_sampler_state.c | 2 +- src/mesa/drivers/dri/i965/gen6_sol.c | 2 +- src/mesa/drivers/dri/i965/gen6_urb.c | 2 +- src/mesa/drivers/dri/i965/gen7_l3_state.c | 2 +- src/mesa/drivers/dri/i965/gen7_sol_state.c | 4 +- src/mesa/drivers/dri/i965/gen7_urb.c | 2 +- src/mesa/drivers/dri/i965/gen8_depth_state.c | 6 +-- src/mesa/drivers/dri/i965/gen8_multisample_state.c | 2 +- src/mesa/drivers/dri/i965/genX_blorp_exec.c | 6 +-- src/mesa/drivers/dri/i965/genX_boilerplate.h | 2 +- src/mesa/drivers/dri/i965/genX_state_upload.c | 6 +-- src/mesa/drivers/dri/i965/hsw_queryobj.c | 4 +- src/mesa/drivers/dri/i965/hsw_sol.c | 4 +- src/mesa/drivers/dri/i965/meson.build | 62 +++++++++++----------- 83 files changed, 237 insertions(+), 237 deletions(-) rename src/mesa/drivers/dri/i965/{intel_batchbuffer.c => brw_batch.c} (99%) rename src/mesa/drivers/dri/i965/{intel_batchbuffer.h => brw_batch.h} (98%) rename src/mesa/drivers/dri/i965/{intel_blit.c => brw_blit.c} (99%) rename src/mesa/drivers/dri/i965/{intel_blit.h => brw_blit.h} (98%) rename src/mesa/drivers/dri/i965/{intel_buffer_objects.c => brw_buffer_objects.c} (99%) rename src/mesa/drivers/dri/i965/{intel_buffer_objects.h => brw_buffer_objects.h} (98%) rename src/mesa/drivers/dri/i965/{intel_buffers.c => brw_buffers.c} (96%) rename src/mesa/drivers/dri/i965/{intel_buffers.h => brw_buffers.h} (94%) rename src/mesa/drivers/dri/i965/{intel_copy_image.c => brw_copy_image.c} (98%) rename src/mesa/drivers/dri/i965/{intel_extensions.c => brw_extensions.c} (99%) rename src/mesa/drivers/dri/i965/{intel_fbo.c => brw_fbo.c} (99%) rename src/mesa/drivers/dri/i965/{intel_fbo.h => brw_fbo.h} (98%) rename src/mesa/drivers/dri/i965/{intel_image.h => brw_image.h} (98%) rename src/mesa/drivers/dri/i965/{intel_mipmap_tree.c => brw_mipmap_tree.c} (99%) rename src/mesa/drivers/dri/i965/{intel_mipmap_tree.h => brw_mipmap_tree.h} (99%) rename src/mesa/drivers/dri/i965/{intel_pixel.c => brw_pixel.c} (99%) rename src/mesa/drivers/dri/i965/{intel_pixel.h => brw_pixel.h} (98%) rename src/mesa/drivers/dri/i965/{intel_pixel_bitmap.c => brw_pixel_bitmap.c} (98%) rename src/mesa/drivers/dri/i965/{intel_pixel_copy.c => brw_pixel_copy.c} (97%) rename src/mesa/drivers/dri/i965/{intel_pixel_draw.c => brw_pixel_draw.c} (96%) rename src/mesa/drivers/dri/i965/{intel_pixel_read.c => brw_pixel_read.c} (98%) rename src/mesa/drivers/dri/i965/{intel_screen.c => brw_screen.c} (99%) rename src/mesa/drivers/dri/i965/{intel_screen.h => brw_screen.h} (100%) rename src/mesa/drivers/dri/i965/{intel_state.c => brw_state.c} (99%) rename src/mesa/drivers/dri/i965/{intel_tex.c => brw_tex.c} (99%) rename src/mesa/drivers/dri/i965/{intel_tex.h => brw_tex.h} (98%) rename src/mesa/drivers/dri/i965/{intel_tex_copy.c => brw_tex_copy.c} (95%) rename src/mesa/drivers/dri/i965/{intel_tex_image.c => brw_tex_image.c} (99%) rename src/mesa/drivers/dri/i965/{intel_tex_obj.h => brw_tex_obj.h} (97%) rename src/mesa/drivers/dri/i965/{intel_tex_validate.c => brw_tex_validate.c} (99%) rename src/mesa/drivers/dri/i965/{intel_upload.c => brw_upload.c} (99%) diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/brw_batch.c similarity index 99% rename from src/mesa/drivers/dri/i965/intel_batchbuffer.c rename to src/mesa/drivers/dri/i965/brw_batch.c index b65e34f..930f8de 100644 --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.h b/src/mesa/drivers/dri/i965/brw_batch.h similarity index 98% rename from src/mesa/drivers/dri/i965/intel_batchbuffer.h rename to src/mesa/drivers/dri/i965/brw_batch.h index 9749782..6049385 100644 --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.h +++ b/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" diff --git a/src/mesa/drivers/dri/i965/brw_binding_tables.c b/src/mesa/drivers/dri/i965/brw_binding_tables.c index 73f5e56..768bd3b 100644 --- a/src/mesa/drivers/dri/i965/brw_binding_tables.c +++ b/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. diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/brw_blit.c similarity index 99% rename from src/mesa/drivers/dri/i965/intel_blit.c rename to src/mesa/drivers/dri/i965/brw_blit.c index aa664c4..807af9f 100644 --- a/src/mesa/drivers/dri/i965/intel_blit.c +++ b/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 diff --git a/src/mesa/drivers/dri/i965/intel_blit.h b/src/mesa/drivers/dri/i965/brw_blit.h similarity index 98% rename from src/mesa/drivers/dri/i965/intel_blit.h rename to src/mesa/drivers/dri/i965/brw_blit.h index 3eb50a0..ab71420 100644 --- a/src/mesa/drivers/dri/i965/intel_blit.h +++ b/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" diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c index 1163679..042b85d 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.c +++ b/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 diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h b/src/mesa/drivers/dri/i965/brw_blorp.h index b89db62..de214e6 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.h +++ b/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 diff --git a/src/mesa/drivers/dri/i965/intel_buffer_objects.c b/src/mesa/drivers/dri/i965/brw_buffer_objects.c similarity index 99% rename from src/mesa/drivers/dri/i965/intel_buffer_objects.c rename to src/mesa/drivers/dri/i965/brw_buffer_objects.c index 428c922..b7d44e4 100644 --- a/src/mesa/drivers/dri/i965/intel_buffer_objects.c +++ b/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, diff --git a/src/mesa/drivers/dri/i965/intel_buffer_objects.h b/src/mesa/drivers/dri/i965/brw_buffer_objects.h similarity index 98% rename from src/mesa/drivers/dri/i965/intel_buffer_objects.h rename to src/mesa/drivers/dri/i965/brw_buffer_objects.h index 434ea49..fef0723 100644 --- a/src/mesa/drivers/dri/i965/intel_buffer_objects.h +++ b/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" diff --git a/src/mesa/drivers/dri/i965/intel_buffers.c b/src/mesa/drivers/dri/i965/brw_buffers.c similarity index 96% rename from src/mesa/drivers/dri/i965/intel_buffers.c rename to src/mesa/drivers/dri/i965/brw_buffers.c index 9bdb359..ea7aa6f 100644 --- a/src/mesa/drivers/dri/i965/intel_buffers.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/intel_buffers.h b/src/mesa/drivers/dri/i965/brw_buffers.h similarity index 94% rename from src/mesa/drivers/dri/i965/intel_buffers.h rename to src/mesa/drivers/dri/i965/brw_buffers.h index fc14eaf..37c385f 100644 --- a/src/mesa/drivers/dri/i965/intel_buffers.h +++ b/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 */ diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h index 32346ff..9d9d5f0 100644 --- a/src/mesa/drivers/dri/i965/brw_bufmgr.h +++ b/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 #include @@ -402,4 +402,4 @@ bool brw_using_softpin(struct brw_bufmgr *bufmgr); #if defined(__cplusplus) } #endif -#endif /* INTEL_BUFMGR_H */ +#endif /* BRW_BUFMGR_H */ diff --git a/src/mesa/drivers/dri/i965/brw_clear.c b/src/mesa/drivers/dri/i965/brw_clear.c index 9d59c4f..667d2df 100644 --- a/src/mesa/drivers/dri/i965/brw_clear.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/brw_clip.c b/src/mesa/drivers/dri/i965/brw_clip.c index 71e5160..238b4b4 100644 --- a/src/mesa/drivers/dri/i965/brw_clip.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/brw_compute.c b/src/mesa/drivers/dri/i965/brw_compute.c index 3c2ef06..0b0ecbd 100644 --- a/src/mesa/drivers/dri/i965/brw_compute.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/brw_conditional_render.c b/src/mesa/drivers/dri/i965/brw_conditional_render.c index 463918f..5996d36 100644 --- a/src/mesa/drivers/dri/i965/brw_conditional_render.c +++ b/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, diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 8a38fdb..9064fcd 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 034b496..ef45e32 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/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" diff --git a/src/mesa/drivers/dri/i965/intel_copy_image.c b/src/mesa/drivers/dri/i965/brw_copy_image.c similarity index 98% rename from src/mesa/drivers/dri/i965/intel_copy_image.c rename to src/mesa/drivers/dri/i965/brw_copy_image.c index 5616f88..ec14b9b 100644 --- a/src/mesa/drivers/dri/i965/intel_copy_image.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/brw_cs.c b/src/mesa/drivers/dri/i965/brw_cs.c index 990acab..6f93ea3 100644 --- a/src/mesa/drivers/dri/i965/brw_cs.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c b/src/mesa/drivers/dri/i965/brw_curbe.c index 7bf558c..1225d09 100644 --- a/src/mesa/drivers/dri/i965/brw_curbe.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index 7de4e0b..a471983 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/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 diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c index 25437a7..4fce53c 100644 --- a/src/mesa/drivers/dri/i965/brw_draw_upload.c +++ b/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, diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/brw_extensions.c similarity index 99% rename from src/mesa/drivers/dri/i965/intel_extensions.c rename to src/mesa/drivers/dri/i965/brw_extensions.c index 710e81f..9c2a006 100644 --- a/src/mesa/drivers/dri/i965/intel_extensions.c +++ b/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 diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/brw_fbo.c similarity index 99% rename from src/mesa/drivers/dri/i965/intel_fbo.c rename to src/mesa/drivers/dri/i965/brw_fbo.c index bca416a..f48b4e1 100644 --- a/src/mesa/drivers/dri/i965/intel_fbo.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/intel_fbo.h b/src/mesa/drivers/dri/i965/brw_fbo.h similarity index 98% rename from src/mesa/drivers/dri/i965/intel_fbo.h rename to src/mesa/drivers/dri/i965/brw_fbo.h index 0ce86c1..b4dcb9a 100644 --- a/src/mesa/drivers/dri/i965/intel_fbo.h +++ b/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 #include #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 */ diff --git a/src/mesa/drivers/dri/i965/brw_ff_gs.c b/src/mesa/drivers/dri/i965/brw_ff_gs.c index 760a3db..e5cbbba 100644 --- a/src/mesa/drivers/dri/i965/brw_ff_gs.c +++ b/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" 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 3cfbe15..5205c94 100644 --- a/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/brw_generate_mipmap.c b/src/mesa/drivers/dri/i965/brw_generate_mipmap.c index b68a239..90f29e7 100644 --- a/src/mesa/drivers/dri/i965/brw_generate_mipmap.c +++ b/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 diff --git a/src/mesa/drivers/dri/i965/intel_image.h b/src/mesa/drivers/dri/i965/brw_image.h similarity index 98% rename from src/mesa/drivers/dri/i965/intel_image.h rename to src/mesa/drivers/dri/i965/brw_image.h index 9b27e14..6a976eb 100644 --- a/src/mesa/drivers/dri/i965/intel_image.h +++ b/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 * diff --git a/src/mesa/drivers/dri/i965/brw_meta_util.c b/src/mesa/drivers/dri/i965/brw_meta_util.c index 01c078d..6d3cec4 100644 --- a/src/mesa/drivers/dri/i965/brw_meta_util.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/brw_meta_util.h b/src/mesa/drivers/dri/i965/brw_meta_util.h index c330b68..c469490 100644 --- a/src/mesa/drivers/dri/i965/brw_meta_util.h +++ b/src/mesa/drivers/dri/i965/brw_meta_util.h @@ -26,7 +26,7 @@ #include #include "main/mtypes.h" -#include "intel_mipmap_tree.h" +#include "brw_mipmap_tree.h" #ifdef __cplusplus extern "C" { diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/brw_mipmap_tree.c similarity index 99% rename from src/mesa/drivers/dri/i965/intel_mipmap_tree.c rename to src/mesa/drivers/dri/i965/brw_mipmap_tree.c index 3584c94..82295e6 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/brw_mipmap_tree.c @@ -27,12 +27,12 @@ #include #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" diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h b/src/mesa/drivers/dri/i965/brw_mipmap_tree.h similarity index 99% rename from src/mesa/drivers/dri/i965/intel_mipmap_tree.h rename to src/mesa/drivers/dri/i965/brw_mipmap_tree.h index f71ddf4..598ea64 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h +++ b/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 diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c index 2d4530a..c16cb4f 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 "brw_batch.h" +#include "brw_fbo.h" +#include "brw_mipmap_tree.h" #include "brw_context.h" #include "brw_state.h" diff --git a/src/mesa/drivers/dri/i965/brw_object_purgeable.c b/src/mesa/drivers/dri/i965/brw_object_purgeable.c index 2989083..104454e 100644 --- a/src/mesa/drivers/dri/i965/brw_object_purgeable.c +++ b/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) diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c index e0d9701..9936288 100644 --- a/src/mesa/drivers/dri/i965/brw_performance_query.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/brw_pipe_control.c b/src/mesa/drivers/dri/i965/brw_pipe_control.c index 6a64bbe..aa2c803 100644 --- a/src/mesa/drivers/dri/i965/brw_pipe_control.c +++ b/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. diff --git a/src/mesa/drivers/dri/i965/intel_pixel.c b/src/mesa/drivers/dri/i965/brw_pixel.c similarity index 99% rename from src/mesa/drivers/dri/i965/intel_pixel.c rename to src/mesa/drivers/dri/i965/brw_pixel.c index 9a1ef8d..b6a2c51 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel.c +++ b/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 diff --git a/src/mesa/drivers/dri/i965/intel_pixel.h b/src/mesa/drivers/dri/i965/brw_pixel.h similarity index 98% rename from src/mesa/drivers/dri/i965/intel_pixel.h rename to src/mesa/drivers/dri/i965/brw_pixel.h index 927a74d..b6e3e6e 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel.h +++ b/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" diff --git a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c b/src/mesa/drivers/dri/i965/brw_pixel_bitmap.c similarity index 98% rename from src/mesa/drivers/dri/i965/intel_pixel_bitmap.c rename to src/mesa/drivers/dri/i965/brw_pixel_bitmap.c index 60e1414..563f3ae 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c +++ b/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 diff --git a/src/mesa/drivers/dri/i965/intel_pixel_copy.c b/src/mesa/drivers/dri/i965/brw_pixel_copy.c similarity index 97% rename from src/mesa/drivers/dri/i965/intel_pixel_copy.c rename to src/mesa/drivers/dri/i965/brw_pixel_copy.c index 8f14257..e869a5f 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel_copy.c +++ b/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 diff --git a/src/mesa/drivers/dri/i965/intel_pixel_draw.c b/src/mesa/drivers/dri/i965/brw_pixel_draw.c similarity index 96% rename from src/mesa/drivers/dri/i965/intel_pixel_draw.c rename to src/mesa/drivers/dri/i965/brw_pixel_draw.c index bf56a13..abb53b0 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel_draw.c +++ b/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 diff --git a/src/mesa/drivers/dri/i965/intel_pixel_read.c b/src/mesa/drivers/dri/i965/brw_pixel_read.c similarity index 98% rename from src/mesa/drivers/dri/i965/intel_pixel_read.c rename to src/mesa/drivers/dri/i965/brw_pixel_read.c index 67ddcae..e61afdc 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel_read.c +++ b/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 diff --git a/src/mesa/drivers/dri/i965/brw_primitive_restart.c b/src/mesa/drivers/dri/i965/brw_primitive_restart.c index 1f548a1..67734d3 100644 --- a/src/mesa/drivers/dri/i965/brw_primitive_restart.c +++ b/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 diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index 6a8cf7a..5017ab8 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/brw_program_cache.c b/src/mesa/drivers/dri/i965/brw_program_cache.c index 21cec90..1478bd2 100644 --- a/src/mesa/drivers/dri/i965/brw_program_cache.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/brw_queryobj.c b/src/mesa/drivers/dri/i965/brw_queryobj.c index a7beab4..0d00cdc 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 "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 diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/brw_screen.c similarity index 99% rename from src/mesa/drivers/dri/i965/intel_screen.c rename to src/mesa/drivers/dri/i965/brw_screen.c index 115880d..1d3a188 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/intel_screen.h b/src/mesa/drivers/dri/i965/brw_screen.h similarity index 100% rename from src/mesa/drivers/dri/i965/intel_screen.h rename to src/mesa/drivers/dri/i965/brw_screen.h diff --git a/src/mesa/drivers/dri/i965/brw_sf.c b/src/mesa/drivers/dri/i965/brw_sf.c index d629946..8905033 100644 --- a/src/mesa/drivers/dri/i965/brw_sf.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/intel_state.c b/src/mesa/drivers/dri/i965/brw_state.c similarity index 99% rename from src/mesa/drivers/dri/i965/intel_state.c rename to src/mesa/drivers/dri/i965/brw_state.c index efb63fb..9901746 100644 --- a/src/mesa/drivers/dri/i965/intel_state.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c index fb23aa7..10f8885 100644 --- a/src/mesa/drivers/dri/i965/brw_state_upload.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/brw_sync.c b/src/mesa/drivers/dri/i965/brw_sync.c index 14a5412..7c3980e 100644 --- a/src/mesa/drivers/dri/i965/brw_sync.c +++ b/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; diff --git a/src/mesa/drivers/dri/i965/intel_tex.c b/src/mesa/drivers/dri/i965/brw_tex.c similarity index 99% rename from src/mesa/drivers/dri/i965/intel_tex.c rename to src/mesa/drivers/dri/i965/brw_tex.c index 9eff0ca..1531cf2 100644 --- a/src/mesa/drivers/dri/i965/intel_tex.c +++ b/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 diff --git a/src/mesa/drivers/dri/i965/intel_tex.h b/src/mesa/drivers/dri/i965/brw_tex.h similarity index 98% rename from src/mesa/drivers/dri/i965/intel_tex.h rename to src/mesa/drivers/dri/i965/brw_tex.h index 77ecbed..ee0837e 100644 --- a/src/mesa/drivers/dri/i965/intel_tex.h +++ b/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); diff --git a/src/mesa/drivers/dri/i965/intel_tex_copy.c b/src/mesa/drivers/dri/i965/brw_tex_copy.c similarity index 95% rename from src/mesa/drivers/dri/i965/intel_tex_copy.c rename to src/mesa/drivers/dri/i965/brw_tex_copy.c index 8d5506a..26c1fcd 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_copy.c +++ b/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 diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/brw_tex_image.c similarity index 99% rename from src/mesa/drivers/dri/i965/intel_tex_image.c rename to src/mesa/drivers/dri/i965/brw_tex_image.c index 80a3ca3..57c298c 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_image.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/intel_tex_obj.h b/src/mesa/drivers/dri/i965/brw_tex_obj.h similarity index 97% rename from src/mesa/drivers/dri/i965/intel_tex_obj.h rename to src/mesa/drivers/dri/i965/brw_tex_obj.h index 114c948..7946851 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_obj.h +++ b/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 */ diff --git a/src/mesa/drivers/dri/i965/intel_tex_validate.c b/src/mesa/drivers/dri/i965/brw_tex_validate.c similarity index 99% rename from src/mesa/drivers/dri/i965/intel_tex_validate.c rename to src/mesa/drivers/dri/i965/brw_tex_validate.c index 586309b..7f07a35 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_validate.c +++ b/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 diff --git a/src/mesa/drivers/dri/i965/intel_upload.c b/src/mesa/drivers/dri/i965/brw_upload.c similarity index 99% rename from src/mesa/drivers/dri/i965/intel_upload.c rename to src/mesa/drivers/dri/i965/brw_upload.c index a4a353e..8f7acf0 100644 --- a/src/mesa/drivers/dri/i965/intel_upload.c +++ b/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) diff --git a/src/mesa/drivers/dri/i965/brw_urb.c b/src/mesa/drivers/dri/i965/brw_urb.c index 1b10bfc..d54b7f9 100644 --- a/src/mesa/drivers/dri/i965/brw_urb.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c index 289c791..6fcf9c5 100644 --- a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c +++ b/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 diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index 90a75aa..15b546d 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/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" 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 fd020f2..fd51efb 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/gen6_clip_state.c b/src/mesa/drivers/dri/i965/gen6_clip_state.c index 2fffb67..67ab2ea 100644 --- a/src/mesa/drivers/dri/i965/gen6_clip_state.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/gen6_constant_state.c b/src/mesa/drivers/dri/i965/gen6_constant_state.c index ade6d1a..54831a2 100644 --- a/src/mesa/drivers/dri/i965/gen6_constant_state.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/gen6_multisample_state.c b/src/mesa/drivers/dri/i965/gen6_multisample_state.c index 785fc21..df13946 100644 --- a/src/mesa/drivers/dri/i965/gen6_multisample_state.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/gen6_queryobj.c b/src/mesa/drivers/dri/i965/gen6_queryobj.c index df5a414..965d061 100644 --- a/src/mesa/drivers/dri/i965/gen6_queryobj.c +++ b/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, diff --git a/src/mesa/drivers/dri/i965/gen6_sampler_state.c b/src/mesa/drivers/dri/i965/gen6_sampler_state.c index 3f49e3b..f7b47a2 100644 --- a/src/mesa/drivers/dri/i965/gen6_sampler_state.c +++ b/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) diff --git a/src/mesa/drivers/dri/i965/gen6_sol.c b/src/mesa/drivers/dri/i965/gen6_sol.c index d6fa28d..4c70c53 100644 --- a/src/mesa/drivers/dri/i965/gen6_sol.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/gen6_urb.c b/src/mesa/drivers/dri/i965/gen6_urb.c index aaff085..1c9e6e7 100644 --- a/src/mesa/drivers/dri/i965/gen6_urb.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/gen7_l3_state.c b/src/mesa/drivers/dri/i965/gen7_l3_state.c index 9285b33..6bfe5f8 100644 --- a/src/mesa/drivers/dri/i965/gen7_l3_state.c +++ b/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 diff --git a/src/mesa/drivers/dri/i965/gen7_sol_state.c b/src/mesa/drivers/dri/i965/gen7_sol_state.c index b4aac9f..3fcdb0a 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 "brw_batch.h" +#include "brw_buffer_objects.h" #include "main/transformfeedback.h" void diff --git a/src/mesa/drivers/dri/i965/gen7_urb.c b/src/mesa/drivers/dri/i965/gen7_urb.c index c945f83..59ad108 100644 --- a/src/mesa/drivers/dri/i965/gen7_urb.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/gen8_depth_state.c b/src/mesa/drivers/dri/i965/gen8_depth_state.c index 5bc0766..f217dc3 100644 --- a/src/mesa/drivers/dri/i965/gen8_depth_state.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/gen8_multisample_state.c b/src/mesa/drivers/dri/i965/gen8_multisample_state.c index 3afa586..04a6875 100644 --- a/src/mesa/drivers/dri/i965/gen8_multisample_state.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/genX_blorp_exec.c b/src/mesa/drivers/dri/i965/genX_blorp_exec.c index 0807e79..198d6b7 100644 --- a/src/mesa/drivers/dri/i965/genX_blorp_exec.c +++ b/src/mesa/drivers/dri/i965/genX_blorp_exec.c @@ -23,9 +23,9 @@ #include -#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" diff --git a/src/mesa/drivers/dri/i965/genX_boilerplate.h b/src/mesa/drivers/dri/i965/genX_boilerplate.h index b4c6d40..b4567df 100644 --- a/src/mesa/drivers/dri/i965/genX_boilerplate.h +++ b/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) diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c index e1e619d..33a429a 100644 --- a/src/mesa/drivers/dri/i965/genX_state_upload.c +++ b/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" diff --git a/src/mesa/drivers/dri/i965/hsw_queryobj.c b/src/mesa/drivers/dri/i965/hsw_queryobj.c index 21495f3..81c354b 100644 --- a/src/mesa/drivers/dri/i965/hsw_queryobj.c +++ b/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; diff --git a/src/mesa/drivers/dri/i965/hsw_sol.c b/src/mesa/drivers/dri/i965/hsw_sol.c index d4ca012..4186eeb 100644 --- a/src/mesa/drivers/dri/i965/hsw_sol.c +++ b/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" /** diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build index f4bdb38..9d44c7f 100644 --- a/src/mesa/drivers/dri/i965/meson.build +++ b/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', ) -- 2.7.4