diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-02-15 19:41:30 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-02-15 22:22:34 +0300 |
| commit | 4ce57f6eb82c0c6d3a23201c8df008d29b18b5f7 (patch) | |
| tree | b6a65cf510f811de1483787d2310993e269d067b /intern | |
| parent | 7baf796886b26e638c87c8c6533b7dc6e9b3803c (diff) | |
macOS: fix Cycles not detecting 64 bit and failing to build with Embree
Contributed by Apple
Ref D9527, T78710
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/bvh/bvh_embree.cpp | 5 | ||||
| -rw-r--r-- | intern/cycles/util/util_defines.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/bvh_embree.cpp index c082478e5b1..07d5d672dce 100644 --- a/intern/cycles/bvh/bvh_embree.cpp +++ b/intern/cycles/bvh/bvh_embree.cpp @@ -31,8 +31,6 @@ #ifdef WITH_EMBREE # include <embree3/rtcore_geometry.h> -# include <pmmintrin.h> -# include <xmmintrin.h> # include "bvh/bvh_embree.h" @@ -306,8 +304,7 @@ BVHEmbree::BVHEmbree(const BVHParams ¶ms_, rtc_device(NULL), build_quality(RTC_BUILD_QUALITY_REFIT) { - _MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON); - _MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON); + SIMD_SET_FLUSH_TO_ZERO; } BVHEmbree::~BVHEmbree() diff --git a/intern/cycles/util/util_defines.h b/intern/cycles/util/util_defines.h index e8e414587fb..0a239a944a5 100644 --- a/intern/cycles/util/util_defines.h +++ b/intern/cycles/util/util_defines.h @@ -26,7 +26,7 @@ /* Bitness */ #if defined(__ppc64__) || defined(__PPC64__) || defined(__x86_64__) || defined(__ia64__) || \ - defined(_M_X64) + defined(_M_X64) || defined(__aarch64__) # define __KERNEL_64_BIT__ #endif |