diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-06-10 19:55:33 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-06-22 14:28:01 +0300 |
| commit | d1ef5146d72d40f97fdcbf28e96da49193c21dea (patch) | |
| tree | 7a19a24bd6b809c7de72b4e2499d62b8740e639a /intern/cycles/kernel/kernel_types.h | |
| parent | 1de0e13af619e405f351bf42924f819dc3a9bc44 (diff) | |
Cycles: remove SIMD BVH optimizations, to be replaced by Embree
Ref T73778
Depends on D8011
Maniphest Tasks: T73778
Differential Revision: https://developer.blender.org/D8012
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 799daa68450..02de2db8bd2 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -123,9 +123,6 @@ CCL_NAMESPACE_BEGIN /* Device specific features */ #ifdef __KERNEL_CPU__ -# ifdef __KERNEL_SSE2__ -# define __QBVH__ -# endif # ifdef WITH_OSL # define __OSL__ # endif @@ -1389,13 +1386,10 @@ typedef enum KernelBVHLayout { BVH_LAYOUT_NONE = 0, BVH_LAYOUT_BVH2 = (1 << 0), - BVH_LAYOUT_BVH4 = (1 << 1), - BVH_LAYOUT_BVH8 = (1 << 2), - - BVH_LAYOUT_EMBREE = (1 << 3), - BVH_LAYOUT_OPTIX = (1 << 4), + BVH_LAYOUT_EMBREE = (1 << 1), + BVH_LAYOUT_OPTIX = (1 << 2), - BVH_LAYOUT_DEFAULT = BVH_LAYOUT_BVH8, + BVH_LAYOUT_AUTO = BVH_LAYOUT_BVH2, BVH_LAYOUT_ALL = (unsigned int)(~0u), } KernelBVHLayout; |