sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: use r_ prefix for return args

Browse Source
This commit is contained in:
Campbell Barton 2018-09-15 08:00:29 +10:00
parent b3a9069170
commit 3f20b3b585
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/gpu/GPU_shader.h
View File

@ -368,8 +368,8 @@ GPUShader *GPU_shader_get_builtin_shader(GPUBuiltinShader shader);
void GPU_shader_get_builtin_shader_code( void GPU_shader_get_builtin_shader_code(
GPUBuiltinShader shader, GPUBuiltinShader shader,
const char **vert, const char **frag, const char **r_vert, const char **r_frag,
const char **geom, const char **defines); const char **r_geom, const char **r_defines);
void GPU_shader_free_builtin_shaders(void); void GPU_shader_free_builtin_shaders(void);

12
source/blender/gpu/intern/gpu_shader.c
View File

@ -1025,14 +1025,14 @@ GPUShader *GPU_shader_get_builtin_shader(GPUBuiltinShader shader)
void GPU_shader_get_builtin_shader_code( void GPU_shader_get_builtin_shader_code(
GPUBuiltinShader shader, GPUBuiltinShader shader,
const char **vert, const char **frag, const char **r_vert, const char **r_frag,
const char **geom, const char **defines) const char **r_geom, const char **r_defines)
{ {
const GPUShaderStages *stages = builtin_shader_stages + shader; const GPUShaderStages *stages = builtin_shader_stages + shader;
*vert = stages->vert; *r_vert = stages->vert;
*frag = stages->frag; *r_frag = stages->frag;
*geom = stages->geom; *r_geom = stages->geom;
*defines = gpu_shader_get_builtin_shader_defines(shader); *r_defines = gpu_shader_get_builtin_shader_defines(shader);
} }
#define MAX_DEFINES 100 #define MAX_DEFINES 100