From f8dd0080a9c490b017a95857ff750e79d4c6943a Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Tue, 17 Aug 2021 11:12:59 +0200 Subject: Cleanup: clang tidy The parameter name was inconsistent between declaratation and implementation. --- source/blender/gpu/intern/gpu_texture.cc | 36 +++++++++++++++++++------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'source/blender/gpu') diff --git a/source/blender/gpu/intern/gpu_texture.cc b/source/blender/gpu/intern/gpu_texture.cc index 6564cbda694..d5d13ea269f 100644 --- a/source/blender/gpu/intern/gpu_texture.cc +++ b/source/blender/gpu/intern/gpu_texture.cc @@ -241,55 +241,61 @@ static inline GPUTexture *gpu_texture_create(const char *name, } GPUTexture *GPU_texture_create_1d( - const char *name, int w, int mips, eGPUTextureFormat format, const float *data) + const char *name, int w, int mip_len, eGPUTextureFormat format, const float *data) { - return gpu_texture_create(name, w, 0, 0, GPU_TEXTURE_1D, mips, format, GPU_DATA_FLOAT, data); + return gpu_texture_create(name, w, 0, 0, GPU_TEXTURE_1D, mip_len, format, GPU_DATA_FLOAT, data); } GPUTexture *GPU_texture_create_1d_array( - const char *name, int w, int h, int mips, eGPUTextureFormat format, const float *data) + const char *name, int w, int h, int mip_len, eGPUTextureFormat format, const float *data) { return gpu_texture_create( - name, w, h, 0, GPU_TEXTURE_1D_ARRAY, mips, format, GPU_DATA_FLOAT, data); + name, w, h, 0, GPU_TEXTURE_1D_ARRAY, mip_len, format, GPU_DATA_FLOAT, data); } GPUTexture *GPU_texture_create_2d( - const char *name, int w, int h, int mips, eGPUTextureFormat format, const float *data) + const char *name, int w, int h, int mip_len, eGPUTextureFormat format, const float *data) { - return gpu_texture_create(name, w, h, 0, GPU_TEXTURE_2D, mips, format, GPU_DATA_FLOAT, data); + return gpu_texture_create(name, w, h, 0, GPU_TEXTURE_2D, mip_len, format, GPU_DATA_FLOAT, data); } -GPUTexture *GPU_texture_create_2d_array( - const char *name, int w, int h, int d, int mips, eGPUTextureFormat format, const float *data) +GPUTexture *GPU_texture_create_2d_array(const char *name, + int w, + int h, + int d, + int mip_len, + eGPUTextureFormat format, + const float *data) { return gpu_texture_create( - name, w, h, d, GPU_TEXTURE_2D_ARRAY, mips, format, GPU_DATA_FLOAT, data); + name, w, h, d, GPU_TEXTURE_2D_ARRAY, mip_len, format, GPU_DATA_FLOAT, data); } GPUTexture *GPU_texture_create_3d(const char *name, int w, int h, int d, - int mips, + int mip_len, eGPUTextureFormat texture_format, eGPUDataFormat data_format, const void *data) { return gpu_texture_create( - name, w, h, d, GPU_TEXTURE_3D, mips, texture_format, data_format, data); + name, w, h, d, GPU_TEXTURE_3D, mip_len, texture_format, data_format, data); } GPUTexture *GPU_texture_create_cube( - const char *name, int w, int mips, eGPUTextureFormat format, const float *data) + const char *name, int w, int mip_len, eGPUTextureFormat format, const float *data) { - return gpu_texture_create(name, w, w, 0, GPU_TEXTURE_CUBE, mips, format, GPU_DATA_FLOAT, data); + return gpu_texture_create( + name, w, w, 0, GPU_TEXTURE_CUBE, mip_len, format, GPU_DATA_FLOAT, data); } GPUTexture *GPU_texture_create_cube_array( - const char *name, int w, int d, int mips, eGPUTextureFormat format, const float *data) + const char *name, int w, int d, int mip_len, eGPUTextureFormat format, const float *data) { return gpu_texture_create( - name, w, w, d, GPU_TEXTURE_CUBE_ARRAY, mips, format, GPU_DATA_FLOAT, data); + name, w, w, d, GPU_TEXTURE_CUBE_ARRAY, mip_len, format, GPU_DATA_FLOAT, data); } /* DDS texture loading. Return NULL if support is not available. */ -- cgit v1.2.3