diff options
Diffstat (limited to 'intern/cycles/kernel/svm/svm.h')
-rw-r--r-- | intern/cycles/kernel/svm/svm.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index 5f4d7bbd0c4..12ed61673d1 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -216,13 +216,15 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT case NODE_JUMP: offset = node.y; break; -#ifdef __TEXTURES__ +#ifdef __IMAGE_TEXTURES__ case NODE_TEX_IMAGE: svm_node_tex_image(kg, sd, stack, node); break; case NODE_TEX_ENVIRONMENT: svm_node_tex_environment(kg, sd, stack, node); break; +#endif +#ifdef __PROCEDURAL_TEXTURES__ case NODE_TEX_SKY: svm_node_tex_sky(kg, sd, stack, node.y, node.z); break; @@ -254,6 +256,7 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT case NODE_GEOMETRY: svm_node_geometry(sd, stack, node.y, node.z); break; +#ifdef __EXTRA_NODES__ case NODE_GEOMETRY_BUMP_DX: svm_node_geometry_bump_dx(sd, stack, node.y, node.z); break; @@ -263,6 +266,7 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT case NODE_LIGHT_PATH: svm_node_light_path(sd, stack, node.y, node.z, path_flag); break; +#endif case NODE_CONVERT: svm_node_convert(sd, stack, node.y, node.z, node.w); break; @@ -272,6 +276,7 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT case NODE_VALUE_V: svm_node_value_v(kg, sd, stack, node.y, &offset); break; +#ifdef __EXTRA_NODES__ case NODE_INVERT: svm_node_invert(sd, stack, node.y, node.z, node.w); break; @@ -293,21 +298,25 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT case NODE_HSV: svm_node_hsv(kg, sd, stack, node.y, node.z, node.w, &offset); break; +#endif case NODE_ATTR: svm_node_attr(kg, sd, stack, node); break; +#ifdef __EXTRA_NODES__ case NODE_ATTR_BUMP_DX: svm_node_attr_bump_dx(kg, sd, stack, node); break; case NODE_ATTR_BUMP_DY: svm_node_attr_bump_dy(kg, sd, stack, node); break; +#endif case NODE_FRESNEL: svm_node_fresnel(sd, stack, node.y, node.z, node.w); break; case NODE_LAYER_WEIGHT: svm_node_layer_weight(sd, stack, node); break; +#ifdef __EXTRA_NODES__ case NODE_SET_DISPLACEMENT: svm_node_set_displacement(sd, stack, node.y); break; @@ -323,6 +332,7 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT case NODE_NORMAL: svm_node_normal(kg, sd, stack, node.y, node.z, node.w, &offset); break; +#endif case NODE_MAPPING: svm_node_mapping(kg, sd, stack, node.y, node.z, &offset); break; @@ -332,15 +342,18 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT case NODE_TEX_COORD: svm_node_tex_coord(kg, sd, stack, node.y, node.z); break; +#ifdef __EXTRA_NODES__ case NODE_TEX_COORD_BUMP_DX: svm_node_tex_coord_bump_dx(kg, sd, stack, node.y, node.z); break; case NODE_TEX_COORD_BUMP_DY: svm_node_tex_coord_bump_dy(kg, sd, stack, node.y, node.z); break; +#endif case NODE_EMISSION_SET_WEIGHT_TOTAL: svm_node_emission_set_weight_total(kg, sd, node.y, node.z, node.w); break; +#ifdef __EXTRA_NODES__ case NODE_RGB_RAMP: svm_node_rgb_ramp(kg, sd, stack, node, &offset); break; @@ -350,6 +363,7 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT case NODE_LIGHT_FALLOFF: svm_node_light_falloff(sd, stack, node); break; +#endif case NODE_END: default: #ifndef __MULTI_CLOSURE__ |