Brecht Van Lommel
757041560f
* Allows Apple Silicon machines to use 8-wide BVH, which the release notes mention give an 8% performance boost. * An update to this version is also required for OpenPGL. This patch includes contributions from Jason Fielder and Sebastian Herholz. Ref D15286, T98555 Differential Revision: https://developer.blender.org/D15482
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
diff -Naur org/kernels/rtcore_config.h.in embree-3.13.4/kernels/rtcore_config.h.in
|
|
--- org/kernels/rtcore_config.h.in 2022-06-14 22:13:52 -0600
|
|
+++ embree-3.13.4/kernels/rtcore_config.h.in 2022-06-24 15:20:12 -0600
|
|
@@ -14,6 +14,7 @@
|
|
#cmakedefine01 EMBREE_MIN_WIDTH
|
|
#define RTC_MIN_WIDTH EMBREE_MIN_WIDTH
|
|
|
|
+#cmakedefine EMBREE_STATIC_LIB
|
|
#cmakedefine EMBREE_API_NAMESPACE
|
|
|
|
#if defined(EMBREE_API_NAMESPACE)
|
|
diff --git a/kernels/CMakeLists.txt b/kernels/CMakeLists.txt
|
|
index 7c2f43d..106b1d5 100644
|
|
--- a/kernels/CMakeLists.txt
|
|
+++ b/kernels/CMakeLists.txt
|
|
@@ -201,6 +201,12 @@ embree_files(EMBREE_LIBRARY_FILES_AVX512 ${AVX512})
|
|
#message("AVX2: ${EMBREE_LIBRARY_FILES_AVX2}")
|
|
#message("AVX512: ${EMBREE_LIBRARY_FILES_AVX512}")
|
|
|
|
+# Bundle Neon2x into the main static library.
|
|
+IF(EMBREE_ISA_NEON2X AND EMBREE_STATIC_LIB)
|
|
+ LIST(APPEND EMBREE_LIBRARY_FILES ${EMBREE_LIBRARY_FILES_AVX2})
|
|
+ LIST(REMOVE_DUPLICATES EMBREE_LIBRARY_FILES)
|
|
+ENDIF()
|
|
+
|
|
# replaces all .cpp files with a dummy file that includes that .cpp file
|
|
# this is to work around an ICC name mangling issue related to lambda functions under windows
|
|
MACRO (CreateISADummyFiles list isa)
|
|
@@ -277,7 +283,7 @@ IF (EMBREE_ISA_AVX AND EMBREE_LIBRARY_FILES_AVX)
|
|
ENDIF()
|
|
ENDIF()
|
|
|
|
-IF (EMBREE_ISA_AVX2 AND EMBREE_LIBRARY_FILES_AVX2)
|
|
+IF (EMBREE_ISA_AVX2 AND EMBREE_LIBRARY_FILES_AVX2 AND NOT (EMBREE_ISA_NEON2X AND EMBREE_STATIC_LIB))
|
|
DISABLE_STACK_PROTECTOR_FOR_INTERSECTORS(${EMBREE_LIBRARY_FILES_AVX2})
|
|
ADD_LIBRARY(embree_avx2 STATIC ${EMBREE_LIBRARY_FILES_AVX2})
|
|
TARGET_LINK_LIBRARIES(embree_avx2 PRIVATE tasking)
|