diff options
Diffstat (limited to 'blender.patch')
| -rw-r--r-- | blender.patch | 109 |
1 files changed, 51 insertions, 58 deletions
diff --git a/blender.patch b/blender.patch index 6302f13796b8..fe767829a70a 100644 --- a/blender.patch +++ b/blender.patch @@ -1,14 +1,3 @@ -diff -x .git -ur usd.orig/cmake/defaults/Options.cmake external_usd/cmake/defaults/Options.cmake ---- usd.orig/cmake/defaults/Options.cmake 2019-10-24 22:39:53.000000000 +0200 -+++ external_usd/cmake/defaults/Options.cmake 2019-11-28 13:00:33.197957712 +0100 -@@ -25,6 +25,7 @@ - option(PXR_VALIDATE_GENERATED_CODE "Validate script generated code" OFF) - option(PXR_HEADLESS_TEST_MODE "Disallow GUI based tests, useful for running under headless CI systems." OFF) - option(PXR_BUILD_TESTS "Build tests" ON) -+option(PXR_BUILD_USD_TOOLS "Build commandline tools" ON) - option(PXR_BUILD_IMAGING "Build imaging components" ON) - option(PXR_BUILD_EMBREE_PLUGIN "Build embree imaging plugin" OFF) - option(PXR_BUILD_OPENIMAGEIO_PLUGIN "Build OpenImageIO plugin" OFF) diff -x .git -ur usd.orig/cmake/defaults/Packages.cmake external_usd/cmake/defaults/Packages.cmake --- usd.orig/cmake/defaults/Packages.cmake 2019-10-24 22:39:53.000000000 +0200 +++ external_usd/cmake/defaults/Packages.cmake 2019-11-28 13:00:33.185957483 +0100 @@ -21,11 +10,11 @@ diff -x .git -ur usd.orig/cmake/defaults/Packages.cmake external_usd/cmake/defau add_definitions(${TBB_DEFINITIONS}) # --math -diff -x .git -ur usd.orig/pxr/base/lib/plug/initConfig.cpp external_usd/pxr/base/lib/plug/initConfig.cpp ---- usd.orig/pxr/base/lib/plug/initConfig.cpp 2019-10-24 22:39:53.000000000 +0200 -+++ external_usd/pxr/base/lib/plug/initConfig.cpp 2019-12-11 11:00:37.643323127 +0100 -@@ -69,8 +69,38 @@ - +diff -x .git -ur usd.orig/pxr/base/plug/initConfig.cpp external_usd/pxr/base/plug/initConfig.cpp +--- usd.orig/pxr/base/plug/initConfig.cpp.orig 2020-06-12 17:20:07.478199779 +0200 ++++ external_usd/pxr/base/plug/initConfig.cpp 2020-06-12 17:25:28.648588552 +0200 +@@ -69,10 +69,40 @@ + ARCH_CONSTRUCTOR(Plug_InitConfig, 2, void) { + /* The contents of this constructor have been moved to usd_initialise_plugin_path(...) */ @@ -50,7 +39,9 @@ diff -x .git -ur usd.orig/pxr/base/lib/plug/initConfig.cpp external_usd/pxr/base +usd_initialise_plugin_path(const char *datafiles_usd_path) +{ std::vector<std::string> result; - + + std::vector<std::string> debugMessages; + + // Add Blender-specific paths. They MUST end in a slash, or symlinks will not be treated as directory. + if (datafiles_usd_path != NULL && datafiles_usd_path[0] != '\0') { + std::string datafiles_usd_path_str(datafiles_usd_path); @@ -60,14 +51,14 @@ diff -x .git -ur usd.orig/pxr/base/lib/plug/initConfig.cpp external_usd/pxr/base + result.push_back(datafiles_usd_path_str); + } + - // Determine the absolute path to the Plug shared library. - // Any relative paths specified in the plugin search path will be - // anchored to this directory, to allow for relocatability. -@@ -94,9 +124,24 @@ - _AppendPathList(&result, installLocation, sharedLibPath); + // Determine the absolute path to the Plug shared library. Any relative + // paths specified in the plugin search path will be anchored to this + // directory, to allow for relocatability. Note that this can fail when pxr +@@ -114,9 +144,24 @@ + _AppendPathList(&result, installLocation, binaryPath); #endif // PXR_INSTALL_LOCATION - -- Plug_SetPaths(result); + +- Plug_SetPaths(result, debugMessages); -} + if (!TfGetenv("PXR_PATH_DEBUG").empty()) { + printf("USD Plugin paths: (%zu in total):\n", result.size()); @@ -75,10 +66,10 @@ diff -x .git -ur usd.orig/pxr/base/lib/plug/initConfig.cpp external_usd/pxr/base + printf(" %s\n", path.c_str()); + } + } - -+ Plug_SetPaths(result); + ++ Plug_SetPaths(result, debugMessages); } - + PXR_NAMESPACE_CLOSE_SCOPE + +/* Workaround to make it possible to pass a path at runtime to USD. */ @@ -90,37 +81,6 @@ diff -x .git -ur usd.orig/pxr/base/lib/plug/initConfig.cpp external_usd/pxr/base + PXR_NS::usd_initialise_plugin_path(datafiles_usd_path); +} +} -diff -x .git -ur usd.orig/pxr/usd/CMakeLists.txt external_usd/pxr/usd/CMakeLists.txt ---- usd.orig/pxr/usd/CMakeLists.txt 2019-10-24 22:39:53.000000000 +0200 -+++ external_usd/pxr/usd/CMakeLists.txt 2019-11-28 13:00:33.197957712 +0100 -@@ -1,6 +1,5 @@ - set(DIRS - lib -- bin - plugin - ) - -@@ -8,3 +7,8 @@ - add_subdirectory(${d}) - endforeach() - -+if (PXR_BUILD_USD_TOOLS) -+ add_subdirectory(bin) -+else() -+ message(STATUS "Skipping commandline tools because PXR_BUILD_USD_TOOLS=OFF") -+endif() -diff -Naur external_usd_orig/pxr/base/lib/tf/preprocessorUtils.h external_usd/pxr/base/lib/tf/preprocessorUtils.h ---- external_usd_orig/pxr/base/lib/tf/preprocessorUtils.h 2019-10-24 14:39:53 -0600 -+++ external_usd/pxr/base/lib/tf/preprocessorUtils.h 2020-01-14 09:30:18 -0700 -@@ -189,7 +189,7 @@ - /// Exapnds to 1 if the argument is a tuple, and 0 otherwise. - /// \ingroup group_tf_Preprocessor - /// \hideinitializer --#if defined(ARCH_OS_WINDOWS) -+#if defined(ARCH_COMPILER_MSVC) - #define TF_PP_IS_TUPLE(sequence) \ - BOOST_VMD_IS_TUPLE(sequence) - #else diff -Naur external_usd_base/cmake/macros/Public.cmake external_usd/cmake/macros/Public.cmake --- external_usd_base/cmake/macros/Public.cmake 2019-10-24 14:39:53 -0600 +++ external_usd/cmake/macros/Public.cmake 2020-01-11 13:33:29 -0700 @@ -137,3 +97,36 @@ diff -Naur external_usd_base/cmake/macros/Public.cmake external_usd/cmake/macros endforeach() foreach(lib ${PXR_OBJECT_LIBS}) set(objects "${objects};\$<TARGET_OBJECTS:${lib}>") + +diff --git a/pxr/base/arch/align.h b/pxr/base/arch/align.h +index f3cabf4..ebc8a69 100644 +--- a/pxr/base/arch/align.h ++++ b/pxr/base/arch/align.h +@@ -77,7 +77,11 @@ ArchAlignMemory(void *base) + /// The size of a CPU cache line on the current processor architecture in bytes. + /// + /// \hideinitializer ++#if defined(ARCH_OS_DARWIN) && defined(ARCH_CPU_ARM) ++#define ARCH_CACHE_LINE_SIZE 128 ++#else + #define ARCH_CACHE_LINE_SIZE 64 ++#endif + + ///@} + +diff --git a/pxr/base/arch/math.h b/pxr/base/arch/math.h +index 3e66c37..64a052c 100644 +--- a/pxr/base/arch/math.h ++++ b/pxr/base/arch/math.h +@@ -42,7 +42,7 @@ PXR_NAMESPACE_OPEN_SCOPE + /// \addtogroup group_arch_Math + ///@{ + +-#if defined (ARCH_CPU_INTEL) || defined(doxygen) ++#if defined (ARCH_CPU_INTEL) || defined(ARCH_CPU_ARM) || defined(doxygen) + + /// This is the smallest value e such that 1+e^2 == 1, using floats. + /// True for all IEEE754 chipsets. + + + |