archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: use const arguments

Browse Source
This commit is contained in:
Campbell Barton
2021-07-05 21:41:45 +10:00
parent 416e006a2a
commit 6eb8340ef4
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/space_image/image_ops.c
View File

@@ -2738,7 +2738,8 @@ static int image_flip_exec(bContext *C, wmOperator *op)
const int source_pixel_x = use_flip_x ? size_x - x - 1 : x; const int source_pixel_x = use_flip_x ? size_x - x - 1 : x;
const int source_pixel_y = use_flip_y ? size_y - y - 1 : y; const int source_pixel_y = use_flip_y ? size_y - y - 1 : y;
float *source_pixel = &orig_float_pixels[4 * (source_pixel_x + source_pixel_y * size_x)]; const float *source_pixel =
&orig_float_pixels[4 * (source_pixel_x + source_pixel_y * size_x)];
float *target_pixel = &float_pixels[4 * (x + y * size_x)]; float *target_pixel = &float_pixels[4 * (x + y * size_x)];
copy_v4_v4(target_pixel, source_pixel); copy_v4_v4(target_pixel, source_pixel);
@@ -2758,7 +2759,8 @@ static int image_flip_exec(bContext *C, wmOperator *op)
const int source_pixel_x = use_flip_x ? size_x - x - 1 : x; const int source_pixel_x = use_flip_x ? size_x - x - 1 : x;
const int source_pixel_y = use_flip_y ? size_y - y - 1 : y; const int source_pixel_y = use_flip_y ? size_y - y - 1 : y;
char *source_pixel = &orig_char_pixels[4 * (source_pixel_x + source_pixel_y * size_x)]; const char *source_pixel =
&orig_char_pixels[4 * (source_pixel_x + source_pixel_y * size_x)];
char *target_pixel = &char_pixels[4 * (x + y * size_x)]; char *target_pixel = &char_pixels[4 * (x + y * size_x)];
copy_v4_v4_char(target_pixel, source_pixel); copy_v4_v4_char(target_pixel, source_pixel);

4
source/blender/gpu/intern/gpu_codegen.c
View File

@@ -938,9 +938,9 @@ GPUPass *GPU_generate_pass(GPUMaterial *material,
return pass; return pass;
} }
static int count_active_texture_sampler(GPUShader *shader, char *source) static int count_active_texture_sampler(GPUShader *shader, const char *source)
{ {
char *code = source; const char *code = source;
/* Remember this is per stage. */ /* Remember this is per stage. */
GSet *sampler_ids = BLI_gset_int_new(__func__); GSet *sampler_ids = BLI_gset_int_new(__func__);

4
source/blender/gpu/intern/gpu_material_library.c
View File

@@ -684,7 +684,7 @@ static GPUMaterialLibrary *gpu_material_libraries[] = {
static GHash *FUNCTION_HASH = NULL; static GHash *FUNCTION_HASH = NULL;
char *gpu_str_skip_token(char *str, char *token, int max) const char *gpu_str_skip_token(const char *str, char *token, int max)
{ {
int len = 0; int len = 0;
@@ -752,7 +752,7 @@ static void gpu_parse_material_library(GHash *hash, GPUMaterialLibrary *library)
eGPUType type; eGPUType type;
GPUFunctionQual qual; GPUFunctionQual qual;
int i; int i;
char *code = library->code; const char *code = library->code;
while ((code = strstr(code, "void "))) { while ((code = strstr(code, "void "))) {
function = MEM_callocN(sizeof(GPUFunction), "GPUFunction"); function = MEM_callocN(sizeof(GPUFunction), "GPUFunction");

2
source/blender/gpu/intern/gpu_material_library.h
View File

@@ -62,5 +62,5 @@ char *gpu_material_library_generate_code(struct GSet *used_libraries, const char
/* Code Parsing */ /* Code Parsing */
char *gpu_str_skip_token(char *str, char *token, int max); const char *gpu_str_skip_token(const char *str, char *token, int max);
const char *gpu_data_type_to_string(const eGPUType type); const char *gpu_data_type_to_string(const eGPUType type);