From 3f20b3b58573e4b73047218074e289aabdc8b96c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 15 Sep 2018 08:00:29 +1000 Subject: [PATCH] Cleanup: use r_ prefix for return args --- source/blender/gpu/GPU_shader.h | 4 ++-- source/blender/gpu/intern/gpu_shader.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h index 8b0a1b2b51f..f4fc568c6ff 100644 --- a/source/blender/gpu/GPU_shader.h +++ b/source/blender/gpu/GPU_shader.h @@ -368,8 +368,8 @@ GPUShader *GPU_shader_get_builtin_shader(GPUBuiltinShader shader); void GPU_shader_get_builtin_shader_code( GPUBuiltinShader shader, - const char **vert, const char **frag, - const char **geom, const char **defines); + const char **r_vert, const char **r_frag, + const char **r_geom, const char **r_defines); void GPU_shader_free_builtin_shaders(void); diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c index 5c3776fc7b7..97be9c79811 100644 --- a/source/blender/gpu/intern/gpu_shader.c +++ b/source/blender/gpu/intern/gpu_shader.c @@ -1025,14 +1025,14 @@ GPUShader *GPU_shader_get_builtin_shader(GPUBuiltinShader shader) void GPU_shader_get_builtin_shader_code( GPUBuiltinShader shader, - const char **vert, const char **frag, - const char **geom, const char **defines) + const char **r_vert, const char **r_frag, + const char **r_geom, const char **r_defines) { const GPUShaderStages *stages = builtin_shader_stages + shader; - *vert = stages->vert; - *frag = stages->frag; - *geom = stages->geom; - *defines = gpu_shader_get_builtin_shader_defines(shader); + *r_vert = stages->vert; + *r_frag = stages->frag; + *r_geom = stages->geom; + *r_defines = gpu_shader_get_builtin_shader_defines(shader); } #define MAX_DEFINES 100