diff options
author | Campbell Barton <campbell@blender.org> | 2022-05-13 09:14:20 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-05-13 09:14:20 +0300 |
commit | b3938d2a3622840a1d971681f388610c0c925713 (patch) | |
tree | ec94665dd830d84852e7099551331dec7aa45d1f | |
parent | 427a2c920a249c066e324e4a5e40dd141a4968aa (diff) | |
parent | 018acc5688934a0867e07105fe4c44d88f780cec (diff) |
Merge branch 'blender-v3.2-release'
-rw-r--r-- | build_files/build_environment/patches/usd.diff | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/build_files/build_environment/patches/usd.diff b/build_files/build_environment/patches/usd.diff index eb5905109a7..3d0aa4498b7 100644 --- a/build_files/build_environment/patches/usd.diff +++ b/build_files/build_environment/patches/usd.diff @@ -51,3 +51,52 @@ diff --git a/pxr/usd/sdr/shaderMetadataHelpers.h b/pxr/usd/sdr/shaderMetadataHel /// \namespace ShaderMetadataHelpers +diff --git a/pxr/base/arch/timing.h b/pxr/base/arch/timing.h +index 517561f..fda5a1f 100644 +--- a/pxr/base/arch/timing.h ++++ b/pxr/base/arch/timing.h +@@ -91,6 +91,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) + return ArchGetTickTime(); +@@ -123,6 +127,7 @@ ArchGetStartTickTime() + #error "Unsupported architecture." + #endif + return t; ++#endif + } + + /// Get a "stop" tick time for measuring an interval of time. See +@@ -132,6 +137,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) + return ArchGetTickTime(); +@@ -162,11 +171,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. |