Cleanup: Clang-Tidy readability-inconsistent-declaration-parameter-name fix

No functional changes

12 files changed, 37 insertions, 37 deletions

diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.h
index b45898f9c6a..e00aac85655 100644
--- a/source/blender/gpu/GPU_batch.h
+++ b/source/blender/gpu/GPU_batch.h
@@ -96,12 +96,12 @@ GPUBatch *GPU_batch_calloc(void);
 GPUBatch *GPU_batch_create_ex(GPUPrimType prim,
                               GPUVertBuf *vert,
                               GPUIndexBuf *elem,
-                              eGPUBatchFlag own_flag);
+                              eGPUBatchFlag owns_flag);
 void GPU_batch_init_ex(GPUBatch *batch,
                        GPUPrimType prim,
                        GPUVertBuf *vert,
                        GPUIndexBuf *elem,
-                       eGPUBatchFlag own_flag);
+                       eGPUBatchFlag owns_flag);
 void GPU_batch_copy(GPUBatch *batch_dst, GPUBatch *batch_src);
 
 #define GPU_batch_create(prim, verts, elem) GPU_batch_create_ex(prim, verts, elem, 0)
diff --git a/source/blender/gpu/GPU_buffers.h b/source/blender/gpu/GPU_buffers.h
index 23349728f25..25e9625a0b3 100644
--- a/source/blender/gpu/GPU_buffers.h
+++ b/source/blender/gpu/GPU_buffers.h
@@ -52,9 +52,9 @@ typedef struct GPU_PBVH_Buffers GPU_PBVH_Buffers;
 GPU_PBVH_Buffers *GPU_pbvh_mesh_buffers_build(const struct MPoly *mpoly,
                                               const struct MLoop *mloop,
                                               const struct MLoopTri *looptri,
-                                              const struct MVert *verts,
+                                              const struct MVert *mvert,
                                               const int *face_indices,
-                                              const int *sculpt_facemap,
+                                              const int *sculpt_face_sets,
                                               const int face_indices_len,
                                               const struct Mesh *mesh);
 
diff --git a/source/blender/gpu/GPU_element.h b/source/blender/gpu/GPU_element.h
index 5cf85b4ea0e..8872080003c 100644
--- a/source/blender/gpu/GPU_element.h
+++ b/source/blender/gpu/GPU_element.h
@@ -94,9 +94,9 @@ GPUIndexBuf *GPU_indexbuf_build(GPUIndexBufBuilder *);
 void GPU_indexbuf_build_in_place(GPUIndexBufBuilder *, GPUIndexBuf *);
 
 /* Create a subrange of an existing indexbuffer. */
-GPUIndexBuf *GPU_indexbuf_create_subrange(GPUIndexBuf *ibo, uint start, uint length);
-void GPU_indexbuf_create_subrange_in_place(GPUIndexBuf *r_ibo,
-                                           GPUIndexBuf *ibo,
+GPUIndexBuf *GPU_indexbuf_create_subrange(GPUIndexBuf *elem_src, uint start, uint length);
+void GPU_indexbuf_create_subrange_in_place(GPUIndexBuf *elem,
+                                           GPUIndexBuf *elem_src,
                                            uint start,
                                            uint length);
 
diff --git a/source/blender/gpu/GPU_framebuffer.h b/source/blender/gpu/GPU_framebuffer.h
index 708ea291cd1..aca7156fa5b 100644
--- a/source/blender/gpu/GPU_framebuffer.h
+++ b/source/blender/gpu/GPU_framebuffer.h
@@ -217,7 +217,7 @@ GPUOffScreen *GPU_offscreen_create(
 void GPU_offscreen_free(GPUOffScreen *ofs);
 void GPU_offscreen_bind(GPUOffScreen *ofs, bool save);
 void GPU_offscreen_unbind(GPUOffScreen *ofs, bool restore);
-void GPU_offscreen_read_pixels(GPUOffScreen *ofs, eGPUDataFormat type, void *pixels);
+void GPU_offscreen_read_pixels(GPUOffScreen *ofs, eGPUDataFormat format, void *pixels);
 void GPU_offscreen_draw_to_screen(GPUOffScreen *ofs, int x, int y);
 int GPU_offscreen_width(const GPUOffScreen *ofs);
 int GPU_offscreen_height(const GPUOffScreen *ofs);
diff --git a/source/blender/gpu/GPU_immediate_util.h b/source/blender/gpu/GPU_immediate_util.h
index 7786bcd2d06..3ea809d59a7 100644
--- a/source/blender/gpu/GPU_immediate_util.h
+++ b/source/blender/gpu/GPU_immediate_util.h
@@ -44,9 +44,9 @@ void imm_draw_circle_wire_2d(uint shdr_pos, float x, float y, float radius, int
 void imm_draw_circle_fill_2d(uint shdr_pos, float x, float y, float radius, int nsegments);
 
 void imm_draw_circle_wire_aspect_2d(
-    uint shdr_pos, float x, float y, float radius_x, float radius_y, int nsegments);
+    uint shdr_pos, float x, float y, float rad_x, float rad_y, int nsegments);
 void imm_draw_circle_fill_aspect_2d(
-    uint shdr_pos, float x, float y, float radius_x, float radius_y, int nsegments);
+    uint shdr_pos, float x, float y, float rad_x, float rad_y, int nsegments);
 
 /* use this version when GPUVertFormat has a vec3 position */
 void imm_draw_circle_wire_3d(uint pos, float x, float y, float radius, int nsegments);
@@ -60,8 +60,8 @@ void imm_draw_circle_partial_wire_2d(
 void imm_draw_disk_partial_fill_2d(uint pos,
                                    float x,
                                    float y,
-                                   float radius_inner,
-                                   float radius_outer,
+                                   float rad_inner,
+                                   float rad_outer,
                                    int nsegments,
                                    float start,
                                    float sweep);
diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h
index 12152a937d9..2f12625acac 100644
--- a/source/blender/gpu/GPU_material.h
+++ b/source/blender/gpu/GPU_material.h
@@ -152,7 +152,7 @@ GPUNodeLink *GPU_image_tiled(GPUMaterial *mat,
                              struct ImageUser *iuser,
                              eGPUSamplerState sampler_state);
 GPUNodeLink *GPU_image_tiled_mapping(GPUMaterial *mat, struct Image *ima, struct ImageUser *iuser);
-GPUNodeLink *GPU_color_band(GPUMaterial *mat, int size, float *pixels, float *layer);
+GPUNodeLink *GPU_color_band(GPUMaterial *mat, int size, float *pixels, float *row);
 GPUNodeLink *GPU_volume_grid(GPUMaterial *mat,
                              const char *name,
                              eGPUVolumeDefaultValue default_value);
diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h
index 33fef266c42..64695dfe3fb 100644
--- a/source/blender/gpu/GPU_shader.h
+++ b/source/blender/gpu/GPU_shader.h
@@ -41,26 +41,26 @@ typedef enum eGPUShaderTFBType {
   GPU_SHADER_TFB_TRIANGLES = 3,
 } eGPUShaderTFBType;
 
-GPUShader *GPU_shader_create(const char *vertexcode,
+GPUShader *GPU_shader_create(const char *vertcode,
                              const char *fragcode,
-                             const char *geocode,
+                             const char *geomcode,
                              const char *libcode,
                              const char *defines,
-                             const char *shader_name);
-GPUShader *GPU_shader_create_from_python(const char *vertexcode,
+                             const char *shname);
+GPUShader *GPU_shader_create_from_python(const char *vertcode,
                                          const char *fragcode,
-                                         const char *geocode,
+                                         const char *geomcode,
                                          const char *libcode,
                                          const char *defines);
-GPUShader *GPU_shader_create_ex(const char *vertexcode,
+GPUShader *GPU_shader_create_ex(const char *vertcode,
                                 const char *fragcode,
-                                const char *geocode,
+                                const char *geomcode,
                                 const char *libcode,
                                 const char *defines,
                                 const eGPUShaderTFBType tf_type,
                                 const char **tf_names,
                                 const int tf_count,
-                                const char *shader_name);
+                                const char *shname);
 
 struct GPU_ShaderCreateFromArray_Params {
   const char **vert, **geom, **frag, **defs;
diff --git a/source/blender/gpu/GPU_state.h b/source/blender/gpu/GPU_state.h
index 253877bcca0..869e8c32861 100644
--- a/source/blender/gpu/GPU_state.h
+++ b/source/blender/gpu/GPU_state.h
@@ -130,7 +130,7 @@ void GPU_depth_mask(bool depth);
 bool GPU_depth_mask_get(void);
 void GPU_unpack_row_length_set(uint len);
 void GPU_shadow_offset(bool enable);
-void GPU_clip_distances(int enabled_len);
+void GPU_clip_distances(int distances_enabled);
 bool GPU_mipmap_enabled(void);
 void GPU_state_set(eGPUWriteMask write_mask,
                    eGPUBlend blend,
diff --git a/source/blender/gpu/GPU_texture.h b/source/blender/gpu/GPU_texture.h
index e75ba867662..8cc5936fac9 100644
--- a/source/blender/gpu/GPU_texture.h
+++ b/source/blender/gpu/GPU_texture.h
@@ -202,32 +202,32 @@ GPUTexture *GPU_texture_cube_create(int w,
                                     char err_out[256]);
 
 GPUTexture *GPU_texture_create_1d(int w,
-                                  eGPUTextureFormat data_type,
+                                  eGPUTextureFormat tex_format,
                                   const float *pixels,
                                   char err_out[256]);
 GPUTexture *GPU_texture_create_1d_array(
-    int w, int h, eGPUTextureFormat data_type, const float *pixels, char err_out[256]);
+    int w, int h, eGPUTextureFormat tex_format, const float *pixels, char err_out[256]);
 GPUTexture *GPU_texture_create_2d(
-    int w, int h, eGPUTextureFormat data_type, const float *pixels, char err_out[256]);
+    int w, int h, eGPUTextureFormat tex_format, const float *pixels, char err_out[256]);
 GPUTexture *GPU_texture_create_2d_multisample(int w,
                                               int h,
-                                              eGPUTextureFormat data_type,
+                                              eGPUTextureFormat tex_format,
                                               const float *pixels,
                                               int samples,
                                               char err_out[256]);
 GPUTexture *GPU_texture_create_2d_array(
-    int w, int h, int d, eGPUTextureFormat data_type, const float *pixels, char err_out[256]);
+    int w, int h, int d, eGPUTextureFormat tex_format, const float *pixels, char err_out[256]);
 GPUTexture *GPU_texture_create_3d(
-    int w, int h, int d, eGPUTextureFormat data_type, const float *pixels, char err_out[256]);
+    int w, int h, int d, eGPUTextureFormat tex_format, const float *pixels, char err_out[256]);
 GPUTexture *GPU_texture_create_cube(int w,
-                                    eGPUTextureFormat data_type,
+                                    eGPUTextureFormat tex_format,
                                     const float *pixels,
                                     char err_out[256]);
 GPUTexture *GPU_texture_create_cube_array(
-    int w, int d, eGPUTextureFormat data_type, const float *pixels, char err_out[256]);
+    int w, int d, eGPUTextureFormat tex_format, const float *pixels, char err_out[256]);
 
 GPUTexture *GPU_texture_create_from_vertbuf(struct GPUVertBuf *vert);
-GPUTexture *GPU_texture_create_buffer(eGPUTextureFormat data_type, const uint buffer);
+GPUTexture *GPU_texture_create_buffer(eGPUTextureFormat tex_format, const uint buffer);
 
 GPUTexture *GPU_texture_create_compressed(
     int w, int h, int miplen, eGPUTextureFormat format, const void *data);
@@ -260,7 +260,7 @@ void GPU_invalid_tex_free(void);
 void GPU_texture_free(GPUTexture *tex);
 
 void GPU_texture_ref(GPUTexture *tex);
-void GPU_texture_bind(GPUTexture *tex, int number);
+void GPU_texture_bind(GPUTexture *tex, int unit);
 void GPU_texture_bind_ex(GPUTexture *tex, eGPUSamplerState state, int unit, const bool set_number);
 void GPU_texture_unbind(GPUTexture *tex);
 void GPU_texture_unbind_all(void);
@@ -298,7 +298,7 @@ int GPU_texture_opengl_bindcode(const GPUTexture *tex);
 
 void GPU_texture_get_mipmap_size(GPUTexture *tex, int lvl, int *size);
 
-void GPU_sampler_icon_bind(int number);
+void GPU_sampler_icon_bind(int unit);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/gpu/GPU_uniform_buffer.h b/source/blender/gpu/GPU_uniform_buffer.h
index 4a00dda634d..605e2b14434 100644
--- a/source/blender/gpu/GPU_uniform_buffer.h
+++ b/source/blender/gpu/GPU_uniform_buffer.h
@@ -50,7 +50,7 @@ void GPU_uniformbuf_free(GPUUniformBuf *ubo);
 
 void GPU_uniformbuf_update(GPUUniformBuf *ubo, const void *data);
 
-void GPU_uniformbuf_bind(GPUUniformBuf *ubo, int number);
+void GPU_uniformbuf_bind(GPUUniformBuf *ubo, int slot);
 void GPU_uniformbuf_unbind(GPUUniformBuf *ubo);
 void GPU_uniformbuf_unbind_all(void);
 
diff --git a/source/blender/gpu/GPU_viewport.h b/source/blender/gpu/GPU_viewport.h
index c3e2f1788b4..7b0d8c274d3 100644
--- a/source/blender/gpu/GPU_viewport.h
+++ b/source/blender/gpu/GPU_viewport.h
@@ -129,7 +129,7 @@ ViewportMemoryPool *GPU_viewport_mempool_get(GPUViewport *viewport);
 struct DRWInstanceDataList *GPU_viewport_instance_data_list_get(GPUViewport *viewport);
 
 void *GPU_viewport_engine_data_create(GPUViewport *viewport, void *engine_type);
-void *GPU_viewport_engine_data_get(GPUViewport *viewport, void *engine_type);
+void *GPU_viewport_engine_data_get(GPUViewport *viewport, void *engine_handle);
 void *GPU_viewport_framebuffer_list_get(GPUViewport *viewport);
 void GPU_viewport_stereo_composite(GPUViewport *viewport, Stereo3dFormat *stereo_format);
 void *GPU_viewport_texture_list_get(GPUViewport *viewport);
diff --git a/source/blender/gpu/intern/gpu_shader.cc b/source/blender/gpu/intern/gpu_shader.cc
index 360feb9a8c8..fd01160cff6 100644
--- a/source/blender/gpu/intern/gpu_shader.cc
+++ b/source/blender/gpu/intern/gpu_shader.cc
@@ -629,10 +629,10 @@ void GPU_shader_uniform_4f(GPUShader *sh, const char *name, float x, float y, fl
   GPU_shader_uniform_4fv(sh, name, data);
 }
 
-void GPU_shader_uniform_1f(GPUShader *sh, const char *name, float x)
+void GPU_shader_uniform_1f(GPUShader *sh, const char *name, float value)
 {
   const int loc = GPU_shader_get_uniform(sh, name);
-  GPU_shader_uniform_float(sh, loc, x);
+  GPU_shader_uniform_float(sh, loc, value);
 }
 
 void GPU_shader_uniform_2fv(GPUShader *sh, const char *name, const float data[2])