OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Rename intelInit and brwInit camel-case functions to brw_*

Browse Source 
The driver style has been to use underscores for internal functions.

Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9207>
This commit is contained in:
Kenneth Graunke
2021-02-22 15:59:39 -08:00
committed by Marge Bot
parent 5876d74216
commit 24a5fb7b84
16 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_clear.c
View File

@@ -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;
}

22
src/mesa/drivers/dri/i965/brw_context.c
View File

@@ -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);

6
src/mesa/drivers/dri/i965/brw_context.h
View File

@@ -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);

3
src/mesa/drivers/dri/i965/brw_program.c
View File

@@ -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);

2
src/mesa/drivers/dri/i965/intel_buffer_objects.c
View File

@@ -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;

2
src/mesa/drivers/dri/i965/intel_buffer_objects.h
View File

@@ -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)

2
src/mesa/drivers/dri/i965/intel_buffers.c
View File

@@ -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;

2
src/mesa/drivers/dri/i965/intel_buffers.h
View File

@@ -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 */

2
src/mesa/drivers/dri/i965/intel_copy_image.c
View File

@@ -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;
}

2
src/mesa/drivers/dri/i965/intel_extensions.c
View File

@@ -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;

2
src/mesa/drivers/dri/i965/intel_pixel.c
View File

@@ -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;

2
src/mesa/drivers/dri/i965/intel_pixel.h
View File

@@ -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);

2
src/mesa/drivers/dri/i965/intel_tex.c
View File

@@ -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;

8
src/mesa/drivers/dri/i965/intel_tex.h
View File

@@ -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);

2
src/mesa/drivers/dri/i965/intel_tex_copy.c
View File

@@ -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;
}

2
src/mesa/drivers/dri/i965/intel_tex_image.c
View File

@@ -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;