diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-07-25 14:53:48 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-07-25 17:34:22 +0300 |
| commit | 7a74d91e323c4d695b908ca4178837cee756eeaf (patch) | |
| tree | 7e28e29d53b7905c1d464c49f68481a6380c3303 /intern/cycles/kernel/types.h | |
| parent | c6ce70855a13c42a724755f2989dee756519bef0 (diff) | |
Cleanup: move device BVH code to kernel/device/*/bvh.h
Having the OptiX/MetalRT/Embree/MetalRT implementations all in one file with
many #ifdefs became too confusing. Instead split it up per device, and also
move it together with device specific hit/filter/intersect functions and
associated data types.
Diffstat (limited to 'intern/cycles/kernel/types.h')
| -rw-r--r-- | intern/cycles/kernel/types.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/intern/cycles/kernel/types.h b/intern/cycles/kernel/types.h index 4f4b811a8e7..d809f6fc2bd 100644 --- a/intern/cycles/kernel/types.h +++ b/intern/cycles/kernel/types.h @@ -83,7 +83,6 @@ CCL_NAMESPACE_BEGIN #define __LAMP_MIS__ #define __CAMERA_MOTION__ #define __OBJECT_MOTION__ -#define __BAKING__ #define __PRINCIPLED__ #define __SUBSURFACE__ #define __VOLUME__ @@ -99,10 +98,6 @@ CCL_NAMESPACE_BEGIN # define __VOLUME_RECORD_ALL__ #endif /* __KERNEL_CPU__ */ -#ifdef __KERNEL_GPU_RAYTRACING__ -# undef __BAKING__ -#endif /* __KERNEL_GPU_RAYTRACING__ */ - /* MNEE currently causes "Compute function exceeds available temporary registers" * on Metal, disabled for now. */ #ifndef __KERNEL_METAL__ @@ -129,9 +124,6 @@ CCL_NAMESPACE_BEGIN # if !(__KERNEL_FEATURES & KERNEL_FEATURE_SUBSURFACE) # undef __SUBSURFACE__ # endif -# if !(__KERNEL_FEATURES & KERNEL_FEATURE_BAKING) -# undef __BAKING__ -# endif # if !(__KERNEL_FEATURES & KERNEL_FEATURE_PATCH_EVALUATION) # undef __PATCH_EVAL__ # endif |