From f8a4fb43fba508958c4f0eb350e87149d464ac55 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 24 Mar 2020 01:24:18 +0100 Subject: Cleanup: remove unused Cycles kernel feature flags, replace by node levels --- intern/cycles/kernel/kernel_types.h | 2 -- intern/cycles/kernel/svm/svm.h | 32 +++++++++----------------------- intern/cycles/kernel/svm/svm_image.h | 4 ---- 3 files changed, 9 insertions(+), 29 deletions(-) (limited to 'intern/cycles') diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 6a0e74efc91..b6d319311a1 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -111,8 +111,6 @@ static_assert((ADAPTIVE_SAMPLE_STEP & (ADAPTIVE_SAMPLE_STEP - 1)) == 0, #ifndef __KERNEL_AO_PREVIEW__ # define __SVM__ # define __EMISSION__ -# define __TEXTURES__ -# define __EXTRA_NODES__ # define __HOLDOUT__ # define __MULTI_CLOSURE__ # define __TRANSPARENT_SHADOWS__ diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index 02c0cb48108..2ce4456250f 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -310,7 +310,6 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, svm_node_vector_displacement(kg, sd, stack, node, &offset); break; # endif /* NODES_FEATURE(NODE_FEATURE_BUMP) */ -# ifdef __TEXTURES__ case NODE_TEX_IMAGE: svm_node_tex_image(kg, sd, stack, node, &offset); break; @@ -320,9 +319,7 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, case NODE_TEX_NOISE: svm_node_tex_noise(kg, sd, stack, node.y, node.z, node.w, &offset); break; -# endif /* __TEXTURES__ */ -# ifdef __EXTRA_NODES__ -# if NODES_FEATURE(NODE_FEATURE_BUMP) +# if NODES_FEATURE(NODE_FEATURE_BUMP) case NODE_SET_BUMP: svm_node_set_bump(kg, sd, stack, node); break; @@ -347,20 +344,19 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, case NODE_CLOSURE_SET_NORMAL: svm_node_set_normal(kg, sd, stack, node.y, node.z); break; -# if NODES_FEATURE(NODE_FEATURE_BUMP_STATE) +# if NODES_FEATURE(NODE_FEATURE_BUMP_STATE) case NODE_ENTER_BUMP_EVAL: svm_node_enter_bump_eval(kg, sd, stack, node.y); break; case NODE_LEAVE_BUMP_EVAL: svm_node_leave_bump_eval(kg, sd, stack, node.y); break; -# endif /* NODES_FEATURE(NODE_FEATURE_BUMP_STATE) */ -# endif /* NODES_FEATURE(NODE_FEATURE_BUMP) */ +# endif /* NODES_FEATURE(NODE_FEATURE_BUMP_STATE) */ +# endif /* NODES_FEATURE(NODE_FEATURE_BUMP) */ case NODE_HSV: svm_node_hsv(kg, sd, stack, node, &offset); break; -# endif /* __EXTRA_NODES__ */ -#endif /* NODES_GROUP(NODE_GROUP_LEVEL_0) */ +#endif /* NODES_GROUP(NODE_GROUP_LEVEL_0) */ #if NODES_GROUP(NODE_GROUP_LEVEL_1) case NODE_CLOSURE_HOLDOUT: @@ -380,7 +376,6 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, svm_node_principled_volume(kg, sd, stack, node, type, path_flag, &offset); break; # endif /* NODES_FEATURE(NODE_FEATURE_VOLUME) */ -# ifdef __EXTRA_NODES__ case NODE_MATH: svm_node_math(kg, sd, stack, node.y, node.z, node.w, &offset); break; @@ -405,15 +400,12 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, case NODE_PARTICLE_INFO: svm_node_particle_info(kg, sd, stack, node.y, node.z); break; -# ifdef __HAIR__ -# if NODES_FEATURE(NODE_FEATURE_HAIR) +# if defined(__HAIR__) && NODES_FEATURE(NODE_FEATURE_HAIR) case NODE_HAIR_INFO: svm_node_hair_info(kg, sd, stack, node.y, node.z); break; -# endif /* NODES_FEATURE(NODE_FEATURE_HAIR) */ -# endif /* __HAIR__ */ -# endif /* __EXTRA_NODES__ */ -#endif /* NODES_GROUP(NODE_GROUP_LEVEL_1) */ +# endif /* NODES_FEATURE(NODE_FEATURE_HAIR) */ +#endif /* NODES_GROUP(NODE_GROUP_LEVEL_1) */ #if NODES_GROUP(NODE_GROUP_LEVEL_2) case NODE_TEXTURE_MAPPING: @@ -428,7 +420,6 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, case NODE_CAMERA: svm_node_camera(kg, sd, stack, node.y, node.z, node.w); break; -# ifdef __TEXTURES__ case NODE_TEX_ENVIRONMENT: svm_node_tex_environment(kg, sd, stack, node); break; @@ -459,8 +450,6 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, case NODE_TEX_WHITE_NOISE: svm_node_tex_white_noise(kg, sd, stack, node.y, node.z, node.w, &offset); break; -# endif /* __TEXTURES__ */ -# ifdef __EXTRA_NODES__ case NODE_NORMAL: svm_node_normal(kg, sd, stack, node.y, node.z, node.w, &offset); break; @@ -481,8 +470,7 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, case NODE_AOV_VALUE: svm_node_aov_value(kg, sd, stack, node, buffer); break; -# endif /* __EXTRA_NODES__ */ -#endif /* NODES_GROUP(NODE_GROUP_LEVEL_2) */ +#endif /* NODES_GROUP(NODE_GROUP_LEVEL_2) */ #if NODES_GROUP(NODE_GROUP_LEVEL_3) case NODE_RGB_CURVES: @@ -495,7 +483,6 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, case NODE_NORMAL_MAP: svm_node_normal_map(kg, sd, stack, node); break; -# ifdef __EXTRA_NODES__ case NODE_INVERT: svm_node_invert(sd, stack, node.y, node.z, node.w); break; @@ -535,7 +522,6 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, case NODE_CLAMP: svm_node_clamp(kg, sd, stack, node.y, node.z, node.w, &offset); break; -# endif /* __EXTRA_NODES__ */ # if NODES_FEATURE(NODE_FEATURE_VOLUME) case NODE_TEX_VOXEL: svm_node_tex_voxel(kg, sd, stack, node, &offset); diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h index 63939a049a5..f57c85fc23e 100644 --- a/intern/cycles/kernel/svm/svm_image.h +++ b/intern/cycles/kernel/svm/svm_image.h @@ -16,8 +16,6 @@ CCL_NAMESPACE_BEGIN -#ifdef __TEXTURES__ - ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, uint flags) { if (id == -1) { @@ -246,6 +244,4 @@ ccl_device void svm_node_tex_environment(KernelGlobals *kg, stack_store_float(stack, alpha_offset, f.w); } -#endif /* __TEXTURES__ */ - CCL_NAMESPACE_END -- cgit v1.2.3