diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2021-05-20 14:00:07 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2021-05-20 14:00:07 +0300 |
commit | 0745afeddb6041e5bc9f862a155e5f30d431a88c (patch) | |
tree | 5ff02a23ce6784381389fa21e30bf0f78abc6c1f /intern/cycles/kernel | |
parent | 3e3ecc329caa25285a4bb6cfbb69f4eb40797fe4 (diff) | |
parent | a1954e380730ae9d116245343d9296d587907673 (diff) |
Merge remote-tracking branch 'origin/blender-v2.93-release'
Diffstat (limited to 'intern/cycles/kernel')
-rw-r--r-- | intern/cycles/kernel/kernel_types.h | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 18c4d2f86ad..74fa2826cd4 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -99,27 +99,23 @@ CCL_NAMESPACE_BEGIN #define __AO__ #define __PASSES__ #define __HAIR__ - -/* Without these we get an AO render, used by OpenCL preview kernel. */ -#ifndef __KERNEL_AO_PREVIEW__ -# define __SVM__ -# define __EMISSION__ -# define __HOLDOUT__ -# define __MULTI_CLOSURE__ -# define __TRANSPARENT_SHADOWS__ -# define __BACKGROUND_MIS__ -# define __LAMP_MIS__ -# define __CAMERA_MOTION__ -# define __OBJECT_MOTION__ -# define __BAKING__ -# define __PRINCIPLED__ -# define __SUBSURFACE__ -# define __VOLUME__ -# define __VOLUME_SCATTER__ -# define __CMJ__ -# define __SHADOW_RECORD_ALL__ -# define __BRANCHED_PATH__ -#endif +#define __SVM__ +#define __EMISSION__ +#define __HOLDOUT__ +#define __MULTI_CLOSURE__ +#define __TRANSPARENT_SHADOWS__ +#define __BACKGROUND_MIS__ +#define __LAMP_MIS__ +#define __CAMERA_MOTION__ +#define __OBJECT_MOTION__ +#define __BAKING__ +#define __PRINCIPLED__ +#define __SUBSURFACE__ +#define __VOLUME__ +#define __VOLUME_SCATTER__ +#define __CMJ__ +#define __SHADOW_RECORD_ALL__ +#define __BRANCHED_PATH__ /* Device specific features */ #ifdef __KERNEL_CPU__ |