Module: Mesa Branch: master Commit: 24a5fb7b84e85d0c84f22ca7180c752f248c5cf6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=24a5fb7b84e85d0c84f22ca7180c752f248c5cf6
Author: Kenneth Graunke <[email protected]> Date: Mon Feb 22 15:59:39 2021 -0800 i965: Rename intelInit and brwInit camel-case functions to brw_* The driver style has been to use underscores for internal functions. Acked-by: Jason Ekstrand <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9207> --- src/mesa/drivers/dri/i965/brw_clear.c | 2 +- src/mesa/drivers/dri/i965/brw_context.c | 22 +++++++++++----------- src/mesa/drivers/dri/i965/brw_context.h | 6 +++--- src/mesa/drivers/dri/i965/brw_program.c | 3 ++- src/mesa/drivers/dri/i965/intel_buffer_objects.c | 2 +- src/mesa/drivers/dri/i965/intel_buffer_objects.h | 2 +- src/mesa/drivers/dri/i965/intel_buffers.c | 2 +- src/mesa/drivers/dri/i965/intel_buffers.h | 2 +- src/mesa/drivers/dri/i965/intel_copy_image.c | 2 +- src/mesa/drivers/dri/i965/intel_extensions.c | 2 +- src/mesa/drivers/dri/i965/intel_pixel.c | 2 +- src/mesa/drivers/dri/i965/intel_pixel.h | 2 +- src/mesa/drivers/dri/i965/intel_tex.c | 2 +- src/mesa/drivers/dri/i965/intel_tex.h | 8 ++++---- src/mesa/drivers/dri/i965/intel_tex_copy.c | 2 +- src/mesa/drivers/dri/i965/intel_tex_image.c | 2 +- 16 files changed, 32 insertions(+), 31 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_clear.c b/src/mesa/drivers/dri/i965/brw_clear.c index 4ea24b8a361..615f6862558 100644 --- a/src/mesa/drivers/dri/i965/brw_clear.c +++ b/src/mesa/drivers/dri/i965/brw_clear.c @@ -297,7 +297,7 @@ brw_clear(struct gl_context *ctx, GLbitfield mask) void -intelInitClearFuncs(struct dd_function_table *functions) +brw_init_clear_functions(struct dd_function_table *functions) { functions->Clear = brw_clear; } diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index fcf296e78a1..70358624c0c 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -348,18 +348,18 @@ brw_init_driver_functions(struct brw_context *brw, functions->UpdateState = brw_update_state; brw_init_draw_functions(functions); - intelInitTextureFuncs(functions); - intelInitTextureImageFuncs(functions); - intelInitTextureCopyImageFuncs(functions); - intelInitCopyImageFuncs(functions); - intelInitClearFuncs(functions); - intelInitBufferFuncs(functions); - intelInitPixelFuncs(functions); - intelInitBufferObjectFuncs(functions); + brw_init_texture_functions(functions); + brw_init_texture_image_functions(functions); + brw_init_texture_copy_image_functions(functions); + brw_init_copy_image_functions(functions); + brw_init_clear_functions(functions); + brw_init_buffer_functions(functions); + brw_init_pixel_functions(functions); + brw_init_buffer_object_functions(functions); brw_init_syncobj_functions(functions); brw_init_object_purgeable_functions(functions); - brwInitFragProgFuncs( functions ); + brw_init_frag_prog_functions(functions); brw_init_common_queryobj_functions(functions); if (devinfo->gen >= 8 || devinfo->is_haswell) hsw_init_queryobj_functions(functions); @@ -847,7 +847,7 @@ brw_initialize_cs_context_constants(struct brw_context *brw) /** * Process driconf (drirc) options, setting appropriate context flags. * - * intelInitExtensions still pokes at optionCache directly, in order to + * brw_init_extensions still pokes at optionCache directly, in order to * avoid advertising various extensions. No flags are set, so it makes * sense to continue doing that there. */ @@ -1103,7 +1103,7 @@ brwCreateContext(gl_api api, brw_init_state(brw); - intelInitExtensions(ctx); + brw_init_extensions(ctx); brw_init_surface_formats(brw); diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 2d25b77ad1d..973655ebd74 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -1254,7 +1254,7 @@ struct brw_context }; /* brw_clear.c */ -extern void intelInitClearFuncs(struct dd_function_table *functions); +extern void brw_init_clear_functions(struct dd_function_table *functions); /*====================================================================== * brw_context.c @@ -1363,7 +1363,7 @@ void brw_validate_textures( struct brw_context *brw ); /*====================================================================== * brw_program.c */ -void brwInitFragProgFuncs( struct dd_function_table *functions ); +void brw_init_frag_prog_functions(struct dd_function_table *functions); void brw_get_scratch_bo(struct brw_context *brw, struct brw_bo **scratch_bo, int size); @@ -1434,7 +1434,7 @@ uint32_t brw_depth_format(struct brw_context *brw, mesa_format format); void brw_init_performance_queries(struct brw_context *brw); /* intel_extensions.c */ -extern void intelInitExtensions(struct gl_context *ctx); +extern void brw_init_extensions(struct gl_context *ctx); /* intel_state.c */ extern int brw_translate_shadow_compare_func(GLenum func); diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index 35450736975..0ec504fd098 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -529,7 +529,8 @@ brw_alloc_stage_scratch(struct brw_context *brw, per_thread_size * thread_count, BRW_MEMZONE_SCRATCH); } -void brwInitFragProgFuncs( struct dd_function_table *functions ) +void +brw_init_frag_prog_functions(struct dd_function_table *functions) { assert(functions->ProgramStringNotify == _tnl_program_string); diff --git a/src/mesa/drivers/dri/i965/intel_buffer_objects.c b/src/mesa/drivers/dri/i965/intel_buffer_objects.c index 5691231f052..428c922d603 100644 --- a/src/mesa/drivers/dri/i965/intel_buffer_objects.c +++ b/src/mesa/drivers/dri/i965/intel_buffer_objects.c @@ -662,7 +662,7 @@ brw_copy_buffer_subdata(struct gl_context *ctx, } void -intelInitBufferObjectFuncs(struct dd_function_table *functions) +brw_init_buffer_object_functions(struct dd_function_table *functions) { functions->NewBufferObject = brw_new_buffer_object; functions->DeleteBuffer = brw_delete_buffer; diff --git a/src/mesa/drivers/dri/i965/intel_buffer_objects.h b/src/mesa/drivers/dri/i965/intel_buffer_objects.h index a61f1cc1a03..434ea49f829 100644 --- a/src/mesa/drivers/dri/i965/intel_buffer_objects.h +++ b/src/mesa/drivers/dri/i965/intel_buffer_objects.h @@ -119,7 +119,7 @@ void brw_upload_init(struct brw_uploader *upload, /* Hook the bufferobject implementation into mesa: */ -void intelInitBufferObjectFuncs(struct dd_function_table *functions); +void brw_init_buffer_object_functions(struct dd_function_table *functions); static inline struct brw_buffer_object * brw_buffer_object(struct gl_buffer_object *obj) diff --git a/src/mesa/drivers/dri/i965/intel_buffers.c b/src/mesa/drivers/dri/i965/intel_buffers.c index 75f37d2d814..b902d622623 100644 --- a/src/mesa/drivers/dri/i965/intel_buffers.c +++ b/src/mesa/drivers/dri/i965/intel_buffers.c @@ -65,7 +65,7 @@ intelReadBuffer(struct gl_context * ctx, GLenum mode) void -intelInitBufferFuncs(struct dd_function_table *functions) +brw_init_buffer_functions(struct dd_function_table *functions) { functions->DrawBuffer = intelDrawBuffer; functions->ReadBuffer = intelReadBuffer; diff --git a/src/mesa/drivers/dri/i965/intel_buffers.h b/src/mesa/drivers/dri/i965/intel_buffers.h index b5ab49f8013..fc14eaf3fbb 100644 --- a/src/mesa/drivers/dri/i965/intel_buffers.h +++ b/src/mesa/drivers/dri/i965/intel_buffers.h @@ -30,6 +30,6 @@ #include "drm-uapi/drm.h" #include "brw_context.h" -extern void intelInitBufferFuncs(struct dd_function_table *functions); +extern void brw_init_buffer_functions(struct dd_function_table *functions); #endif /* INTEL_BUFFERS_H */ diff --git a/src/mesa/drivers/dri/i965/intel_copy_image.c b/src/mesa/drivers/dri/i965/intel_copy_image.c index 6b57e36ed5e..5616f880505 100644 --- a/src/mesa/drivers/dri/i965/intel_copy_image.c +++ b/src/mesa/drivers/dri/i965/intel_copy_image.c @@ -133,7 +133,7 @@ brw_copy_image_sub_data(struct gl_context *ctx, } void -intelInitCopyImageFuncs(struct dd_function_table *functions) +brw_init_copy_image_functions(struct dd_function_table *functions) { functions->CopyImageSubData = brw_copy_image_sub_data; } diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c index dd7f5a8241c..9dfe4045781 100644 --- a/src/mesa/drivers/dri/i965/intel_extensions.c +++ b/src/mesa/drivers/dri/i965/intel_extensions.c @@ -34,7 +34,7 @@ * extensions for a context. */ void -intelInitExtensions(struct gl_context *ctx) +brw_init_extensions(struct gl_context *ctx) { struct brw_context *brw = brw_context(ctx); const struct gen_device_info *devinfo = &brw->screen->devinfo; diff --git a/src/mesa/drivers/dri/i965/intel_pixel.c b/src/mesa/drivers/dri/i965/intel_pixel.c index 72f15f5cdcc..c7635cb71b6 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel.c +++ b/src/mesa/drivers/dri/i965/intel_pixel.c @@ -124,7 +124,7 @@ brw_check_blit_fragment_ops(struct gl_context * ctx, bool src_alpha_is_one) } void -intelInitPixelFuncs(struct dd_function_table *functions) +brw_init_pixel_functions(struct dd_function_table *functions) { functions->Bitmap = intelBitmap; functions->CopyPixels = intelCopyPixels; diff --git a/src/mesa/drivers/dri/i965/intel_pixel.h b/src/mesa/drivers/dri/i965/intel_pixel.h index c3dac3c7e0a..df83af2cbe7 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel.h +++ b/src/mesa/drivers/dri/i965/intel_pixel.h @@ -28,7 +28,7 @@ #include "main/mtypes.h" -void intelInitPixelFuncs(struct dd_function_table *functions); +void brw_init_pixel_functions(struct dd_function_table *functions); bool brw_check_blit_fragment_ops(struct gl_context *ctx, bool src_alpha_is_one); diff --git a/src/mesa/drivers/dri/i965/intel_tex.c b/src/mesa/drivers/dri/i965/intel_tex.c index 25b405a7e60..54421df6c0a 100644 --- a/src/mesa/drivers/dri/i965/intel_tex.c +++ b/src/mesa/drivers/dri/i965/intel_tex.c @@ -323,7 +323,7 @@ brw_texture_barrier(struct gl_context *ctx) } void -intelInitTextureFuncs(struct dd_function_table *functions) +brw_init_texture_functions(struct dd_function_table *functions) { functions->NewTextureObject = intelNewTextureObject; functions->NewTextureImage = intelNewTextureImage; diff --git a/src/mesa/drivers/dri/i965/intel_tex.h b/src/mesa/drivers/dri/i965/intel_tex.h index db3d631ab61..97eed922d9b 100644 --- a/src/mesa/drivers/dri/i965/intel_tex.h +++ b/src/mesa/drivers/dri/i965/intel_tex.h @@ -31,13 +31,13 @@ #include "brw_context.h" #include "intel_mipmap_tree.h" -void intelInitTextureFuncs(struct dd_function_table *functions); +void brw_init_texture_functions(struct dd_function_table *functions); -void intelInitTextureImageFuncs(struct dd_function_table *functions); +void brw_init_texture_image_functions(struct dd_function_table *functions); -void intelInitTextureCopyImageFuncs(struct dd_function_table *functions); +void brw_init_texture_copy_image_functions(struct dd_function_table *functs); -void intelInitCopyImageFuncs(struct dd_function_table *functions); +void brw_init_copy_image_functions(struct dd_function_table *functions); void intelSetTexBuffer(__DRIcontext *pDRICtx, GLint target, __DRIdrawable *pDraw); diff --git a/src/mesa/drivers/dri/i965/intel_tex_copy.c b/src/mesa/drivers/dri/i965/intel_tex_copy.c index bc209c605bd..e8ba004a9a8 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_copy.c +++ b/src/mesa/drivers/dri/i965/intel_tex_copy.c @@ -66,7 +66,7 @@ intelCopyTexSubImage(struct gl_context *ctx, GLuint dims, void -intelInitTextureCopyImageFuncs(struct dd_function_table *functions) +brw_init_texture_copy_image_functions(struct dd_function_table *functions) { functions->CopyTexSubImage = intelCopyTexSubImage; } diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c index afe101c3d1c..1c5cf6dea61 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_image.c +++ b/src/mesa/drivers/dri/i965/intel_tex_image.c @@ -979,7 +979,7 @@ intelCompressedTexSubImage(struct gl_context *ctx, GLuint dims, } void -intelInitTextureImageFuncs(struct dd_function_table *functions) +brw_init_texture_image_functions(struct dd_function_table *functions) { functions->TexImage = intelTexImage; functions->TexSubImage = intelTexSubImage; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
