66224d69b0
This commit includes the changes to the build system, updated hashes to the actual new libraries as well as a required test update. * DPC++ 6.2.0 RC * freetype 2.13.3 * HIP 6.4.5010 * IGC 2.16.0 * ISPC 1.28.0 * libharu 2.4.5 * libpng 1.6.50 * libvpx 1.15.2 * libxml2 2.14.5 * LLVM 20.1.8 * Manifold 3.2.1 * MaterialX 1.39.3 * OpenColorIO 2.4.2 * openexr 3.3.5 * OpenImageIO 3.0.9.1 * openjpeg 2.5.3 * OpenShadingLanguage 1.14.7.0 * openssl 3.5.2 * Python 3.11.13 * Rubber Band 4.0.0 * ShaderC 2025.3 * sqlite 3.50.4 * USD 25.08 * Wayland 1.24.0 Ref #138940 Co-authored-by: Ray Molenkamp <github@lazydodo.com> Co-authored-by: Jesse Yurkovich <jesse.y@gmail.com> Co-authored-by: Brecht Van Lommel <brecht@blender.org> Co-authored-by: Nikita Sirgienko <nikita.sirgienko@intel.com> Co-authored-by: Sybren A. Stüvel <sybren@blender.org> Co-authored-by: Kace <lakacey03@gmail.com> Co-authored-by: Sebastian Parborg <sebastian@blender.org> Co-authored-by: Anthony Roberts <anthony.roberts@linaro.org> Co-authored-by: Jonas Holzman <jonas@holzman.fr> Pull Request: https://projects.blender.org/blender/blender/pulls/144479
62 lines
2.6 KiB
Diff
62 lines
2.6 KiB
Diff
diff --git a/common/cmake/dpcpp.cmake b/common/cmake/dpcpp.cmake
|
|
index a15c179..4760e63 100644
|
|
--- a/common/cmake/dpcpp.cmake
|
|
+++ b/common/cmake/dpcpp.cmake
|
|
@@ -45,7 +45,7 @@ IF (EMBREE_SYCL_SUPPORT)
|
|
|
|
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-sycl") # makes dpcpp compiler compatible with clang++
|
|
|
|
- SET(CMAKE_CXX_FLAGS_SYCL "-fsycl -fsycl-unnamed-lambda -Xclang -fsycl-allow-func-ptr")
|
|
+ SET(CMAKE_CXX_FLAGS_SYCL "-fsycl -nolibsycl -fsycl-unnamed-lambda -Xclang -fsycl-allow-func-ptr")
|
|
SET(CMAKE_CXX_FLAGS_SYCL "${CMAKE_CXX_FLAGS_SYCL} -Wno-mismatched-tags -Wno-pessimizing-move -Wno-reorder -Wno-unneeded-internal-declaration -Wno-delete-non-abstract-non-virtual-dtor -Wno-dangling-field -Wno-unknown-pragmas -Wno-logical-op-parentheses")
|
|
|
|
IF (SYCL_ONEAPI_ICX AND WIN32)
|
|
diff --git a/common/simd/arm/sse2neon.h b/common/simd/arm/sse2neon.h
|
|
index b18d41e..35e50a6 100644
|
|
--- a/common/simd/arm/sse2neon.h
|
|
+++ b/common/simd/arm/sse2neon.h
|
|
@@ -9038,7 +9038,7 @@ FORCE_INLINE int _sse2neon_sido_negative(int res, int lb, int imm8, int bound)
|
|
FORCE_INLINE int _sse2neon_clz(unsigned int x)
|
|
{
|
|
#if _MSC_VER
|
|
- DWORD cnt = 0;
|
|
+ unsigned long cnt = 0;
|
|
if (_BitScanForward(&cnt, x))
|
|
return cnt;
|
|
return 32;
|
|
@@ -9050,7 +9050,7 @@ FORCE_INLINE int _sse2neon_clz(unsigned int x)
|
|
FORCE_INLINE int _sse2neon_ctz(unsigned int x)
|
|
{
|
|
#if _MSC_VER
|
|
- DWORD cnt = 0;
|
|
+ unsigned long cnt = 0;
|
|
if (_BitScanReverse(&cnt, x))
|
|
return 31 - cnt;
|
|
return 32;
|
|
diff --git a/kernels/CMakeLists.txt b/kernels/CMakeLists.txt
|
|
index b827807..648603a 100644
|
|
--- a/kernels/CMakeLists.txt
|
|
+++ b/kernels/CMakeLists.txt
|
|
@@ -216,6 +216,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)
|
|
@@ -318,7 +324,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)
|