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
107 lines
3.4 KiB
Diff
107 lines
3.4 KiB
Diff
diff --git a/cmake/defaults/msvcdefaults.cmake b/cmake/defaults/msvcdefaults.cmake
|
|
index f5780c0db..9b5d5c68c 100644
|
|
--- a/cmake/defaults/msvcdefaults.cmake
|
|
+++ b/cmake/defaults/msvcdefaults.cmake
|
|
@@ -126,9 +126,6 @@ _add_define("WIN32_LEAN_AND_MEAN")
|
|
# for all translation units.
|
|
set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /bigobj")
|
|
|
|
-# Enable PDB generation.
|
|
-set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /Zi")
|
|
-
|
|
# Enable multiprocessor builds.
|
|
set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /MP")
|
|
set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /Gm-")
|
|
diff --git a/pxr/base/arch/timing.h b/pxr/base/arch/timing.h
|
|
index 2907195c0..7f8c6097c 100644
|
|
--- a/pxr/base/arch/timing.h
|
|
+++ b/pxr/base/arch/timing.h
|
|
@@ -77,6 +77,10 @@ ArchGetTickTime()
|
|
inline uint64_t
|
|
ArchGetStartTickTime()
|
|
{
|
|
+ // BLENDER: avoid using rdtsc instruction that is not supported on older CPUs.
|
|
+ return ArchGetTickTime();
|
|
+
|
|
+#if 0
|
|
uint64_t t;
|
|
#if defined (ARCH_OS_DARWIN) || defined(ARCH_OS_WASM_VM) || \
|
|
(defined (ARCH_CPU_ARM) && defined (ARCH_COMPILER_MSVC))
|
|
@@ -110,6 +114,7 @@ ArchGetStartTickTime()
|
|
#error "Unsupported architecture."
|
|
#endif
|
|
return t;
|
|
+#endif
|
|
}
|
|
|
|
/// Get a "stop" tick time for measuring an interval of time. See
|
|
@@ -119,6 +124,10 @@ ArchGetStartTickTime()
|
|
inline uint64_t
|
|
ArchGetStopTickTime()
|
|
{
|
|
+ // BLENDER: avoid using rdtsc instruction that is not supported on older CPUs.
|
|
+ return ArchGetTickTime();
|
|
+
|
|
+#if 0
|
|
uint64_t t;
|
|
#if defined (ARCH_OS_DARWIN) || defined(ARCH_OS_WASM_VM) || \
|
|
(defined (ARCH_CPU_ARM) && defined (ARCH_COMPILER_MSVC))
|
|
@@ -150,11 +159,11 @@ ArchGetStopTickTime()
|
|
#error "Unsupported architecture."
|
|
#endif
|
|
return t;
|
|
+#endif
|
|
}
|
|
|
|
-#if defined (doxygen) || \
|
|
- (!defined(ARCH_OS_DARWIN) && defined(ARCH_CPU_INTEL) && \
|
|
- (defined(ARCH_COMPILER_CLANG) || defined(ARCH_COMPILER_GCC)))
|
|
+// BLENDER: avoid using rdtsc instruction that is not supported on older CPUs.
|
|
+#if 0
|
|
|
|
/// A simple timer class for measuring an interval of time using the
|
|
/// ArchTickTimer facilities.
|
|
diff --git a/pxr/imaging/hioOpenVDB/CMakeLists.txt b/pxr/imaging/hioOpenVDB/CMakeLists.txt
|
|
index c94b63c5a..b3bcae4eb 100644
|
|
--- a/pxr/imaging/hioOpenVDB/CMakeLists.txt
|
|
+++ b/pxr/imaging/hioOpenVDB/CMakeLists.txt
|
|
@@ -20,6 +20,12 @@ else()
|
|
LIST(APPEND __VDB_IMATH_LIBS ${OPENEXR_Half_LIBRARY})
|
|
endif()
|
|
|
|
+if (WIN32)
|
|
+ # OpenVDB uses constants from <cmath> that aren't available on
|
|
+ # Windows unless this is defined.
|
|
+ add_definitions(-D_USE_MATH_DEFINES)
|
|
+endif()
|
|
+
|
|
pxr_library(hioOpenVDB
|
|
LIBRARIES
|
|
ar
|
|
diff --git a/pxr/usdImaging/CMakeLists.txt b/pxr/usdImaging/CMakeLists.txt
|
|
index 53c026689..e99a5ac17 100644
|
|
--- a/pxr/usdImaging/CMakeLists.txt
|
|
+++ b/pxr/usdImaging/CMakeLists.txt
|
|
@@ -7,7 +7,7 @@ set(DIRS
|
|
usdVolImaging
|
|
usdAppUtils
|
|
usdviewq
|
|
- bin
|
|
+# bin
|
|
plugin
|
|
)
|
|
|
|
diff --git a/cmake/macros/Private.cmake b/cmake/macros/Private.cmake
|
|
index 6fe1134c1..1d6586fff 100644
|
|
--- a/cmake/macros/Private.cmake
|
|
+++ b/cmake/macros/Private.cmake
|
|
@@ -992,7 +992,7 @@ function(_pxr_python_module NAME)
|
|
return()
|
|
endif()
|
|
|
|
- if (WIN32 AND PXR_USE_DEBUG_PYTHON)
|
|
+ if (WIN32 AND PXR_USE_DEBUG_PYTHON AND NOT "${CMAKE_DEBUG_POSTFIX}" STREQUAL "_d")
|
|
# On Windows when compiling with debug python the library must be named with _d.
|
|
set(LIBRARY_NAME "_${NAME}_d")
|
|
else()
|