blender
/
blender
136
406
Fork 587
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Cleanup: Use switch to get gpu shader name 

Rather than using the array syntax that doesnt work in C++,
use a switch state which is also much easier to read.
This commit is contained in:
Aaron Carlisle 2021-12-30 17:39:23 -05:00
parent ee2b72fd29
commit bf4358ed0c
Notes: blender-bot 2023-02-14 06:17:17 +01:00 
Referenced by issue #94529, Rendering Errors with Motion Blur in Blender 3.1
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/nodes/shader/nodes/node_shader_mapping.c
View File

@ -37,21 +37,29 @@ static bNodeSocketTemplate sh_node_mapping_out[] = {
{-1, ""},
};
static const char *gpu_shader_get_name(int mode)
{
switch (mode) {
case NODE_MAPPING_TYPE_POINT:
return "mapping_point";
case NODE_MAPPING_TYPE_TEXTURE:
return "mapping_texture";
case NODE_MAPPING_TYPE_VECTOR:
return "mapping_vector";
case NODE_MAPPING_TYPE_NORMAL:
return "mapping_normal";
}
return NULL;
}
static int gpu_shader_mapping(GPUMaterial *mat,
bNode *node,
bNodeExecData *UNUSED(execdata),
GPUNodeStack *in,
GPUNodeStack *out)
{
static const char *names[] = {
[NODE_MAPPING_TYPE_POINT] = "mapping_point",
[NODE_MAPPING_TYPE_TEXTURE] = "mapping_texture",
[NODE_MAPPING_TYPE_VECTOR] = "mapping_vector",
[NODE_MAPPING_TYPE_NORMAL] = "mapping_normal",
};
if (node->custom1 < ARRAY_SIZE(names) && names[node->custom1]) {
return GPU_stack_link(mat, node, names[node->custom1], in, out);
if (gpu_shader_get_name(node->custom1)) {
return GPU_stack_link(mat, node, gpu_shader_get_name(node->custom1), in, out);
}
return 0;