Build: Sync libraries and CMake modules from Blender 4.5

brechtvl · brechtvl · commit 152d7c418da1 · 2025-10-18T14:56:02.000+02:00
The Windows build is still failing in CI for unknown reasons, but better
to have some update.
diff --git a/.clang-format b/.clang-format
@@ -161,8 +161,6 @@ PenaltyBreakString: 1000000
 # "^\s+[A-Z][A-Z0-9_]+\s*\([^\n]*\)\n\s*\{"
 ForEachMacros:
   - BEGIN_ANIMFILTER_SUBCHANNELS
-  - BKE_pbvh_vertex_iter_begin
-  - BKE_pbvh_face_iter_begin
   - BLI_FOREACH_SPARSE_RANGE
   - BLI_SMALLSTACK_ITER_BEGIN
   - BMO_ITER
@@ -257,12 +255,9 @@ ForEachMacros:
   - RNA_PROP_BEGIN
   - RNA_STRUCT_BEGIN
   - RNA_STRUCT_BEGIN_SKIP_RNA_TYPE
-  - SCULPT_VERTEX_DUPLICATES_AND_NEIGHBORS_ITER_BEGIN
-  - SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN
   - SEQ_ALL_BEGIN
   - SEQ_ITERATOR_FOREACH
   - SURFACE_QUAD_ITER_BEGIN
-  - foreach
   - ED_screen_areas_iter
   - SLOT_PROBING_BEGIN
   - SET_SLOT_PROBING_BEGIN
diff --git a/lib/linux_x64 b/lib/linux_x64
@@ -1 +1 @@
-Subproject commit eacf548b2e6c10d1a6d5879218ecaa11f102310a
+Subproject commit c1b8027b12441d29b9a344c3f1524d3ce9fa127d
diff --git a/lib/macos_arm64 b/lib/macos_arm64
@@ -1 +1 @@
-Subproject commit e07a7e9ab9617d5a5ff5564a5e974c05363eea32
+Subproject commit 441cb7e2477e11dad9f417af3bccbbab9ec344b3
diff --git a/lib/macos_x64 b/lib/macos_x64
@@ -1 +1 @@
-Subproject commit 20af2f441ea923b2ec10afe227f968618418f96d
+Subproject commit c6731b0e7d39ce8a9b282b1bbcda47407d66400a
diff --git a/lib/windows_arm64 b/lib/windows_arm64
@@ -1 +1 @@
-Subproject commit 24213b2effc1c25098bcceaf806ad159925f7bf1
+Subproject commit 0d309c4af68a13d55fd550beaec8cb5a3c0ee2e2
diff --git a/lib/windows_x64 b/lib/windows_x64
@@ -1 +1 @@
-Subproject commit cdef40845cd1760e0361673529703bfc5c843838
+Subproject commit a5426d2cc41dddeaea3dfa150c24798e02f757fc
diff --git a/src/cmake/Modules/FindGflags.cmake b/src/cmake/Modules/FindGflags.cmake
@@ -111,7 +111,7 @@ macro(GFLAGS_REPORT_NOT_FOUND REASON_MSG)
   else()
     # Neither QUIETLY nor REQUIRED, use no priority which emits a message
     # but continues configuration and allows generation.
-    message("-- Failed to find gflags - " ${REASON_MSG} ${ARGN})
+    message(STATUS "Failed to find gflags - " ${REASON_MSG} ${ARGN})
   endif()
   return()
 endmacro()
diff --git a/src/cmake/Modules/FindGlog.cmake b/src/cmake/Modules/FindGlog.cmake
@@ -83,7 +83,7 @@ macro(GLOG_REPORT_NOT_FOUND REASON_MSG)
   else()
     # Neither QUIETLY nor REQUIRED, use no priority which emits a message
     # but continues configuration and allows generation.
-    message("-- Failed to find glog - " ${REASON_MSG} ${ARGN})
+    message(STATUS "Failed to find glog - " ${REASON_MSG} ${ARGN})
   endif()
   return()
 endmacro()
diff --git a/src/cmake/Modules/FindHIP.cmake b/src/cmake/Modules/FindHIP.cmake
@@ -46,22 +46,23 @@ if(HIP_HIPCC_EXECUTABLE)
   set(HIP_VERSION_MAJOR 0)
   set(HIP_VERSION_MINOR 0)
   set(HIP_VERSION_PATCH 0)
-  set(_hipcc_executable ${HIP_HIPCC_EXECUTABLE})
 
   # Get version from the header.
-  file(STRINGS "${HIP_ROOT_DIR}/include/hip/hip_version.h" _tmp REGEX "^#define HIP_VERSION_MAJOR.*$")
-  string(REGEX MATCHALL "[0-9]+" HIP_VERSION_MAJOR ${_tmp})
-  file(STRINGS "${HIP_ROOT_DIR}/include/hip/hip_version.h" _tmp REGEX "^#define HIP_VERSION_MINOR.*$")
-  string(REGEX MATCHALL "[0-9]+" HIP_VERSION_MINOR ${_tmp})
-  file(STRINGS "${HIP_ROOT_DIR}/include/hip/hip_version.h" _tmp REGEX "^#define HIP_VERSION_PATCH.*$")
-  string(REGEX MATCHALL "[0-9]+" HIP_VERSION_PATCH ${_tmp})
-  unset(_tmp)
+  set(_hip_version_file "${HIP_ROOT_DIR}/include/hip/hip_version.h")
+  if(EXISTS ${_hip_version_file})
+    file(STRINGS ${_hip_version_file} _tmp REGEX "^#define HIP_VERSION_MAJOR.*$")
+    string(REGEX MATCHALL "[0-9]+" HIP_VERSION_MAJOR ${_tmp})
+    file(STRINGS ${_hip_version_file} _tmp REGEX "^#define HIP_VERSION_MINOR.*$")
+    string(REGEX MATCHALL "[0-9]+" HIP_VERSION_MINOR ${_tmp})
+    file(STRINGS ${_hip_version_file} _tmp REGEX "^#define HIP_VERSION_PATCH.*$")
+    string(REGEX MATCHALL "[0-9]+" HIP_VERSION_PATCH ${_tmp})
+    unset(_tmp)
+  endif()
+  unset(_hip_version_file)
 
   # Construct full semantic version.
   set(HIP_VERSION "${HIP_VERSION_MAJOR}.${HIP_VERSION_MINOR}.${HIP_VERSION_PATCH}")
   set(HIP_VERSION_SHORT "${HIP_VERSION_MAJOR}.${HIP_VERSION_MINOR}")
-  unset(_hip_version_raw)
-  unset(_hipcc_executable)
 endif()
 
 include(FindPackageHandleStandardArgs)
diff --git a/src/cmake/Modules/FindOSL.cmake b/src/cmake/Modules/FindOSL.cmake
@@ -82,7 +82,6 @@ find_program(OSL_COMPILER oslc
              PATH_SUFFIXES bin)
 
 get_filename_component(OSL_SHADER_HINT ${OSL_COMPILER} DIRECTORY)
-get_filename_component(OSL_SHADER_HINT ${OSL_SHADER_DIR}/../ ABSOLUTE)
 
 find_path(OSL_SHADER_DIR
   NAMES
diff --git a/src/cmake/Modules/FindOpenColorIO.cmake b/src/cmake/Modules/FindOpenColorIO.cmake
@@ -24,14 +24,6 @@ else()
   set(OPENCOLORIO_ROOT_DIR "")
 endif()
 
-set(_opencolorio_FIND_COMPONENTS
-  OpenColorIO
-  yaml-cpp
-  expat
-  pystring
-  minizip
-)
-
 set(_opencolorio_SEARCH_DIRS
   ${OPENCOLORIO_ROOT_DIR}
   /opt/lib/ocio
@@ -47,21 +39,16 @@ find_path(OPENCOLORIO_INCLUDE_DIR
 )
 
 set(_opencolorio_LIBRARIES)
-foreach(COMPONENT ${_opencolorio_FIND_COMPONENTS})
-  string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
 
-  find_library(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY
-    NAMES
-      ${COMPONENT}
-    HINTS
-      ${_opencolorio_SEARCH_DIRS}
-    PATH_SUFFIXES
-      lib64 lib lib64/static lib/static
-  )
-  if(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY)
-    list(APPEND _opencolorio_LIBRARIES "${OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY}")
-  endif()
-endforeach()
+find_library(OPENCOLORIO_OPENCOLORIO_LIBRARY
+  NAMES
+    OpenColorIO
+  HINTS
+    ${_opencolorio_SEARCH_DIRS}
+  PATH_SUFFIXES
+    lib64 lib lib64/static lib/static
+)
+list(APPEND _opencolorio_LIBRARIES "${OPENCOLORIO_OPENCOLORIO_LIBRARY}")
 
 if(EXISTS "${OPENCOLORIO_INCLUDE_DIR}/OpenColorIO/OpenColorABI.h")
   # Search twice, because this symbol changed between OCIO 1.x and 2.x
@@ -90,16 +77,11 @@ endif()
 mark_as_advanced(
   OPENCOLORIO_INCLUDE_DIR
   OPENCOLORIO_LIBRARY
+  OPENCOLORIO_OPENCOLORIO_LIBRARY
   OPENCOLORIO_VERSION
 )
 
-foreach(COMPONENT ${_opencolorio_FIND_COMPONENTS})
-  string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-  mark_as_advanced(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY)
-endforeach()
-
 unset(COMPONENT)
 unset(UPPERCOMPONENT)
-unset(_opencolorio_FIND_COMPONENTS)
 unset(_opencolorio_LIBRARIES)
 unset(_opencolorio_SEARCH_DIRS)
diff --git a/src/cmake/Modules/FindOptiX.cmake b/src/cmake/Modules/FindOptiX.cmake
@@ -26,14 +26,6 @@ set(_optix_SEARCH_DIRS
   ${OPTIX_ROOT_DIR}
 )
 
-# TODO: Which environment uses this?
-if(DEFINED ENV{PROGRAMDATA})
-  list(APPEND _optix_SEARCH_DIRS
-    "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 7.4.0"
-    "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 7.3.0"
-  )
-endif()
-
 find_path(OPTIX_INCLUDE_DIR
   NAMES
     optix.h
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -1,7 +1,5 @@
 add_subdirectory(cuew)
-if(NOT APPLE)
-  add_subdirectory(hipew)
-endif()
+add_subdirectory(hipew)
 add_subdirectory(sky)
 if(UNIX AND NOT APPLE)
   add_subdirectory(libc_compat)
diff --git a/third_party/cuew/include/cuew.h b/third_party/cuew/include/cuew.h
@@ -127,7 +127,8 @@ typedef uint32_t cuuint32_t;
 typedef uint64_t cuuint64_t;
 #endif
 
-#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined(__aarch64__)
+#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined(__aarch64__) || \
+    defined(_M_ARM64) || defined(__ppc64__) || defined(__PPC64__)
 typedef unsigned long long CUdeviceptr;
 #else
 typedef unsigned int CUdeviceptr;
@@ -154,6 +155,7 @@ typedef struct CUstream_st *CUstream;
 typedef struct CUgraphicsResource_st *CUgraphicsResource;
 typedef unsigned long long CUtexObject;
 typedef unsigned long long CUsurfObject;
+typedef struct CUextMemory_st *CUexternalMemory;
 
 typedef struct CUuuid_st {
   char bytes[16];
@@ -886,6 +888,49 @@ typedef enum {
 
 typedef struct _nvrtcProgram *nvrtcProgram;
 
+typedef enum CUexternalMemoryHandleType_enum {
+  CU_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD = 1,
+  CU_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32 = 2,
+  CU_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT = 3,
+  CU_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP = 4,
+  CU_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE = 5,
+  CU_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_RESOURCE = 6,
+  CU_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_RESOURCE_KMT = 7,
+  CU_EXTERNAL_MEMORY_HANDLE_TYPE_NVSCIBUF = 8,
+} CUexternalMemoryHandleType;
+
+typedef struct CUDA_EXTERNAL_MEMORY_HANDLE_DESC_st {
+  CUexternalMemoryHandleType type;
+  union {
+    int fd;
+    struct {
+      void *handle;
+      const void *name;
+    } win32;
+    const void *nvSciBufObject;
+  } handle;
+  unsigned long long size;
+  unsigned int flags;
+  unsigned int reserved[16];
+} CUDA_EXTERNAL_MEMORY_HANDLE_DESC_v1;
+typedef CUDA_EXTERNAL_MEMORY_HANDLE_DESC_v1 CUDA_EXTERNAL_MEMORY_HANDLE_DESC;
+
+typedef struct CUDA_EXTERNAL_MEMORY_BUFFER_DESC_st {
+  unsigned long long offset;
+  unsigned long long size;
+  unsigned int flags;
+  unsigned int reserved[16];
+} CUDA_EXTERNAL_MEMORY_BUFFER_DESC_v1;
+typedef CUDA_EXTERNAL_MEMORY_BUFFER_DESC_v1 CUDA_EXTERNAL_MEMORY_BUFFER_DESC;
+
+typedef struct CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC_st {
+  unsigned long long offset;
+  CUDA_ARRAY3D_DESCRIPTOR arrayDesc;
+  unsigned int numLevels;
+  unsigned int reserved[16];
+} CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC_v1;
+typedef CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC_v1 CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC;
+
 /* Function types. */
 typedef CUresult CUDAAPI tcuGetErrorString(CUresult error, const char **pStr);
 typedef CUresult CUDAAPI tcuGetErrorName(CUresult error, const char **pStr);
@@ -1373,6 +1418,18 @@ typedef CUresult CUDAAPI tcuGLMapBufferObjectAsync_v2(CUdeviceptr *dptr,
                                                       CUstream hStream);
 typedef CUresult CUDAAPI tcuGLUnmapBufferObjectAsync(GLuint buffer, CUstream hStream);
 
+typedef CUresult CUDAAPI tcuImportExternalMemory(
+    CUexternalMemory *extMem_out, const CUDA_EXTERNAL_MEMORY_HANDLE_DESC *memHandleDesc);
+typedef CUresult CUDAAPI
+tcuExternalMemoryGetMappedBuffer(CUdeviceptr *devPtr,
+                                 CUexternalMemory extMem,
+                                 const CUDA_EXTERNAL_MEMORY_BUFFER_DESC *bufferDesc);
+typedef CUresult CUDAAPI tcuExternalMemoryGetMappedMipmappedArray(
+    CUmipmappedArray *mipmap,
+    CUexternalMemory extMem,
+    const CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC *mipmapDesc);
+typedef CUresult CUDAAPI tcuDestroyExternalMemory(CUexternalMemory extMem);
+
 typedef const char *CUDAAPI tnvrtcGetErrorString(nvrtcResult result);
 typedef nvrtcResult CUDAAPI tnvrtcVersion(int *major, int *minor);
 typedef nvrtcResult CUDAAPI tnvrtcCreateProgram(nvrtcProgram *prog,
@@ -1624,6 +1681,11 @@ extern tcuGLSetBufferObjectMapFlags *cuGLSetBufferObjectMapFlags;
 extern tcuGLMapBufferObjectAsync_v2 *cuGLMapBufferObjectAsync_v2;
 extern tcuGLUnmapBufferObjectAsync *cuGLUnmapBufferObjectAsync;
 
+extern tcuImportExternalMemory *cuImportExternalMemory;
+extern tcuExternalMemoryGetMappedBuffer *cuExternalMemoryGetMappedBuffer;
+extern tcuExternalMemoryGetMappedMipmappedArray *cuExternalMemoryGetMappedMipmappedArray;
+extern tcuDestroyExternalMemory *cuDestroyExternalMemory;
+
 extern tnvrtcGetErrorString *nvrtcGetErrorString;
 extern tnvrtcVersion *nvrtcVersion;
 extern tnvrtcCreateProgram *nvrtcCreateProgram;
diff --git a/third_party/cuew/src/cuew.c b/third_party/cuew/src/cuew.c
@@ -295,6 +295,11 @@ tcuGLSetBufferObjectMapFlags *cuGLSetBufferObjectMapFlags;
 tcuGLMapBufferObjectAsync_v2 *cuGLMapBufferObjectAsync_v2;
 tcuGLUnmapBufferObjectAsync *cuGLUnmapBufferObjectAsync;
 
+tcuImportExternalMemory *cuImportExternalMemory;
+tcuExternalMemoryGetMappedBuffer *cuExternalMemoryGetMappedBuffer;
+tcuExternalMemoryGetMappedMipmappedArray *cuExternalMemoryGetMappedMipmappedArray;
+tcuDestroyExternalMemory *cuDestroyExternalMemory;
+
 tnvrtcGetErrorString *nvrtcGetErrorString;
 tnvrtcVersion *nvrtcVersion;
 tnvrtcCreateProgram *nvrtcCreateProgram;
@@ -607,6 +612,11 @@ static int cuewCudaInit(void)
   CUDA_LIBRARY_FIND(cuGLMapBufferObjectAsync_v2);
   CUDA_LIBRARY_FIND(cuGLUnmapBufferObjectAsync);
 
+  CUDA_LIBRARY_FIND(cuImportExternalMemory);
+  CUDA_LIBRARY_FIND(cuExternalMemoryGetMappedBuffer);
+  CUDA_LIBRARY_FIND(cuExternalMemoryGetMappedMipmappedArray);
+  CUDA_LIBRARY_FIND(cuDestroyExternalMemory);
+
   result = CUEW_SUCCESS;
   return result;
 }
diff --git a/third_party/hipew/CMakeLists.txt b/third_party/hipew/CMakeLists.txt
@@ -11,6 +11,8 @@ set(INC_SYS
 set(SRC
   src/hipew.c
   include/hipew.h
+  include/hipew6.h
+  include/hipew5.h
 )
 
 set(LIB
@@ -23,7 +25,9 @@ if(HIPRT_INCLUDE_DIR)
 
   list(APPEND SRC
     src/hiprtew.cc
+
     include/hiprtew.h
+    src/util.h
   )
 endif()
 
diff --git a/third_party/hipew/include/hipew.h b/third_party/hipew/include/hipew.h
diff --git a/third_party/hipew/include/hipew5.h b/third_party/hipew/include/hipew5.h
diff --git a/third_party/hipew/include/hipew6.h b/third_party/hipew/include/hipew6.h
diff --git a/third_party/hipew/include/hiprtew.h b/third_party/hipew/include/hiprtew.h
diff --git a/third_party/hipew/src/hipew.c b/third_party/hipew/src/hipew.c
diff --git a/third_party/hipew/src/hiprtew.cc b/third_party/hipew/src/hiprtew.cc
diff --git a/tools/sync_blender_commits.py b/tools/sync_blender_commits.py
