LineArt: Try using sort/parallel_sort but crashes

This reverts commit 77afe859a0.

.editorconfig

@@ -34,15 +34,6 @@ indent_style = space
 indent_size = 2
 max_line_length = 99
 
-# Tom's Obvious Minimal Language
-[*.toml]
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 4
-max_line_length = 120
-
 # reStructuredText
 [*.rst]
 charset = utf-8

CMakeLists.txt

@@ -284,7 +284,7 @@ option(WITH_IMAGE_TIFF          "Enable LibTIFF Support" ON)
 option(WITH_IMAGE_DDS           "Enable DDS Image Support" ON)
 option(WITH_IMAGE_CINEON        "Enable CINEON and DPX Image Support" ON)
 option(WITH_IMAGE_HDR           "Enable HDR Image Support" ON)
-option(WITH_IMAGE_WEBP          "Enable WebP Image Support" ON)
+option(WITH_IMAGE_WEBP          "Enable WebP Image Support" OFF)
 
 # Audio/Video format support
 option(WITH_CODEC_AVI           "Enable Blenders own AVI file support (raw/jpeg)" ON)
@@ -302,7 +302,7 @@ option(WITH_USD                 "Enable Universal Scene Description (USD) Suppor
 option(WITH_OPENCOLLADA   "Enable OpenCollada Support (http://www.opencollada.org)" ON)
 
 # Sound output
-option(WITH_SDL           "Enable SDL for sound" ON)
+option(WITH_SDL           "Enable SDL for sound and joystick support" ON)
 option(WITH_OPENAL        "Enable OpenAL Support (http://www.openal.org)" ON)
 if(APPLE)
   option(WITH_COREAUDIO    "Enable CoreAudio for audio support on macOS" ON)
@@ -439,9 +439,14 @@ endif()
 
 # AMD HIP
 if(NOT APPLE)
-  option(WITH_CYCLES_DEVICE_HIP        "Enable Cycles AMD HIP support" ON)
+  if(WIN32)
+    option(WITH_CYCLES_DEVICE_HIP        "Enable Cycles AMD HIP support" ON)
+  else()
+    option(WITH_CYCLES_DEVICE_HIP        "Enable Cycles AMD HIP support" OFF)
+  endif()
+
   option(WITH_CYCLES_HIP_BINARIES      "Build Cycles AMD HIP binaries" OFF)
-  set(CYCLES_HIP_BINARIES_ARCH gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 gfx1035 CACHE STRING "AMD HIP architectures to build binaries for")
+  set(CYCLES_HIP_BINARIES_ARCH gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 CACHE STRING "AMD HIP architectures to build binaries for")
   mark_as_advanced(WITH_CYCLES_DEVICE_HIP)
   mark_as_advanced(CYCLES_HIP_BINARIES_ARCH)
 endif()
@@ -486,7 +491,7 @@ if((UNIX AND NOT APPLE) OR (CMAKE_GENERATOR MATCHES "^Visual Studio.+"))
 endif()
 
 option(WITH_BOOST "Enable features depending on boost" ON)
-option(WITH_TBB   "Enable multithreading. TBB is also required for features such as Cycles, OpenVDB and USD" ON)
+option(WITH_TBB   "Enable features depending on TBB (OpenVDB, OpenImageDenoise, sculpt multithreading)" ON)
 
 # TBB malloc is only supported on for windows currently
 if(WIN32)
@@ -806,9 +811,6 @@ set_and_warn_dependency(WITH_IMAGE_OPENEXR WITH_OPENCOLORIO  OFF)
 # Haru needs `TIFFFaxBlackCodes` & `TIFFFaxWhiteCodes` symbols from TIFF.
 set_and_warn_dependency(WITH_IMAGE_TIFF WITH_HARU       OFF)
 
-# USD needs OpenSubDiv, since that is used by the Cycles Hydra render delegate.
-set_and_warn_dependency(WITH_OPENSUBDIV WITH_USD        OFF)
-
 # auto enable openimageio for cycles
 if(WITH_CYCLES)
   set(WITH_OPENIMAGEIO ON)

GNUmakefile

@@ -120,7 +120,7 @@ Utilities
      Updates git and all submodules but not svn.
 
    * format:
-     Format source code using clang-format & autopep8 (uses PATHS if passed in). For example::
+     Format source code using clang (uses PATHS if passed in). For example::
 
         make format PATHS="source/blender/blenlib source/blender/blenkernel"
 
@@ -130,7 +130,6 @@ Environment Variables
    * BUILD_DIR:             Override default build path.
    * PYTHON:                Use this for the Python command (used for checking tools).
    * NPROCS:                Number of processes to use building (auto-detect when omitted).
-   * AUTOPEP8:              Command used for Python code-formatting (used for the format target).
 
 Documentation Targets
    Not associated with building Blender.
@@ -207,27 +206,6 @@ ifeq ($(OS_NCASE),darwin)
 	endif
 endif
 
-# Set the LIBDIR, an empty string when not found.
-LIBDIR:=$(wildcard ../lib/${OS_NCASE}_${CPU})
-ifeq (, $(LIBDIR))
-	LIBDIR:=$(wildcard ../lib/${OS_NCASE}_centos7_${CPU})
-endif
-ifeq (, $(LIBDIR))
-	LIBDIR:=$(wildcard ../lib/${OS_NCASE})
-endif
-
-# Use the autopep8 module in ../lib/ (which can be executed via Python directly).
-# Otherwise the "autopep8" command can be used.
-ifndef AUTOPEP8
-	ifneq (, $(LIBDIR))
-		AUTOPEP8:=$(wildcard $(LIBDIR)/python/lib/python3.10/site-packages/autopep8.py)
-	endif
-	ifeq (, $(AUTOPEP8))
-		AUTOPEP8:=autopep8
-	endif
-endif
-
-
 # -----------------------------------------------------------------------------
 # additional targets for the build configuration
 
@@ -549,8 +527,8 @@ update_code: .FORCE
 	@$(PYTHON) ./build_files/utils/make_update.py --no-libraries
 
 format: .FORCE
-	@PATH="${LIBDIR}/llvm/bin/:$(PATH)" $(PYTHON) source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
-	@$(PYTHON) source/tools/utils_maintenance/autopep8_format_paths.py --autopep8-command="$(AUTOPEP8)" $(PATHS)
+	@PATH="../lib/${OS_NCASE}_${CPU}/llvm/bin/:../lib/${OS_NCASE}_centos7_${CPU}/llvm/bin/:../lib/${OS_NCASE}/llvm/bin/:$(PATH)" \
+	    $(PYTHON) source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
 
 
 # -----------------------------------------------------------------------------

build_files/build_environment/CMakeLists.txt

@@ -29,9 +29,8 @@ cmake_minimum_required(VERSION 3.5)
 
 include(ExternalProject)
 include(cmake/check_software.cmake)
-include(cmake/versions.cmake)
 include(cmake/options.cmake)
-include(cmake/boost_build_options.cmake)
+include(cmake/versions.cmake)
 include(cmake/download.cmake)
 
 if(ENABLE_MINGW64)
@@ -47,13 +46,15 @@ include(cmake/png.cmake)
 include(cmake/jpeg.cmake)
 include(cmake/blosc.cmake)
 include(cmake/pthreads.cmake)
-include(cmake/imath.cmake)
 include(cmake/openexr.cmake)
 include(cmake/brotli.cmake)
 include(cmake/freetype.cmake)
 include(cmake/freeglut.cmake)
 include(cmake/glew.cmake)
 include(cmake/alembic.cmake)
+include(cmake/glfw.cmake)
+include(cmake/clew.cmake)
+include(cmake/cuew.cmake)
 include(cmake/opensubdiv.cmake)
 include(cmake/sdl.cmake)
 include(cmake/opencollada.cmake)
@@ -74,6 +75,7 @@ endif()
 include(cmake/osl.cmake)
 include(cmake/tbb.cmake)
 include(cmake/openvdb.cmake)
+include(cmake/nanovdb.cmake)
 include(cmake/python.cmake)
 option(USE_PIP_NUMPY "Install NumPy using pip wheel instead of building from source" OFF)
 if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
@@ -92,15 +94,12 @@ include(cmake/pugixml.cmake)
 include(cmake/ispc.cmake)
 include(cmake/openimagedenoise.cmake)
 include(cmake/embree.cmake)
-include(cmake/fmt.cmake)
-include(cmake/robinmap.cmake)
 if(NOT APPLE)
   include(cmake/xr_openxr.cmake)
 endif()
 
 # OpenColorIO and dependencies.
 include(cmake/expat.cmake)
-include(cmake/pystring.cmake)
 include(cmake/yamlcpp.cmake)
 include(cmake/opencolorio.cmake)
 
@@ -108,9 +107,8 @@ if(BLENDER_PLATFORM_ARM)
   include(cmake/sse2neon.cmake)
 endif()
 
-include(cmake/webp.cmake)
-if(NOT APPLE)
-  include(cmake/level-zero.cmake)
+if(WITH_WEBP)
+  include(cmake/webp.cmake)
 endif()
 
 if(NOT WIN32 OR ENABLE_MINGW64)

build_files/build_environment/cmake/alembic.cmake

@@ -1,16 +1,30 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 set(ALEMBIC_EXTRA_ARGS
-  -DImath_ROOT=${LIBDIR}/imath
-  -DUSE_PYALEMBIC=OFF
-  -DUSE_ARNOLD=OFF
-  -DUSE_MAYA=OFF
-  -DUSE_PRMAN=OFF
-  -DUSE_HDF5=OFF
-  -DUSE_TESTS=OFF
+  -DBUILDSTATIC=ON
+  -DLINKSTATIC=ON
+  -DILMBASE_ROOT=${LIBDIR}/openexr
+  -DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${LIBDIR}/openexr/include/OpenEXR
+  -DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DALEMBIC_ILMBASE_IMATH_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DALEMBIC_ILMBASE_ILMTHREAD_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DALEMBIC_ILMBASE_IEX_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DALEMBIC_ILMBASE_IEXMATH_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}IexMath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DUSE_PYILMBASE=0
+  -DUSE_PYALEMBIC=0
+  -DUSE_ARNOLD=0
+  -DUSE_MAYA=0
+  -DUSE_PRMAN=0
+  -DUSE_HDF5=Off
+  -DUSE_STATIC_HDF5=Off
+  -DUSE_TESTS=Off
+  -DALEMBIC_NO_OPENGL=1
   -DUSE_BINARIES=ON
-  -DALEMBIC_ILMBASE_LINK_STATIC=OFF
+  -DALEMBIC_ILMBASE_LINK_STATIC=On
   -DALEMBIC_SHARED_LIBS=OFF
+  -DGLUT_INCLUDE_DIR=""
+  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
 )
 
 ExternalProject_Add(external_alembic
@@ -41,5 +55,6 @@ endif()
 
 add_dependencies(
   external_alembic
+  external_zlib
   external_openexr
 )

build_files/build_environment/cmake/blosc.cmake

@@ -24,6 +24,7 @@ ExternalProject_Add(external_blosc
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${BLOSC_HASH_TYPE}=${BLOSC_HASH}
   PREFIX ${BUILD_DIR}/blosc
+  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/blosc/src/external_blosc < ${PATCH_DIR}/blosc.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blosc ${DEFAULT_CMAKE_FLAGS} ${BLOSC_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/blosc
 )

build_files/build_environment/cmake/boost.cmake

@@ -1,6 +1,22 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+set(BOOST_ADDRESS_MODEL 64)
+
+if(BLENDER_PLATFORM_ARM)
+  set(BOOST_ARCHITECTURE arm)
+else()
+  set(BOOST_ARCHITECTURE x86)
+endif()
+
 if(WIN32)
+  if(MSVC_VERSION GREATER_EQUAL 1920) # 2019
+    set(BOOST_TOOLSET toolset=msvc-14.2)
+    set(BOOST_COMPILER_STRING -vc142)
+  else() # 2017
+    set(BOOST_TOOLSET toolset=msvc-14.1)
+    set(BOOST_COMPILER_STRING -vc141)
+  endif()
+
   set(BOOST_CONFIGURE_COMMAND bootstrap.bat)
   set(BOOST_BUILD_COMMAND b2)
   set(BOOST_BUILD_OPTIONS runtime-link=shared )
@@ -20,6 +36,11 @@ else()
   set(BOOST_BUILD_COMMAND ./b2)
   set(BOOST_BUILD_OPTIONS cxxflags=${PLATFORM_CXXFLAGS} --disable-icu boost.locale.icu=off)
   set(BOOST_PATCH_COMMAND echo .)
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(BOOST_ADDRESS_MODEL 64)
+  else()
+    set(BOOST_ADDRESS_MODEL 32)
+  endif()
 endif()
 
 if(WITH_BOOST_PYTHON)

build_files/build_environment/cmake/boost_build_options.cmake

@@ -1,30 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(BOOST_ADDRESS_MODEL 64)
-if(BLENDER_PLATFORM_ARM)
-  set(BOOST_ARCHITECTURE arm)
-else()
-  set(BOOST_ARCHITECTURE x86)
-endif()
-
-if(WIN32)
-  if(MSVC_VERSION GREATER_EQUAL 1920) # 2019
-    set(BOOST_TOOLSET toolset=msvc-14.2)
-    set(BOOST_COMPILER_STRING -vc142)
-  else() # 2017
-    set(BOOST_TOOLSET toolset=msvc-14.1)
-    set(BOOST_COMPILER_STRING -vc141)
-  endif()
-endif()
-
-set(DEFAULT_BOOST_FLAGS
-  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-  -DBoost_USE_MULTITHREADED=ON
-  -DBoost_USE_STATIC_LIBS=ON
-  -DBoost_USE_STATIC_RUNTIME=OFF
-  -DBOOST_ROOT=${LIBDIR}/boost
-  -DBoost_NO_SYSTEM_PATHS=ON
-  -DBoost_NO_BOOST_CMAKE=ON
-  -DBoost_ADDITIONAL_VERSIONS=${BOOST_VERSION_SHORT}
-  -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
-)

build_files/build_environment/cmake/clew.cmake

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+set(CLEW_EXTRA_ARGS)
+
+ExternalProject_Add(external_clew
+  URL file://${PACKAGE_DIR}/${CLEW_FILE}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH ${CLEW_HASH_TYPE}=${CLEW_HASH}
+  PREFIX ${BUILD_DIR}/clew
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/clew -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${CLEW_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/clew
+)

build_files/build_environment/cmake/cuew.cmake

@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+set(CUEW_EXTRA_ARGS)
+
+ExternalProject_Add(external_cuew
+  URL file://${PACKAGE_DIR}/${CUEW_FILE}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH ${CUEW_HASH_TYPE}=${CUEW_HASH}
+  PREFIX ${BUILD_DIR}/cuew
+  PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/cuew/src/external_cuew < ${PATCH_DIR}/cuew.diff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/cuew -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${CUEW_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/cuew
+)

build_files/build_environment/cmake/download.cmake

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 ## Update and uncomment this in the release branch
-set(BLENDER_VERSION 3.2)
+# set(BLENDER_VERSION 3.1)
 
 function(download_source dep)
   set(TARGET_FILE ${${dep}_FILE})
@@ -39,6 +39,10 @@ download_source(FREETYPE)
 download_source(GLEW)
 download_source(FREEGLUT)
 download_source(ALEMBIC)
+download_source(GLFW)
+download_source(CLEW)
+download_source(GLFW)
+download_source(CUEW)
 download_source(OPENSUBDIV)
 download_source(SDL)
 download_source(OPENCOLLADA)
@@ -67,7 +71,9 @@ download_source(FFMPEG)
 download_source(FFTW)
 download_source(ICONV)
 download_source(SNDFILE)
-download_source(WEBP)
+if(WITH_WEBP)
+  download_source(WEBP)
+endif()
 download_source(SPNAV)
 download_source(JEMALLOC)
 download_source(XML2)
@@ -96,8 +102,3 @@ download_source(HARU)
 download_source(ZSTD)
 download_source(FLEX)
 download_source(BROTLI)
-download_source(FMT)
-download_source(ROBINMAP)
-download_source(IMATH)
-download_source(PYSTRING)
-download_source(LEVEL_ZERO)

build_files/build_environment/cmake/embree.cmake

@@ -17,16 +17,6 @@ set(EMBREE_EXTRA_ARGS
   -DTBB_STATIC_LIB=${TBB_STATIC_LIBRARY}
 )
 
-if(BLENDER_PLATFORM_ARM)
-  set(EMBREE_EXTRA_ARGS
-    ${EMBREE_EXTRA_ARGS}
-    -DEMBREE_MAX_ISA=NEON)
-else()
-  set(EMBREE_EXTRA_ARGS
-    ${EMBREE_EXTRA_ARGS}
-    -DEMBREE_MAX_ISA=AVX2)
-endif()
-
 if(TBB_STATIC_LIBRARY)
   set(EMBREE_EXTRA_ARGS
     ${EMBREE_EXTRA_ARGS}
@@ -47,15 +37,26 @@ else()
   set(EMBREE_BUILD_DIR)
 endif()
 
-ExternalProject_Add(external_embree
-  URL file://${PACKAGE_DIR}/${EMBREE_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${EMBREE_HASH_TYPE}=${EMBREE_HASH}
-  PREFIX ${BUILD_DIR}/embree
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/embree/src/external_embree < ${PATCH_DIR}/embree.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/embree
-)
+if(BLENDER_PLATFORM_ARM)
+  ExternalProject_Add(external_embree
+    GIT_REPOSITORY ${EMBREE_ARM_GIT}
+    GIT_TAG "blender-arm"
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    PREFIX ${BUILD_DIR}/embree
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
+    INSTALL_DIR ${LIBDIR}/embree
+  )
+else()
+  ExternalProject_Add(external_embree
+    URL file://${PACKAGE_DIR}/${EMBREE_FILE}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    URL_HASH ${EMBREE_HASH_TYPE}=${EMBREE_HASH}
+    PREFIX ${BUILD_DIR}/embree
+    PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/embree/src/external_embree < ${PATCH_DIR}/embree.diff
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
+    INSTALL_DIR ${LIBDIR}/embree
+  )
+endif()
 
 add_dependencies(
   external_embree

build_files/build_environment/cmake/fmt.cmake

@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(FMT_EXTRA_ARGS
-  -DFMT_TEST=Off
-)
-
-ExternalProject_Add(external_fmt
-  URL file://${PACKAGE_DIR}/${FMT_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${FMT_HASH_TYPE}=${FMT_HASH}
-  PREFIX ${BUILD_DIR}/fmt
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/fmt ${DEFAULT_CMAKE_FLAGS} ${FMT_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/fmt
-)

build_files/build_environment/cmake/glfw.cmake

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+set(GLFW_EXTRA_ARGS)
+
+ExternalProject_Add(external_glfw
+  URL file://${PACKAGE_DIR}/${GLFW_FILE}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH ${GLFW_HASH_TYPE}=${GLFW_HASH}
+  PREFIX ${BUILD_DIR}/glfw
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/glfw -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${GLFW_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/glfw
+)

build_files/build_environment/cmake/harvest.cmake

@@ -14,8 +14,8 @@ if(WIN32)
 if(BUILD_MODE STREQUAL Release)
   add_custom_target(Harvest_Release_Results
     COMMAND # jpeg rename libfile + copy include
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpeg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpeg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
         # png
         ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib &&
         ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ &&
@@ -67,8 +67,6 @@ harvest(brotli/include brotli/include "*.h")
 harvest(brotli/lib brotli/lib "*.a")
 harvest(boost/include boost/include "*")
 harvest(boost/lib boost/lib "*.a")
-harvest(imath/include imath/include "*.h")
-harvest(imath/lib imath/lib "*.a")
 harvest(ffmpeg/include ffmpeg/include "*.h")
 harvest(ffmpeg/lib ffmpeg/lib "*.a")
 harvest(fftw3/include fftw3/include "*.h")
@@ -82,13 +80,9 @@ harvest(gmp/include gmp/include "*.h")
 harvest(gmp/lib gmp/lib "*.a")
 harvest(jemalloc/include jemalloc/include "*.h")
 harvest(jemalloc/lib jemalloc/lib "*.a")
-harvest(jpeg/include jpeg/include "*.h")
-harvest(jpeg/lib jpeg/lib "libjpeg.a")
+harvest(jpg/include jpeg/include "*.h")
+harvest(jpg/lib jpeg/lib "libjpeg.a")
 harvest(lame/lib ffmpeg/lib "*.a")
-if(NOT APPLE)
-  harvest(level-zero/include/level_zero level-zero/include/level_zero "*.h")
-  harvest(level-zero/lib level-zero/lib "*.so*")
-endif()
 harvest(llvm/bin llvm/bin "clang-format")
 if(BUILD_CLANG_TOOLS)
   harvest(llvm/bin llvm/bin "clang-tidy")
@@ -141,13 +135,13 @@ harvest(openimagedenoise/include openimagedenoise/include "*")
 harvest(openimagedenoise/lib openimagedenoise/lib "*.a")
 harvest(embree/include embree/include "*.h")
 harvest(embree/lib embree/lib "*.a")
-harvest(openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION} openjpeg/include "*.h")
+harvest(openjpeg/include/openjpeg-2.3 openjpeg/include "*.h")
 harvest(openjpeg/lib openjpeg/lib "*.a")
 harvest(opensubdiv/include opensubdiv/include "*.h")
 harvest(opensubdiv/lib opensubdiv/lib "*.a")
 harvest(openvdb/include/openvdb openvdb/include/openvdb "*.h")
-harvest(openvdb/include/nanovdb openvdb/include/nanovdb "*.h")
 harvest(openvdb/lib openvdb/lib "*.a")
+harvest(nanovdb/nanovdb nanovdb/include/nanovdb "*.h")
 harvest(xr_openxr_sdk/include/openxr xr_openxr_sdk/include/openxr "*.h")
 harvest(xr_openxr_sdk/lib xr_openxr_sdk/lib "*.a")
 harvest(osl/bin osl/bin "oslc")
@@ -175,10 +169,9 @@ harvest(tiff/lib tiff/lib "*.a")
 harvest(vorbis/lib ffmpeg/lib "*.a")
 harvest(opus/lib ffmpeg/lib "*.a")
 harvest(vpx/lib ffmpeg/lib "*.a")
+harvest(webp/lib ffmpeg/lib "*.a")
 harvest(x264/lib ffmpeg/lib "*.a")
 harvest(xvidcore/lib ffmpeg/lib "*.a")
-harvest(webp/lib webp/lib "*.a")
-harvest(webp/include webp/include "*.h")
 harvest(usd/include usd/include "*.h")
 harvest(usd/lib/usd usd/lib/usd "*")
 harvest(usd/plugin usd/plugin "*")

build_files/build_environment/cmake/imath.cmake

@@ -1,24 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(IMATH_EXTRA_ARGS
-  -DBUILD_SHARED_LIBS=OFF
-  -DBUILD_TESTING=OFF
-  -DIMATH_LIB_SUFFIX=${OPENEXR_VERSION_BUILD_POSTFIX}
-)
-
-ExternalProject_Add(external_imath
-  URL file://${PACKAGE_DIR}/${IMATH_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${IMATH_HASH_TYPE}=${IMATH_HASH}
-  PREFIX ${BUILD_DIR}/imath
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/imath ${DEFAULT_CMAKE_FLAGS} ${IMATH_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/imath
-)
-
-if(WIN32)
-  ExternalProject_Add_Step(external_imath after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/imath/lib ${HARVEST_TARGET}/imath/lib
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/imath/include ${HARVEST_TARGET}/imath/include
-    DEPENDEES install
-  )
-endif()

build_files/build_environment/cmake/jpeg.cmake

@@ -2,52 +2,44 @@
 
 if(WIN32)
   # cmake for windows
-  set(JPEG_EXTRA_ARGS
-    -DNASM=${NASM_PATH}
-    -DWITH_JPEG8=ON
-    -DCMAKE_DEBUG_POSTFIX=d
-    -DWITH_CRT_DLL=On
-    -DENABLE_SHARED=OFF
-    -DENABLE_STATIC=ON
-  )
+  set(JPEG_EXTRA_ARGS -DNASM=${NASM_PATH} -DWITH_JPEG8=ON  -DCMAKE_DEBUG_POSTFIX=d -DWITH_CRT_DLL=On)
 
   ExternalProject_Add(external_jpeg
     URL file://${PACKAGE_DIR}/${JPEG_FILE}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${JPEG_HASH_TYPE}=${JPEG_HASH}
-    PREFIX ${BUILD_DIR}/jpeg
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpeg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
-    INSTALL_DIR ${LIBDIR}/jpeg
+    PREFIX ${BUILD_DIR}/jpg
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
+    INSTALL_DIR ${LIBDIR}/jpg
   )
 
+  if(BUILD_MODE STREQUAL Debug)
+    ExternalProject_Add_Step(external_jpeg after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpegd${LIBEXT}  ${LIBDIR}/jpg/lib/jpeg${LIBEXT}
+      DEPENDEES install
+    )
+  endif()
+
   if(BUILD_MODE STREQUAL Release)
     set(JPEG_LIBRARY jpeg-static${LIBEXT})
   else()
     set(JPEG_LIBRARY jpeg-staticd${LIBEXT})
   endif()
-
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_jpeg after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpeg/lib/${JPEG_LIBRARY}  ${LIBDIR}/jpeg/lib/jpeg${LIBEXT}
-      DEPENDEES install
-    )
-  endif()
-
 else(WIN32)
   # cmake for unix
   set(JPEG_EXTRA_ARGS
     -DWITH_JPEG8=ON
     -DENABLE_STATIC=ON
     -DENABLE_SHARED=OFF
-    -DCMAKE_INSTALL_LIBDIR=${LIBDIR}/jpeg/lib)
+    -DCMAKE_INSTALL_LIBDIR=${LIBDIR}/jpg/lib)
 
   ExternalProject_Add(external_jpeg
     URL file://${PACKAGE_DIR}/${JPEG_FILE}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${JPEG_HASH_TYPE}=${JPEG_HASH}
-    PREFIX ${BUILD_DIR}/jpeg
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpeg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
-    INSTALL_DIR ${LIBDIR}/jpeg
+    PREFIX ${BUILD_DIR}/jpg
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
+    INSTALL_DIR ${LIBDIR}/jpg
   )
 
   set(JPEG_LIBRARY libjpeg${LIBEXT})

build_files/build_environment/cmake/level-zero.cmake

@@ -1,21 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(LEVEL_ZERO_EXTRA_ARGS
-)
-
-ExternalProject_Add(external_level-zero
-  URL file://${PACKAGE_DIR}/${LEVEL_ZERO_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${LEVEL_ZERO_HASH_TYPE}=${LEVEL_ZERO_HASH}
-  PREFIX ${BUILD_DIR}/level-zero
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/level-zero/src/external_level-zero < ${PATCH_DIR}/level-zero.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/level-zero ${DEFAULT_CMAKE_FLAGS} ${LEVEL_ZERO_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/level-zero
-)
-
-if(BUILD_MODE STREQUAL Release AND WIN32)
-  ExternalProject_Add_Step(external_level-zero after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/level-zero ${HARVEST_TARGET}/level-zero
-    DEPENDEES install
-  )
-endif()

build_files/build_environment/cmake/nanovdb.cmake

@@ -0,0 +1,39 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+set(NANOVDB_EXTRA_ARGS
+   # NanoVDB is header-only, so only need the install target
+  -DNANOVDB_BUILD_UNITTESTS=OFF
+  -DNANOVDB_BUILD_EXAMPLES=OFF
+  -DNANOVDB_BUILD_BENCHMARK=OFF
+  -DNANOVDB_BUILD_DOCS=OFF
+  -DNANOVDB_BUILD_TOOLS=OFF
+  -DNANOVDB_CUDA_KEEP_PTX=OFF
+   # Do not need to include any of the dependencies because of this
+  -DNANOVDB_USE_OPENVDB=OFF
+  -DNANOVDB_USE_OPENGL=OFF
+  -DNANOVDB_USE_OPENCL=OFF
+  -DNANOVDB_USE_CUDA=OFF
+  -DNANOVDB_USE_TBB=OFF
+  -DNANOVDB_USE_BLOSC=OFF
+  -DNANOVDB_USE_ZLIB=OFF
+  -DNANOVDB_USE_OPTIX=OFF
+  -DNANOVDB_ALLOW_FETCHCONTENT=OFF
+)
+
+ExternalProject_Add(nanovdb
+  URL file://${PACKAGE_DIR}/${NANOVDB_FILE}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH ${NANOVDB_HASH_TYPE}=${NANOVDB_HASH}
+  PREFIX ${BUILD_DIR}/nanovdb
+  SOURCE_SUBDIR nanovdb
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/nanovdb/src/nanovdb < ${PATCH_DIR}/nanovdb.diff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/nanovdb ${DEFAULT_CMAKE_FLAGS} ${NANOVDB_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/nanovdb
+)
+
+if(WIN32)
+  ExternalProject_Add_Step(nanovdb after_install
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/nanovdb/nanovdb ${HARVEST_TARGET}/nanovdb/include/nanovdb
+    DEPENDEES install
+  )
+endif()

build_files/build_environment/cmake/opencolorio.cmake

@@ -11,12 +11,13 @@ set(OPENCOLORIO_EXTRA_ARGS
   -DOCIO_BUILD_GPU_TESTS=OFF
   -DOCIO_USE_SSE=ON
 
-  -DOCIO_INSTALL_EXT_PACKAGES=NONE
-
+  # Manually build ext packages except for pystring, which does not have
+  # a CMake or autotools build system that we can easily use.
+  -DOCIO_INSTALL_EXT_PACKAGES=MISSING
+  -DHalf_ROOT=${LIBDIR}/openexr
+  -DHalf_STATIC_LIBRARY=ON
   -Dexpat_ROOT=${LIBDIR}/expat
   -Dyaml-cpp_ROOT=${LIBDIR}/yamlcpp
-  -Dpystring_ROOT=${LIBDIR}/pystring
-  -DImath_ROOT=${LIBDIR}/imath
 )
 
 if(BLENDER_PLATFORM_ARM)
@@ -29,9 +30,7 @@ endif()
 if(WIN32)
   set(OPENCOLORIO_EXTRA_ARGS
     ${OPENCOLORIO_EXTRA_ARGS}
-    -Dexpat_LIBRARY=${LIBDIR}/expat/lib/libexpatMD
-    -Dyaml-cpp_LIBRARY=${LIBDIR}/expat/lib/libyaml-cppmd.lib
-    -DImath_LIBRARY=${LIBDIR}/imath/lib/imath${OPENEXR_VERSION_POSTFIX}
+    -DOCIO_INLINES_HIDDEN=OFF
   )
 else()
   set(OPENCOLORIO_EXTRA_ARGS
@@ -53,8 +52,7 @@ add_dependencies(
   external_opencolorio
   external_yamlcpp
   external_expat
-  external_imath
-  external_pystring
+  external_openexr
 )
 
 if(WIN32)
@@ -64,7 +62,7 @@ if(WIN32)
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/lib ${HARVEST_TARGET}/opencolorio/lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmd.lib ${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/expat/lib/libexpatMD.lib ${HARVEST_TARGET}/opencolorio/lib/libexpatMD.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pystring/lib/pystring.lib ${HARVEST_TARGET}/opencolorio/lib/pystring.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/pystring.lib ${HARVEST_TARGET}/opencolorio/lib/pystring.lib
       DEPENDEES install
     )
   endif()
@@ -73,7 +71,7 @@ if(WIN32)
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/lib/Opencolorio.lib ${HARVEST_TARGET}/opencolorio/lib/OpencolorIO_d.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmdd.lib ${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp_d.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/expat/lib/libexpatdMD.lib ${HARVEST_TARGET}/opencolorio/lib/libexpatdMD.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pystring/lib/pystring.lib ${HARVEST_TARGET}/opencolorio/lib/pystring_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/pystring.lib ${HARVEST_TARGET}/opencolorio/lib/pystring_d.lib
       DEPENDEES install
     )
   endif()
@@ -81,7 +79,7 @@ else()
     ExternalProject_Add_Step(external_opencolorio after_install
       COMMAND cp ${LIBDIR}/yamlcpp/lib/libyaml-cpp.a ${LIBDIR}/opencolorio/lib/
       COMMAND cp ${LIBDIR}/expat/lib/libexpat.a ${LIBDIR}/opencolorio/lib/
-      COMMAND cp ${LIBDIR}/pystring/lib/libpystring.a ${LIBDIR}/opencolorio/lib/
+      COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libpystring.a ${LIBDIR}/opencolorio/lib/
       DEPENDEES install
     )
 endif()

build_files/build_environment/cmake/openexr.cmake

@@ -16,10 +16,12 @@ set(OPENEXR_EXTRA_ARGS
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
   -DBUILD_TESTING=OFF
   -DOPENEXR_BUILD_BOTH_STATIC_SHARED=OFF
+  -DILMBASE_BUILD_BOTH_STATIC_SHARED=OFF
   -DBUILD_SHARED_LIBS=OFF
-  -DOPENEXR_INSTALL_TOOLS=OFF
-  -DOPENEXR_INSTALL_EXAMPLES=OFF
-  -DImath_DIR=${LIBDIR}/imath/lib/cmake/Imath
+  -DOPENEXR_BUILD_UTILS=OFF
+  -DPYILMBASE_ENABLE=OFF
+  -DOPENEXR_VIEWERS_ENABLE=OFF
+  -DILMBASE_LIB_SUFFIX=${OPENEXR_VERSION_BUILD_POSTFIX}
   -DOPENEXR_LIB_SUFFIX=${OPENEXR_VERSION_BUILD_POSTFIX}
 )
 

build_files/build_environment/cmake/openimagedenoise.cmake

@@ -8,7 +8,6 @@ set(OIDN_EXTRA_ARGS
   -DOIDN_STATIC_LIB=ON
   -DOIDN_STATIC_RUNTIME=OFF
   -DISPC_EXECUTABLE=${LIBDIR}/ispc/bin/ispc
-  -DOIDN_FILTER_RTLIGHTMAP=OFF
 )
 
 if(WIN32)

build_files/build_environment/cmake/openimageio.cmake

@@ -23,20 +23,35 @@ else()
   set(OIIO_SIMD_FLAGS)
 endif()
 
+if(WITH_WEBP)
+  set(WEBP_ARGS
+    -DWEBP_INCLUDE_DIR=${LIBDIR}/webp/include
+    -DWEBP_LIBRARY=${LIBDIR}/webp/lib/${LIBPREFIX}webp${LIBEXT}
+  )
+  set(WEBP_DEP external_webp)
+endif()
+
 if(MSVC)
   set(OPENJPEG_FLAGS
-    -DOpenJPEG_ROOT=${LIBDIR}/openjpeg_msvc
+    -DOpenJpeg_ROOT=${LIBDIR}/openjpeg_msvc
   )
 else()
   set(OPENJPEG_FLAGS
-    -DOpenJPEG_ROOT=${LIBDIR}/openjpeg
+    -DOpenJpeg_ROOT=${LIBDIR}/openjpeg
   )
 endif()
 
 set(OPENIMAGEIO_EXTRA_ARGS
   -DBUILD_SHARED_LIBS=OFF
   ${OPENIMAGEIO_LINKSTATIC}
-  ${DEFAULT_BOOST_FLAGS}
+  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+  -DBoost_USE_MULTITHREADED=ON
+  -DBoost_USE_STATIC_LIBS=ON
+  -DBoost_USE_STATIC_RUNTIME=OFF
+  -DBOOST_ROOT=${LIBDIR}/boost
+  -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
+  -DBoost_NO_SYSTEM_PATHS=ON
+  -DBoost_NO_BOOST_CMAKE=ON
   -DUSE_LIBSQUISH=OFF
   -DUSE_QT5=OFF
   -DUSE_NUKE=OFF
@@ -47,6 +62,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
   -DUSE_LIBHEIF=OFF
   -DUSE_OPENGL=OFF
   -DUSE_TBB=OFF
+  -DUSE_FIELD3D=OFF
   -DUSE_QT=OFF
   -DUSE_PYTHON=OFF
   -DUSE_GIF=OFF
@@ -57,7 +73,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
   -DUSE_FREETYPE=OFF
   -DUSE_LIBRAW=OFF
   -DUSE_OPENCOLORIO=OFF
-  -DUSE_WEBP=ON
+  -DUSE_WEBP=${WITH_WEBP}
   -DOIIO_BUILD_TOOLS=${OIIO_TOOLS}
   -DOIIO_BUILD_TESTS=OFF
   -DBUILD_TESTING=OFF
@@ -67,9 +83,14 @@ set(OPENIMAGEIO_EXTRA_ARGS
   -DPNG_PNG_INCLUDE_DIR=${LIBDIR}/png/include
   -DTIFF_LIBRARY=${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT}
   -DTIFF_INCLUDE_DIR=${LIBDIR}/tiff/include
-  -DJPEG_LIBRARY=${LIBDIR}/jpeg/lib/${JPEG_LIBRARY}
-  -DJPEG_INCLUDE_DIR=${LIBDIR}/jpeg/include
+  -DJPEG_LIBRARY=${LIBDIR}/jpg/lib/${JPEG_LIBRARY}
+  -DJPEG_INCLUDE_DIR=${LIBDIR}/jpg/include
   ${OPENJPEG_FLAGS}
+  -DOpenEXR_USE_STATIC_LIBS=On
+  -DILMBASE_INCLUDE_DIR=${LIBDIR}/openexr/include/
+  -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
+  -DOPENEXR_HALF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
   -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${LIBEXT}
   -DOPENEXR_IEX_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
   -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
@@ -77,14 +98,8 @@ set(OPENIMAGEIO_EXTRA_ARGS
   -DUSE_EXTERNAL_PUGIXML=ON
   -DPUGIXML_LIBRARY=${LIBDIR}/pugixml/lib/${LIBPREFIX}pugixml${LIBEXT}
   -DPUGIXML_INCLUDE_DIR=${LIBDIR}/pugixml/include/
-  -DBUILD_MISSING_ROBINMAP=OFF
-  -DBUILD_MISSING_FMT=OFF
-  -DFMT_INCLUDE_DIR=${LIBDIR}/fmt/include/
-  -DRobinmap_ROOT=${LIBDIR}/robinmap
-  -DWebP_ROOT=${LIBDIR}/webp
+  ${WEBP_FLAGS}
   ${OIIO_SIMD_FLAGS}
-  -DOpenEXR_ROOT=${LIBDIR}/openexr
-  -DImath_ROOT=${LIBDIR}/imath
 )
 
 ExternalProject_Add(external_openimageio
@@ -102,15 +117,12 @@ add_dependencies(
   external_png
   external_zlib
   external_openexr
-  external_imath
   external_jpeg
   external_boost
   external_tiff
   external_pugixml
-  external_fmt
-  external_robinmap
   external_openjpeg${OPENJPEG_POSTFIX}
-  external_webp
+  ${WEBP_DEP}
 )
 
 if(WIN32)
@@ -125,8 +137,8 @@ if(WIN32)
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_openimageio after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_d.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util_d.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/openjpeg.cmake

@@ -3,24 +3,20 @@
 # Note the encoder/decoder may use png/tiff/lcms system libraries, but the
 # library itself does not depend on them, so should give no problems.
 
+set(OPENJPEG_EXTRA_ARGS -DBUILD_SHARED_LIBS=OFF)
+
 if(WIN32)
   set(OPENJPEG_EXTRA_ARGS -G "MSYS Makefiles" -DBUILD_PKGCONFIG_FILES=On)
 else()
   set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS})
 endif()
 
-set(OPENJPEG_EXTRA_ARGS
-  ${OPENJPEG_EXTRA_ARGS}
-  -DBUILD_SHARED_LIBS=OFF
-  -DBUILD_CODEC=OFF
-)
-
 ExternalProject_Add(external_openjpeg
   URL file://${PACKAGE_DIR}/${OPENJPEG_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENJPEG_HASH_TYPE}=${OPENJPEG_HASH}
   PREFIX ${BUILD_DIR}/openjpeg
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build && ${CMAKE_COMMAND} ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg ${BUILD_DIR}/openjpeg/src/external_openjpeg
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build && ${CMAKE_COMMAND} ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF ${BUILD_DIR}/openjpeg/src/external_openjpeg
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ && make -j${MAKE_THREADS}
   INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ && make install
   INSTALL_DIR ${LIBDIR}/openjpeg

build_files/build_environment/cmake/opensubdiv.cmake

@@ -1,25 +1,19 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 set(OPENSUBDIV_EXTRA_ARGS
-  -DNO_LIB=OFF
   -DNO_EXAMPLES=ON
-  -DNO_TUTORIALS=ON
   -DNO_REGRESSION=ON
+  -DNO_PYTHON=ON
+  -DNO_MAYA=ON
   -DNO_PTEX=ON
   -DNO_DOC=ON
-  -DNO_OMP=ON
-  -DNO_TBB=OFF
-  -DNO_CUDA=ON
-  -DNO_OPENCL=ON
-  -DNO_CLEW=ON
-  -DNO_OPENGL=OFF
-  -DNO_METAL=OFF
-  -DNO_DX=ON
-  -DNO_TESTS=ON
-  -DNO_GLTESTS=ON
-  -DNO_GLEW=ON
-  -DNO_GLFW=ON
-  -DNO_GLFW_X11=ON
+  -DNO_CLEW=OFF
+  -DNO_OPENCL=OFF
+  -DNO_TUTORIALS=ON
+  -DGLEW_INCLUDE_DIR=${LIBDIR}/glew/include
+  -DGLEW_LIBRARY=${LIBDIR}/glew/lib/libGLEW${LIBEXT}
+  -DGLFW_INCLUDE_DIR=${LIBDIR}/glfw/include
+  -DGLFW_LIBRARIES=${LIBDIR}/glfw/lib/glfw3${LIBEXT}
 )
 
 if(WIN32)
@@ -27,12 +21,30 @@ if(WIN32)
     ${OPENSUBDIV_EXTRA_ARGS}
     -DTBB_INCLUDE_DIR=${LIBDIR}/tbb/include
     -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/tbb.lib
+    -DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
+    -DCLEW_LIBRARY=${LIBDIR}/clew/lib/clew${LIBEXT}
+    -DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
+    -DCUEW_LIBRARY=${LIBDIR}/cuew/lib/cuew${LIBEXT}
   )
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(OPENSUBDIV_EXTRA_ARGS
+      ${OPENSUBDIV_EXTRA_ARGS}
+      -DNO_CUDA=OFF
+    )
+  else()
+    set(OPENSUBDIV_EXTRA_ARGS
+      ${OPENSUBDIV_EXTRA_ARGS}
+      -DNO_CUDA=ON
+    )
+  endif()
+
 else()
   set(OPENSUBDIV_EXTRA_ARGS
     ${OPENSUBDIV_EXTRA_ARGS}
-    -DTBB_INCLUDE_DIR=${LIBDIR}/tbb/include
-    -DTBB_tbb_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
+    -DNO_CUDA=ON
+    -DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
+    -DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
+    -DCLEW_LIBRARY=${LIBDIR}/clew/lib/static/${LIBPREFIX}clew${LIBEXT}
   )
 endif()
 
@@ -64,5 +76,9 @@ endif()
 
 add_dependencies(
   external_opensubdiv
+  external_glew
+  external_glfw
+  external_clew
+  external_cuew
   external_tbb
 )

build_files/build_environment/cmake/openvdb.cmake

@@ -13,7 +13,6 @@ else()
 endif()
 
 set(OPENVDB_EXTRA_ARGS
-  ${DEFAULT_BOOST_FLAGS}
   -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
   -DBoost_USE_MULTITHREADED=ON
   -DBoost_USE_STATIC_LIBS=ON
@@ -25,20 +24,22 @@ set(OPENVDB_EXTRA_ARGS
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
   -DBlosc_INCLUDE_DIR=${LIBDIR}/blosc/include/
   -DBlosc_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
-  -DBlosc_LIBRARY_RELEASE=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
-  -DBlosc_LIBRARY_DEBUG=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
-  -DOPENVDB_BUILD_UNITTESTS=OFF
-  -DOPENVDB_BUILD_PYTHON_MODULE=OFF
-  -DOPENVDB_BUILD_NANOVDB=ON
-  -DNANOVDB_BUILD_TOOLS=OFF
+  -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF
+  -DOPENVDB_BUILD_UNITTESTS=Off
+  -DOPENVDB_BUILD_PYTHON_MODULE=Off
   -DBlosc_ROOT=${LIBDIR}/blosc/
   -DTBB_ROOT=${LIBDIR}/tbb/
+  -DOpenEXR_ROOT=${LIBDIR}/openexr
+  -DIlmBase_ROOT=${LIBDIR}/openexr
+  -DOPENEXR_LIBRARYDIR=${LIBDIR}/openexr/lib
+   # All libs live in openexr, even the ilmbase ones
+  -DILMBASE_LIBRARYDIR=${LIBDIR}/openexr/lib
   -DOPENVDB_CORE_SHARED=${OPENVDB_SHARED}
   -DOPENVDB_CORE_STATIC=${OPENVDB_STATIC}
-  -DOPENVDB_BUILD_BINARIES=OFF
+  -DOPENVDB_BUILD_BINARIES=Off
   -DCMAKE_DEBUG_POSTFIX=_d
-  -DBLOSC_USE_STATIC_LIBS=ON
-  -DUSE_NANOVDB=ON
+  -DILMBASE_USE_STATIC_LIBS=On
+  -DOPENEXR_USE_STATIC_LIBS=On
 )
 
 if(WIN32)
@@ -47,6 +48,15 @@ if(WIN32)
   # needs to link pthreads due to it being a blosc dependency
   set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
     -DCMAKE_CXX_STANDARD_LIBRARIES="${LIBDIR}/pthreads/lib/pthreadVC3.lib"
+    -DUSE_EXR=On
+  )
+else()
+  # OpenVDB can't find the _static libraries automatically.
+  set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
+    -DTbb_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
+    -DTbb_tbb_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
+    -DTbb_tbbmalloc_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbbmalloc_static${LIBEXT}
+    -DTbb_tbbmalloc_proxy_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbbmalloc_proxy_static${LIBEXT}
   )
 endif()
 
@@ -64,6 +74,7 @@ add_dependencies(
   openvdb
   external_tbb
   external_boost
+  external_openexr
   external_zlib
   external_blosc
 )
@@ -71,7 +82,7 @@ add_dependencies(
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(openvdb after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include ${HARVEST_TARGET}/openvdb/include
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include/openvdb ${HARVEST_TARGET}/openvdb/include/openvdb
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/openvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/bin/openvdb.dll ${HARVEST_TARGET}/openvdb/bin/openvdb.dll
       DEPENDEES install

build_files/build_environment/cmake/options.cmake

@@ -3,6 +3,7 @@
 if(WIN32)
   option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/fftw3 by installing mingw64" ON)
 endif()
+option(WITH_WEBP "Enable building of oiio with webp support" OFF)
 option(WITH_BOOST_PYTHON "Enable building of boost with python support" OFF)
 cmake_host_system_information(RESULT NUM_CORES QUERY NUMBER_OF_LOGICAL_CORES)
 set(MAKE_THREADS ${NUM_CORES} CACHE STRING "Number of threads to run make with")
@@ -41,29 +42,29 @@ if(WIN32)
   set(LIBPREFIX "")
 
   # For OIIO and OSL
-  set(COMMON_DEFINES /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS)
+  set(COMMON_DEFINES /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS)
 
   if(MSVC_VERSION GREATER 1909)
     set(COMMON_MSVC_FLAGS "/Wv:18") #some deps with warnings as error aren't quite ready for dealing with the new 2017 warnings.
   endif()
   string(APPEND COMMON_MSVC_FLAGS " /bigobj")
   if(WITH_OPTIMIZED_DEBUG)
-    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
   else()
-    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
   endif()
-  set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "/MD ${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_C_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "/MD ${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_C_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 
   if(WITH_OPTIMIZED_DEBUG)
-    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
   else()
-    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /D PLATFORM_WINDOWS /MTd  ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /D PLATFORM_WINDOWS /MTd  ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
   endif()
-  set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "/MD /${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG  /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "/MD /${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG  /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 
   set(PLATFORM_FLAGS)
   set(PLATFORM_CXX_FLAGS)

build_files/build_environment/cmake/osl.cmake

@@ -3,15 +3,33 @@
 if(WIN32)
   set(OSL_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
   set(OSL_FLEX_BISON -DFLEX_EXECUTABLE=${LIBDIR}/flexbison/win_flex.exe -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe)
+  set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=sse2)
 else()
   set(OSL_CMAKE_CXX_STANDARD_LIBRARIES)
   set(OSL_FLEX_BISON)
-  set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpeg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
+  set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
 endif()
 
+set(OSL_ILMBASE_CUSTOM_LIBRARIES "${LIBDIR}/openexr/lib/Imath${OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/Half{OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/IlmThread${OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/Iex${OPENEXR_VERSION_POSTFIX}.lib")
+
 set(OSL_EXTRA_ARGS
-  ${DEFAULT_BOOST_FLAGS}
+  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+  -DBoost_USE_MULTITHREADED=ON
+  -DBoost_USE_STATIC_LIBS=ON
+  -DBoost_USE_STATIC_RUNTIME=OFF
+  -DBOOST_ROOT=${LIBDIR}/boost
+  -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
+  -DBoost_NO_SYSTEM_PATHS=ON
+  -DBoost_NO_BOOST_CMAKE=ON
   -DOpenEXR_ROOT=${LIBDIR}/openexr/
+  -DIlmBase_ROOT=${LIBDIR}/openexr/
+  -DILMBASE_INCLUDE_DIR=${LIBDIR}/openexr/include/
+  -DOPENEXR_HALF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
+  -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
   -DOpenImageIO_ROOT=${LIBDIR}/openimageio/
   -DOSL_BUILD_TESTS=OFF
   -DOSL_BUILD_MATERIALX=OFF
@@ -31,10 +49,10 @@ set(OSL_EXTRA_ARGS
   -DUSE_QT=OFF
   -DUSE_Qt5=OFF
   -DINSTALL_DOCS=OFF
+  ${OSL_SIMD_FLAGS}
   -Dpugixml_ROOT=${LIBDIR}/pugixml
   -DUSE_PYTHON=OFF
   -DCMAKE_CXX_STANDARD=14
-  -DImath_ROOT=${LIBDIR}/imath
 )
 
 ExternalProject_Add(external_osl

build_files/build_environment/cmake/pystring.cmake

@@ -1,22 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(PYSTRING_EXTRA_ARGS
-)
-
-ExternalProject_Add(external_pystring
-  URL file://${PACKAGE_DIR}/${PYSTRING_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${PYSTRING_HASH_TYPE}=${PYSTRING_HASH}
-  PREFIX ${BUILD_DIR}/pystring
-  PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_pystring.txt ${BUILD_DIR}/pystring/src/external_pystring/CMakeLists.txt
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pystring ${DEFAULT_CMAKE_FLAGS} ${PYSTRING_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/pystring
-)
-
-if(WIN32)
-  ExternalProject_Add_Step(external_pystring after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pystring/lib ${HARVEST_TARGET}/pystring/lib
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pystring/include ${HARVEST_TARGET}/pystring/include
-    DEPENDEES install
-  )
-endif()

build_files/build_environment/cmake/python_site_packages.cmake

@@ -15,7 +15,7 @@ ExternalProject_Add(external_python_site_packages
   CONFIGURE_COMMAND ${PIP_CONFIGURE_COMMAND}
   BUILD_COMMAND ""
   PREFIX ${BUILD_DIR}/site_packages
-  INSTALL_COMMAND ${PYTHON_BINARY} -m pip install --no-cache-dir ${SITE_PACKAGES_EXTRA} cython==${CYTHON_VERSION} idna==${IDNA_VERSION} charset-normalizer==${CHARSET_NORMALIZER_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} zstandard==${ZSTANDARD_VERSION} autopep8==${AUTOPEP8_VERSION} pycodestyle==${PYCODESTYLE_VERSION} toml==${TOML_VERSION} --no-binary :all:
+  INSTALL_COMMAND ${PYTHON_BINARY} -m pip install --no-cache-dir ${SITE_PACKAGES_EXTRA} cython==${CYTHON_VERSION} idna==${IDNA_VERSION} charset-normalizer==${CHARSET_NORMALIZER_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} zstandard==${ZSTANDARD_VERSION} --no-binary :all:
 )
 
 if(USE_PIP_NUMPY)

build_files/build_environment/cmake/robinmap.cmake

@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(ROBINMAP_EXTRA_ARGS
-)
-
-ExternalProject_Add(external_robinmap
-  URL file://${PACKAGE_DIR}/${ROBINMAP_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${ROBINMAP_HASH_TYPE}=${ROBINMAP_HASH}
-  PREFIX ${BUILD_DIR}/robinmap
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/robinmap ${DEFAULT_CMAKE_FLAGS} ${ROBINMAP_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/robinmap
-)

build_files/build_environment/cmake/tiff.cmake

@@ -1,5 +1,11 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+if(WITH_WEBP)
+  set(WITH_TIFF_WEBP ON)
+else()
+  set(WITH_TIFF_WEBP OFF)
+endif()
+
 set(TIFF_EXTRA_ARGS
   -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include
@@ -8,7 +14,7 @@ set(TIFF_EXTRA_ARGS
   -Dlzma=OFF
   -Djbig=OFF
   -Dzstd=OFF
-  -Dwebp=OFF
+  -Dwebp=${WITH_TIFF_WEBP}
 )
 
 ExternalProject_Add(external_tiff

build_files/build_environment/cmake/usd.cmake

@@ -1,72 +1,39 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-if(WIN32)
-  # OIIO and OSL are statically linked for us, but USD doesn't know
-  set(USD_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DOIIO_STATIC_DEFINE /DOSL_STATIC_DEFINE")
-  if(BUILD_MODE STREQUAL Debug)
-    # USD does not look for debug libs, nor does it link them
-    # when building static, so this is just to keep find_package happy
-    # if we ever link dynamically on windows util will need to be linked as well.
-    set(USD_OIIO_CMAKE_DEFINES "-DOIIO_LIBRARIES=${LIBDIR}/openimageio/lib/OpenImageIO_d${LIBEXT}")
-  endif()
-  set(USD_PLATFORM_FLAGS
-    ${USD_OIIO_CMAKE_DEFINES}
-    -DCMAKE_CXX_FLAGS=${USD_CXX_FLAGS}
-  )
-endif()
-
 set(USD_EXTRA_ARGS
-  ${DEFAULT_BOOST_FLAGS}
-  ${USD_PLATFORM_FLAGS}
-  # This is a preventative measure that avoids possible conflicts when add-ons
-  # try to load another USD library into the same process space.
-  -DPXR_SET_INTERNAL_NAMESPACE=usdBlender
-  -DOPENSUBDIV_ROOT_DIR=${LIBDIR}/opensubdiv
-  -DOpenImageIO_ROOT=${LIBDIR}/openimageio
-  -DOPENEXR_LIBRARIES=${LIBDIR}/imath/lib/imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-  -DOPENEXR_INCLUDE_DIR=${LIBDIR}/imath/include
-  -DPXR_ENABLE_PYTHON_SUPPORT=OFF
-  -DPXR_BUILD_IMAGING=ON
-  -DPXR_BUILD_TESTS=OFF
-  -DPXR_BUILD_EXAMPLES=OFF
-  -DPXR_BUILD_TUTORIALS=OFF
-  -DPXR_ENABLE_HDF5_SUPPORT=OFF
-  -DPXR_ENABLE_MATERIALX_SUPPORT=OFF
-  -DPXR_ENABLE_OPENVDB_SUPPORT=OFF
-  -DPYTHON_EXECUTABLE=${PYTHON_BINARY}
-  -DPXR_BUILD_MONOLITHIC=ON
-  # OSL is an optional dependency of the Imaging module. However, since that
-  # module was included for its support for converting primitive shapes (sphere,
-  # cube, etc.) to geometry, it's not necessary. Disabling it will make it
-  # simpler to build Blender; currently only Cycles uses OSL.
-  -DPXR_ENABLE_OSL_SUPPORT=OFF
-  # GL support on Linux also links to X11 libraries. Enabling it would break
-  # headless or Wayland-only builds. OpenGL support would be useful if someone
-  # wants to work on a Hydra viewport in Blender; when that's actually being
-  # worked on, we could patch in a new PXR_ENABLE_X11_SUPPORT option (to
-  # separate OpenGL from X11) and contribute it upstream.
-  -DPXR_ENABLE_GL_SUPPORT=OFF
-  # Disable Metal since USD fails to build this when OpenGL is disabled.
-  -DPXR_ENABLE_METAL_SUPPORT=OFF
-  # OIIO is used for loading image textures in Hydra Storm / Embree renderers,
-  # which we don't use.
-  -DPXR_BUILD_OPENIMAGEIO_PLUGIN=OFF
-  # USD 22.03 does not support OCIO 2.x
-  # Tracking ticket https://github.com/PixarAnimationStudios/USD/issues/1386
-  -DPXR_BUILD_OPENCOLORIO_PLUGIN=OFF
-  -DPXR_ENABLE_PTEX_SUPPORT=OFF
-  -DPXR_BUILD_USD_TOOLS=OFF
-  -DCMAKE_DEBUG_POSTFIX=_d
-  -DBUILD_SHARED_LIBS=Off
-  # USD is hellbound on making a shared lib, unless you point this variable to a valid cmake file
-  # doesn't have to make sense, but as long as it points somewhere valid it will skip the shared lib.
-  -DPXR_MONOLITHIC_IMPORT=${BUILD_DIR}/usd/src/external_usd/cmake/defaults/Version.cmake
+  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+  -DBoost_USE_MULTITHREADED=ON
+  -DBoost_USE_STATIC_LIBS=ON
+  -DBoost_USE_STATIC_RUNTIME=OFF
+  -DBOOST_ROOT=${LIBDIR}/boost
+  -DBoost_NO_SYSTEM_PATHS=ON
+  -DBoost_NO_BOOST_CMAKE=ON
   -DTBB_INCLUDE_DIRS=${LIBDIR}/tbb/include
   -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT}
   -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT}
   # USD wants the tbb debug lib set even when you are doing a release build
   # Otherwise it will error out during the cmake configure phase.
   -DTBB_LIBRARIES_DEBUG=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT}
+
+  # This is a preventative measure that avoids possible conflicts when add-ons
+  # try to load another USD library into the same process space.
+  -DPXR_SET_INTERNAL_NAMESPACE=usdBlender
+
+  -DPXR_ENABLE_PYTHON_SUPPORT=OFF
+  -DPXR_BUILD_IMAGING=OFF
+  -DPXR_BUILD_TESTS=OFF
+  -DBUILD_SHARED_LIBS=OFF
+  -DPYTHON_EXECUTABLE=${PYTHON_BINARY}
+  -DPXR_BUILD_MONOLITHIC=ON
+
+  # The PXR_BUILD_USD_TOOLS argument is patched-in by usd.diff. An upstream pull request
+  # can be found at https://github.com/PixarAnimationStudios/USD/pull/1048.
+  -DPXR_BUILD_USD_TOOLS=OFF
+
+  -DCMAKE_DEBUG_POSTFIX=_d
+  # USD is hellbound on making a shared lib, unless you point this variable to a valid cmake file
+  # doesn't have to make sense, but as long as it points somewhere valid it will skip the shared lib.
+  -DPXR_MONOLITHIC_IMPORT=${BUILD_DIR}/usd/src/external_usd/cmake/defaults/Version.cmake
 )
 
 ExternalProject_Add(external_usd
@@ -83,31 +50,37 @@ add_dependencies(
   external_usd
   external_tbb
   external_boost
-  external_opensubdiv
 )
 
 # Since USD 21.11 the libraries are prefixed with "usd_", i.e. "libusd_m.a" became "libusd_usd_m.a".
 # See https://github.com/PixarAnimationStudios/USD/blob/release/CHANGELOG.md#2111---2021-11-01
-if(NOT WIN32)
-  if (USD_VERSION VERSION_LESS 21.11)
-    set(PXR_LIB_PREFIX "")
-  else()
-    set(PXR_LIB_PREFIX "usd_")
-  endif()
+if (USD_VERSION VERSION_LESS 21.11)
+  set(PXR_LIB_PREFIX "")
+else()
+  set(PXR_LIB_PREFIX "usd_")
 endif()
 
 if(WIN32)
+  # USD currently demands python be available at build time
+  # and then proceeds not to use it, but still checks that the
+  # version of the interpreter it is not going to use is atleast 2.7
+  # so we need this dep currently since there is no system python
+  # on windows.
+  add_dependencies(
+    external_usd
+    external_python
+  )
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_usd after_install
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/ ${HARVEST_TARGET}/usd
-      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Release/usd_usd_m.lib ${HARVEST_TARGET}/usd/lib/usd_usd_m.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Release/${PXR_LIB_PREFIX}usd_m.lib ${HARVEST_TARGET}/usd/lib/lib${PXR_LIB_PREFIX}usd_m.lib
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_usd after_install
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/lib ${HARVEST_TARGET}/usd/lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Debug/usd_usd_m_d.lib ${HARVEST_TARGET}/usd/lib/usd_usd_m_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Debug/${PXR_LIB_PREFIX}usd_m_d.lib ${HARVEST_TARGET}/usd/lib/lib${PXR_LIB_PREFIX}usd_m_d.lib
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/versions.cmake

@@ -1,14 +1,14 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-set(ZLIB_VERSION 1.2.12)
+set(ZLIB_VERSION 1.2.11)
 set(ZLIB_URI https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz)
-set(ZLIB_HASH 5fc414a9726be31427b440b434d05f78)
+set(ZLIB_HASH 1c9f62f0778697a09d36121ead88e08e)
 set(ZLIB_HASH_TYPE MD5)
 set(ZLIB_FILE zlib-${ZLIB_VERSION}.tar.gz)
 
-set(OPENAL_VERSION 1.21.1)
+set(OPENAL_VERSION 1.20.1)
 set(OPENAL_URI http://openal-soft.org/openal-releases/openal-soft-${OPENAL_VERSION}.tar.bz2)
-set(OPENAL_HASH a936806ebd8de417b0ffd8cf3f48f456)
+set(OPENAL_HASH 556695068ce8375b89986083d810fd35)
 set(OPENAL_HASH_TYPE MD5)
 set(OPENAL_FILE openal-soft-${OPENAL_VERSION}.tar.bz2)
 
@@ -18,24 +18,24 @@ set(PNG_HASH 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca)
 set(PNG_HASH_TYPE SHA256)
 set(PNG_FILE libpng-${PNG_VERSION}.tar.xz)
 
-set(JPEG_VERSION 2.1.3)
+set(JPEG_VERSION 2.0.4)
 set(JPEG_URI https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${JPEG_VERSION}.tar.gz)
-set(JPEG_HASH 627b980fad0573e08e4c3b80b290fc91)
+set(JPEG_HASH 44c43e4a9fb352f47090804529317c88)
 set(JPEG_HASH_TYPE MD5)
 set(JPEG_FILE libjpeg-turbo-${JPEG_VERSION}.tar.gz)
 
-set(BOOST_VERSION 1.78.0)
-set(BOOST_VERSION_SHORT 1.78)
-set(BOOST_VERSION_NODOTS 1_78_0)
-set(BOOST_VERSION_NODOTS_SHORT 1_78)
+set(BOOST_VERSION 1.73.0)
+set(BOOST_VERSION_NODOTS 1_73_0)
+set(BOOST_VERSION_NODOTS_SHORT 1_73)
 set(BOOST_URI https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_NODOTS}.tar.gz)
-set(BOOST_HASH c2f6428ac52b0e5a3c9b2e1d8cc832b5)
+set(BOOST_HASH 4036cd27ef7548b8d29c30ea10956196)
 set(BOOST_HASH_TYPE MD5)
 set(BOOST_FILE boost_${BOOST_VERSION_NODOTS}.tar.gz)
 
-set(BLOSC_VERSION 1.21.1)
+# Using old version as recommended by OpenVDB build documentation.
+set(BLOSC_VERSION 1.5.0)
 set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz)
-set(BLOSC_HASH 134b55813b1dca57019d2a2dc1f7a923)
+set(BLOSC_HASH 6e4a49c8c06f05aa543f3312cfce3d55)
 set(BLOSC_HASH_TYPE MD5)
 set(BLOSC_FILE blosc-${BLOSC_VERSION}.tar.gz)
 
@@ -45,19 +45,12 @@ set(PTHREADS_HASH f3bf81bb395840b3446197bcf4ecd653)
 set(PTHREADS_HASH_TYPE MD5)
 set(PTHREADS_FILE pthreads4w-code-${PTHREADS_VERSION}.zip)
 
-set(OPENEXR_VERSION 3.1.4)
+set(OPENEXR_VERSION 2.5.5)
 set(OPENEXR_URI https://github.com/AcademySoftwareFoundation/openexr/archive/v${OPENEXR_VERSION}.tar.gz)
-set(OPENEXR_HASH e990be1ff765797bc2d93a8060e1c1f2)
+set(OPENEXR_HASH 85e8a979092c9055d10ed103062d31a0)
 set(OPENEXR_HASH_TYPE MD5)
 set(OPENEXR_FILE openexr-${OPENEXR_VERSION}.tar.gz)
 
-set(IMATH_VERSION 3.1.4)
-set(IMATH_URI https://github.com/AcademySoftwareFoundation/Imath/archive/v${OPENEXR_VERSION}.tar.gz)
-set(IMATH_HASH fddf14ec73e12c34e74c3c175e311a3f)
-set(IMATH_HASH_TYPE MD5)
-set(IMATH_FILE imath-${IMATH_VERSION}.tar.gz)
-
-
 if(WIN32)
   # Openexr started appending _d on its own so now
   # we need to tell the build the postfix is _s while
@@ -92,21 +85,42 @@ set(FREEGLUT_HASH 90c3ca4dd9d51cf32276bc5344ec9754)
 set(FREEGLUT_HASH_TYPE MD5)
 set(FREEGLUT_FILE freeglut-${FREEGLUT_VERSION}.tar.gz)
 
-set(ALEMBIC_VERSION 1.8.3)
+set(ALEMBIC_VERSION 1.7.16)
 set(ALEMBIC_URI https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.tar.gz)
-set(ALEMBIC_HASH 2cd8d6e5a3ac4a014e24a4b04f4fadf9)
+set(ALEMBIC_HASH effcc86e42fe6605588e3de57bde6677)
 set(ALEMBIC_HASH_TYPE MD5)
 set(ALEMBIC_FILE alembic-${ALEMBIC_VERSION}.tar.gz)
 
-set(OPENSUBDIV_VERSION v3_4_4)
+# hash is for 3.1.2
+set(GLFW_GIT_UID 30306e54705c3adae9fe082c816a3be71963485c)
+set(GLFW_URI https://github.com/glfw/glfw/archive/${GLFW_GIT_UID}.zip)
+set(GLFW_HASH 20cacb1613da7eeb092f3ac4f6b2b3d0)
+set(GLFW_HASH_TYPE MD5)
+set(GLFW_FILE glfw-${GLFW_GIT_UID}.zip)
+
+# latest uid in git as of 2016-04-01
+set(CLEW_GIT_UID 277db43f6cafe8b27c6f1055f69dc67da4aeb299)
+set(CLEW_URI https://github.com/OpenCLWrangler/clew/archive/${CLEW_GIT_UID}.zip)
+set(CLEW_HASH 2c699d10ed78362e71f56fae2a4c5f98)
+set(CLEW_HASH_TYPE MD5)
+set(CLEW_FILE clew-${CLEW_GIT_UID}.zip)
+
+# latest uid in git as of 2016-04-01
+set(CUEW_GIT_UID 1744972026de9cf27c8a7dc39cf39cd83d5f922f)
+set(CUEW_URI https://github.com/CudaWrangler/cuew/archive/${CUEW_GIT_UID}.zip)
+set(CUEW_HASH 86760d62978ebfd96cd93f5aa1abaf4a)
+set(CUEW_HASH_TYPE MD5)
+set(CUEW_FILE cuew-${CUEW_GIT_UID}.zip)
+
+set(OPENSUBDIV_VERSION v3_4_3)
 set(OPENSUBDIV_URI https://github.com/PixarAnimationStudios/OpenSubdiv/archive/${OPENSUBDIV_VERSION}.tar.gz)
-set(OPENSUBDIV_HASH 39ecc5caf0abebc943d1ce131855e76e)
+set(OPENSUBDIV_HASH 7bbfa275d021fb829e521df749160edb)
 set(OPENSUBDIV_HASH_TYPE MD5)
 set(OPENSUBDIV_FILE opensubdiv-${OPENSUBDIV_VERSION}.tar.gz)
 
-set(SDL_VERSION 2.0.20)
+set(SDL_VERSION 2.0.12)
 set(SDL_URI https://www.libsdl.org/release/SDL2-${SDL_VERSION}.tar.gz)
-set(SDL_HASH a53acc02e1cca98c4123229069b67c9e)
+set(SDL_HASH 783b6f2df8ff02b19bb5ce492b99c8ff)
 set(SDL_HASH_TYPE MD5)
 set(SDL_FILE SDL2-${SDL_VERSION}.tar.gz)
 
@@ -116,9 +130,9 @@ set(OPENCOLLADA_HASH ee7dae874019fea7be11613d07567493)
 set(OPENCOLLADA_HASH_TYPE MD5)
 set(OPENCOLLADA_FILE opencollada-${OPENCOLLADA_VERSION}.tar.gz)
 
-set(OPENCOLORIO_VERSION 2.1.1)
+set(OPENCOLORIO_VERSION 2.0.0)
 set(OPENCOLORIO_URI https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz)
-set(OPENCOLORIO_HASH 604f562e073f23d88ce89ed4f7f709ba)
+set(OPENCOLORIO_HASH 1a2e3478b6cd9a1549f24e1b2205e3f0)
 set(OPENCOLORIO_HASH_TYPE MD5)
 set(OPENCOLORIO_FILE OpenColorIO-${OPENCOLORIO_VERSION}.tar.gz)
 
@@ -141,37 +155,21 @@ set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${
 set(OPENMP_HASH_TYPE MD5)
 set(OPENMP_FILE openmp-${OPENMP_VERSION}.src.tar.xz)
 
-set(OPENIMAGEIO_VERSION v2.3.13.0)
-set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/refs/tags/${OPENIMAGEIO_VERSION}.tar.gz)
-set(OPENIMAGEIO_HASH de45fb38501c4581062b522b53b6141c)
+set(OPENIMAGEIO_VERSION 2.2.15.1)
+set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.tar.gz)
+set(OPENIMAGEIO_HASH 3db5c5f0b3dc91597c75e5df09eb9072)
 set(OPENIMAGEIO_HASH_TYPE MD5)
 set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_VERSION}.tar.gz)
 
-# 8.0.0 is currently oiio's preferred vesion although never versions may be available.
-# the preferred version can be found in oiio's externalpackages.cmake
-set(FMT_VERSION 8.0.0)
-set(FMT_URI https://github.com/fmtlib/fmt/archive/refs/tags/${FMT_VERSION}.tar.gz)
-set(FMT_HASH 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83)
-set(FMT_HASH_TYPE SHA256)
-set(FMT_FILE fmt-${FMT_VERSION}.tar.gz)
-
-# 0.6.2 is currently oiio's preferred vesion although never versions may be available.
-# the preferred version can be found in oiio's externalpackages.cmake
-set(ROBINMAP_VERSION v0.6.2)
-set(ROBINMAP_URI https://github.com/Tessil/robin-map/archive/refs/tags/${ROBINMAP_VERSION}.tar.gz)
-set(ROBINMAP_HASH c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1)
-set(ROBINMAP_HASH_TYPE SHA256)
-set(ROBINMAP_FILE robinmap-${ROBINMAP_VERSION}.tar.gz)
-
-set(TIFF_VERSION 4.3.0)
+set(TIFF_VERSION 4.1.0)
 set(TIFF_URI http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz)
-set(TIFF_HASH 0a2e4744d1426a8fc8211c0cdbc3a1b3)
+set(TIFF_HASH 2165e7aba557463acc0664e71a3ed424)
 set(TIFF_HASH_TYPE MD5)
 set(TIFF_FILE tiff-${TIFF_VERSION}.tar.gz)
 
-set(OSL_VERSION 1.11.17.0)
+set(OSL_VERSION 1.11.14.1)
 set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz)
-set(OSL_HASH 63265472ce14548839ace2e21e401544)
+set(OSL_HASH 1abd7ce40481771a9fa937f19595d2f2)
 set(OSL_HASH_TYPE MD5)
 set(OSL_FILE OpenShadingLanguage-${OSL_VERSION}.tar.gz)
 
@@ -183,18 +181,24 @@ set(PYTHON_HASH 14e8c22458ed7779a1957b26cde01db9)
 set(PYTHON_HASH_TYPE MD5)
 set(PYTHON_FILE Python-${PYTHON_VERSION}.tar.xz)
 
-set(TBB_VERSION 2020_U3)
+set(TBB_VERSION 2020_U2)
 set(TBB_URI https://github.com/oneapi-src/oneTBB/archive/${TBB_VERSION}.tar.gz)
-set(TBB_HASH 55ec8df6eae5ed6364a47f0e671e460c)
+set(TBB_HASH 1b711ae956524855088df3bbf5ec65dc)
 set(TBB_HASH_TYPE MD5)
 set(TBB_FILE oneTBB-${TBB_VERSION}.tar.gz)
 
-set(OPENVDB_VERSION 9.0.0)
+set(OPENVDB_VERSION 8.0.1)
 set(OPENVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)
-set(OPENVDB_HASH 684ce40c2f74f3a0c9cac530e1c7b07e)
+set(OPENVDB_HASH 01b490be16cc0e15c690f9a153c21461)
 set(OPENVDB_HASH_TYPE MD5)
 set(OPENVDB_FILE openvdb-${OPENVDB_VERSION}.tar.gz)
 
+set(NANOVDB_GIT_UID dc37d8a631922e7bef46712947dc19b755f3e841)
+set(NANOVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/${NANOVDB_GIT_UID}.tar.gz)
+set(NANOVDB_HASH e7b9e863ec2f3b04ead171dec2322807)
+set(NANOVDB_HASH_TYPE MD5)
+set(NANOVDB_FILE nano-vdb-${NANOVDB_GIT_UID}.tar.gz)
+
 set(IDNA_VERSION 3.3)
 set(CHARSET_NORMALIZER_VERSION 2.0.10)
 set(URLLIB3_VERSION 1.26.8)
@@ -204,9 +208,6 @@ set(CYTHON_VERSION 0.29.26)
 # The version of the zstd library used to build the Python package should match ZSTD_VERSION defined below.
 # At this time of writing, 0.17.0 was already released, but built against zstd 1.5.1, while we use 1.5.0.
 set(ZSTANDARD_VERSION 0.16.0)
-set(AUTOPEP8_VERSION 1.6.0)
-set(PYCODESTYLE_VERSION 2.8.0)
-set(TOML_VERSION 0.10.2)
 
 set(NUMPY_VERSION 1.22.0)
 set(NUMPY_SHORT_VERSION 1.22)
@@ -221,15 +222,15 @@ set(LAME_HASH 83e260acbe4389b54fe08e0bdbf7cddb)
 set(LAME_HASH_TYPE MD5)
 set(LAME_FILE lame-${LAME_VERSION}.tar.gz)
 
-set(OGG_VERSION 1.3.5)
+set(OGG_VERSION 1.3.4)
 set(OGG_URI http://downloads.xiph.org/releases/ogg/libogg-${OGG_VERSION}.tar.gz)
-set(OGG_HASH 0eb4b4b9420a0f51db142ba3f9c64b333f826532dc0f48c6410ae51f4799b664)
+set(OGG_HASH fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e)
 set(OGG_HASH_TYPE SHA256)
 set(OGG_FILE libogg-${OGG_VERSION}.tar.gz)
 
-set(VORBIS_VERSION 1.3.7)
+set(VORBIS_VERSION 1.3.6)
 set(VORBIS_URI http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS_VERSION}.tar.gz)
-set(VORBIS_HASH 0e982409a9c3fc82ee06e08205b1355e5c6aa4c36bca58146ef399621b0ce5ab)
+set(VORBIS_HASH 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb)
 set(VORBIS_HASH_TYPE SHA256)
 set(VORBIS_FILE libvorbis-${VORBIS_VERSION}.tar.gz)
 
@@ -239,15 +240,15 @@ set(THEORA_HASH b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc
 set(THEORA_HASH_TYPE SHA256)
 set(THEORA_FILE libtheora-${THEORA_VERSION}.tar.bz2)
 
-set(FLAC_VERSION 1.3.4)
+set(FLAC_VERSION 1.3.3)
 set(FLAC_URI http://downloads.xiph.org/releases/flac/flac-${FLAC_VERSION}.tar.xz)
-set(FLAC_HASH 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 )
+set(FLAC_HASH 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748)
 set(FLAC_HASH_TYPE SHA256)
 set(FLAC_FILE flac-${FLAC_VERSION}.tar.xz)
 
-set(VPX_VERSION 1.11.0)
+set(VPX_VERSION 1.8.2)
 set(VPX_URI https://github.com/webmproject/libvpx/archive/v${VPX_VERSION}/libvpx-v${VPX_VERSION}.tar.gz)
-set(VPX_HASH 965e51c91ad9851e2337aebcc0f517440c637c506f3a03948062e3d5ea129a83)
+set(VPX_HASH 8735d9fcd1a781ae6917f28f239a8aa358ce4864ba113ea18af4bb2dc8b474ac)
 set(VPX_HASH_TYPE SHA256)
 set(VPX_FILE libvpx-v${VPX_VERSION}.tar.gz)
 
@@ -257,9 +258,9 @@ set(OPUS_HASH 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d)
 set(OPUS_HASH_TYPE SHA256)
 set(OPUS_FILE opus-${OPUS_VERSION}.tar.gz)
 
-set(X264_VERSION 35fe20d1ba49918ec739a5b068c208ca82f977f7)
+set(X264_VERSION 33f9e1474613f59392be5ab6a7e7abf60fa63622)
 set(X264_URI https://code.videolan.org/videolan/x264/-/archive/${X264_VERSION}/x264-${X264_VERSION}.tar.gz)
-set(X264_HASH bb4f7da03936b5a030ed5827133b58eb3f701d7e5dce32cca4ba6df93797d42e)
+set(X264_HASH 5456450ee1ae02cd2328be3157367a232a0ab73315e8c8f80dab80469524f525)
 set(X264_HASH_TYPE SHA256)
 set(X264_FILE x264-${X264_VERSION}.tar.gz)
 
@@ -269,22 +270,22 @@ set(XVIDCORE_HASH abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce
 set(XVIDCORE_HASH_TYPE SHA256)
 set(XVIDCORE_FILE xvidcore-${XVIDCORE_VERSION}.tar.gz)
 
-set(OPENJPEG_VERSION 2.4.0)
-set(OPENJPEG_SHORT_VERSION 2.4)
+set(OPENJPEG_VERSION 2.3.1)
+set(OPENJPEG_SHORT_VERSION 2.3)
 set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz)
-set(OPENJPEG_HASH 8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d)
+set(OPENJPEG_HASH 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9)
 set(OPENJPEG_HASH_TYPE SHA256)
 set(OPENJPEG_FILE openjpeg-v${OPENJPEG_VERSION}.tar.gz)
 
-set(FFMPEG_VERSION 5.0)
+set(FFMPEG_VERSION 4.4)
 set(FFMPEG_URI http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2)
-set(FFMPEG_HASH c0130b8db2c763430fd1c6905288d61bc44ee0548ad5fcd2dfd650b88432bed9)
+set(FFMPEG_HASH 42093549751b582cf0f338a21a3664f52e0a9fbe0d238d3c992005e493607d0e)
 set(FFMPEG_HASH_TYPE SHA256)
 set(FFMPEG_FILE ffmpeg-${FFMPEG_VERSION}.tar.bz2)
 
-set(FFTW_VERSION 3.3.10)
+set(FFTW_VERSION 3.3.8)
 set(FFTW_URI http://www.fftw.org/fftw-${FFTW_VERSION}.tar.gz)
-set(FFTW_HASH 8ccbf6a5ea78a16dbc3e1306e234cc5c)
+set(FFTW_HASH 8aac833c943d8e90d51b697b27d4384d)
 set(FFTW_HASH_TYPE MD5)
 set(FFTW_FILE fftw-${FFTW_VERSION}.tar.gz)
 
@@ -300,9 +301,9 @@ set(SNDFILE_HASH 646b5f98ce89ac60cdb060fcd398247c)
 set(SNDFILE_HASH_TYPE MD5)
 set(SNDFILE_FILE libsndfile-${SNDFILE_VERSION}.tar.gz)
 
-set(WEBP_VERSION 1.2.2)
+set(WEBP_VERSION 0.6.1)
 set(WEBP_URI https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz)
-set(WEBP_HASH b5e2e414a8adee4c25fe56b18dd9c549)
+set(WEBP_HASH b49ce9c3e3e9acae4d91bca44bb85a72)
 set(WEBP_HASH_TYPE MD5)
 set(WEBP_FILE libwebp-${WEBP_VERSION}.tar.gz)
 
@@ -337,15 +338,9 @@ set(YAMLCPP_HASH b45bf1089a382e81f6b661062c10d0c2)
 set(YAMLCPP_HASH_TYPE MD5)
 set(YAMLCPP_FILE yaml-cpp-${YAMLCPP_VERSION}.tar.gz)
 
-set(PYSTRING_VERSION v1.1.3)
-set(PYSTRING_URI https://codeload.github.com/imageworks/pystring/tar.gz/refs/tags/${PYSTRING_VERSION})
-set(PYSTRING_HASH f2c68786b359f5e4e62bed53bc4fb86d)
-set(PYSTRING_HASH_TYPE MD5)
-set(PYSTRING_FILE pystring-${PYSTRING_VERSION}.tar.gz)
-
-set(EXPAT_VERSION 2_4_4)
+set(EXPAT_VERSION 2_2_10)
 set(EXPAT_URI https://github.com/libexpat/libexpat/archive/R_${EXPAT_VERSION}.tar.gz)
-set(EXPAT_HASH 2d3e81dee94b452369dc6394ff0f8f98)
+set(EXPAT_HASH 7ca5f09959fcb9a57618368deb627b9f)
 set(EXPAT_HASH_TYPE MD5)
 set(EXPAT_FILE libexpat-${EXPAT_VERSION}.tar.gz)
 
@@ -410,21 +405,22 @@ set(SQLITE_HASH fb558c49ee21a837713c4f1e7e413309aabdd9c7)
 set(SQLITE_HASH_TYPE SHA1)
 set(SQLITE_FILE sqlite-src-3240000.zip)
 
-set(EMBREE_VERSION 3.13.3)
+set(EMBREE_VERSION 3.10.0)
 set(EMBREE_URI https://github.com/embree/embree/archive/v${EMBREE_VERSION}.zip)
-set(EMBREE_HASH f62766ba54e48a2f327c3a22596e7133)
+set(EMBREE_HASH 4bbe29e7eaa46417efc75fc5f1e8eb87)
 set(EMBREE_HASH_TYPE MD5)
 set(EMBREE_FILE embree-v${EMBREE_VERSION}.zip)
+set(EMBREE_ARM_GIT https://github.com/brechtvl/embree.git)
 
-set(USD_VERSION 22.03)
+set(USD_VERSION 21.02)
 set(USD_URI https://github.com/PixarAnimationStudios/USD/archive/v${USD_VERSION}.tar.gz)
-set(USD_HASH e0e441a05057692a83124a1195b09eed)
+set(USD_HASH 1dd1e2092d085ed393c1f7c450a4155a)
 set(USD_HASH_TYPE MD5)
 set(USD_FILE usd-v${USD_VERSION}.tar.gz)
 
-set(OIDN_VERSION 1.4.3)
+set(OIDN_VERSION 1.4.1)
 set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz)
-set(OIDN_HASH 027093eaf5e8b4e45835b991137b38e6)
+set(OIDN_HASH df4007b0ab93b1c41cdf223b075d01c0)
 set(OIDN_HASH_TYPE MD5)
 set(OIDN_FILE oidn-${OIDN_VERSION}.src.tar.gz)
 
@@ -458,9 +454,9 @@ set(WL_PROTOCOLS_URI https://gitlab.freedesktop.org/wayland/wayland-protocols/-/
 set(WL_PROTOCOLS_HASH af5ca07e13517cdbab33504492cef54a)
 set(WL_PROTOCOLS_HASH_TYPE MD5)
 
-set(ISPC_VERSION v1.17.0)
+set(ISPC_VERSION v1.16.0)
 set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz)
-set(ISPC_HASH 4f476a3109332a77fe839a9014c60ca9)
+set(ISPC_HASH 2e3abedbc0ea9aaec17d6562c632454d)
 set(ISPC_HASH_TYPE MD5)
 set(ISPC_FILE ispc-${ISPC_VERSION}.tar.gz)
 
@@ -496,9 +492,3 @@ set(BROTLI_URI https://github.com/google/brotli/archive/refs/tags/${BROTLI_VERSI
 set(BROTLI_HASH f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46)
 set(BROTLI_HASH_TYPE SHA256)
 set(BROTLI_FILE brotli-${BROTLI_VERSION}.tar.gz)
-
-set(LEVEL_ZERO_VERSION v1.7.15)
-set(LEVEL_ZERO_URI https://github.com/oneapi-src/level-zero/archive/refs/tags/${LEVEL_ZERO_VERSION}.tar.gz)
-set(LEVEL_ZERO_HASH c39bb05a8e5898aa6c444e1704105b93d3f1888b9c333f8e7e73825ffbfb2617)
-set(LEVEL_ZERO_HASH_TYPE SHA256)
-set(LEVEL_ZERO_FILE level-zero-${LEVEL_ZERO_VERSION}.tar.gz)

build_files/build_environment/cmake/webp.cmake

@@ -4,15 +4,9 @@
 # library itself does not depend on them, so should give no problems.
 
 set(WEBP_EXTRA_ARGS
-  -DWEBP_BUILD_ANIM_UTILS=OFF
-  -DWEBP_BUILD_CWEBP=OFF
-  -DWEBP_BUILD_DWEBP=OFF
-  -DWEBP_BUILD_GIF2WEBP=OFF
-  -DWEBP_BUILD_IMG2WEBP=OFF
-  -DWEBP_BUILD_VWEBP=OFF
-  -DWEBP_BUILD_WEBPINFO=OFF
-  -DWEBP_BUILD_WEBPMUX=OFF
-  -DWEBP_BUILD_EXTRAS=OFF
+  -DWEBP_HAVE_SSE2=ON
+  -DWEBP_HAVE_SSE41=OFF
+  -DWEBP_HAVE_AVX2=OFF
 )
 
 if(WIN32)

build_files/build_environment/dependencies.dot

@@ -37,6 +37,10 @@ graph[autosize = false, size = "25.7,8.3!", resolution = 300, overlap = false, s
 	external_openimageio -- external_webp;
 	external_openimageio -- external_opencolorio_extra;
 	external_openmp -- external_clang;
+	external_opensubdiv -- external_glew;
+	external_opensubdiv -- external_glfw;
+	external_opensubdiv -- external_clew;
+	external_opensubdiv -- external_cuew;
 	external_opensubdiv -- external_tbb;
 	openvdb -- external_tbb;
 	openvdb -- external_boost;

build_files/build_environment/install_deps.sh

@@ -453,7 +453,7 @@ TBB_VERSION="2020"
 TBB_VERSION_SHORT="2020"
 TBB_VERSION_UPDATE="_U3"  # Used for source packages...
 TBB_VERSION_MIN="2018"
-TBB_VERSION_MEX="2021"  # 2021 introduces 'oneTBB', which has lots of compatibility breakage with previous versions
+TBB_VERSION_MEX="2022"
 TBB_FORCE_BUILD=false
 TBB_FORCE_REBUILD=false
 TBB_SKIP=false
@@ -539,10 +539,10 @@ ALEMBIC_FORCE_BUILD=false
 ALEMBIC_FORCE_REBUILD=false
 ALEMBIC_SKIP=false
 
-USD_VERSION="22.03"
-USD_VERSION_SHORT="22.03"
+USD_VERSION="21.02"
+USD_VERSION_SHORT="21.02"
 USD_VERSION_MIN="20.05"
-USD_VERSION_MEX="23.00"
+USD_VERSION_MEX="22.00"
 USD_FORCE_BUILD=false
 USD_FORCE_REBUILD=false
 USD_SKIP=false
@@ -1647,7 +1647,7 @@ compile_TBB() {
   fi
 
   # To be changed each time we make edits that would modify the compiled result!
-  tbb_magic=1
+  tbb_magic=0
   _init_tbb
 
   # Force having own builds for the dependencies.
@@ -2656,10 +2656,10 @@ compile_OSD() {
     mkdir build
     cd build
 
-    cmake_d="-D CMAKE_BUILD_TYPE=Release"
     if [ -d $INST/tbb ]; then
-      cmake_d="$cmake_d -D TBB_LOCATION=$INST/tbb"
+      cmake_d="$cmake_d $cmake_d -D TBB_LOCATION=$INST/tbb"
     fi
+    cmake_d="-D CMAKE_BUILD_TYPE=Release"
     cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
     # ptex is only needed when nicholas bishop is ready
     cmake_d="$cmake_d -D NO_PTEX=1"
@@ -3286,7 +3286,7 @@ compile_Embree() {
   fi
 
   # To be changed each time we make edits that would modify the compiled results!
-  embree_magic=11
+  embree_magic=10
   _init_embree
 
   # Force having own builds for the dependencies.
@@ -3346,7 +3346,7 @@ compile_Embree() {
 
     cmake_d="$cmake_d -D EMBREE_TASKING_SYSTEM=TBB"
     if [ -d $INST/tbb ]; then
-      cmake_d="$cmake_d -D EMBREE_TBB_ROOT=$INST/tbb"
+      make_d="$make_d EMBREE_TBB_ROOT=$INST/tbb"
     fi
 
     cmake $cmake_d ../
@@ -3485,7 +3485,7 @@ compile_OIDN() {
   install_ISPC
 
   # To be changed each time we make edits that would modify the compiled results!
-  oidn_magic=10
+  oidn_magic=9
   _init_oidn
 
   # Force having own builds for the dependencies.
@@ -3541,7 +3541,7 @@ compile_OIDN() {
     cmake_d="$cmake_d -D ISPC_DIR_HINT=$_ispc_path_bin"
 
     if [ -d $INST/tbb ]; then
-      cmake_d="$cmake_d -D TBB_ROOT=$INST/tbb"
+      make_d="$make_d TBB_ROOT=$INST/tbb"
     fi
 
     cmake $cmake_d ../

build_files/build_environment/patches/cmakelists_pystring.txt

@@ -1,32 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright Contributors to the OpenColorIO Project.
-
-project(pystring)
-
-cmake_minimum_required(VERSION 3.10)
-
-set(HEADERS
-	pystring.h
-)
-
-set(SOURCES
-	pystring.cpp
-)
-
-add_library(${PROJECT_NAME} STATIC ${HEADERS} ${SOURCES})
-
-if(UNIX)
-	set(pystring_CXX_FLAGS "${pystring_CXX_FLAGS} -fPIC")
-endif()
-
-set_target_properties(${PROJECT_NAME} PROPERTIES 
-	COMPILE_FLAGS "${PLATFORM_COMPILE_FLAGS} ${pystring_CXX_FLAGS}"
-    PUBLIC_HEADER "${HEADERS}"
-)
-
-install(TARGETS ${PROJECT_NAME}
-	RUNTIME DESTINATION bin
-	LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib
-	PUBLIC_HEADER DESTINATION include/pystring
-)

build_files/build_environment/patches/cuew.diff

@@ -0,0 +1,26 @@
+--- CmakeLists.txt.orig	2015-12-31 03:46:41 -0700
++++ CMakeLists.txt	2016-04-01 13:28:33 -0600
+@@ -22,3 +22,10 @@
+ 
+ add_executable(testcuew cuewTest/cuewTest.c include/cuew.h)
+ target_link_libraries(testcuew cuew ${CMAKE_DL_LIBS})
++
++install(TARGETS cuew
++  LIBRARY DESTINATION lib COMPONENT libraries
++  ARCHIVE DESTINATION lib/static COMPONENT libraries)
++
++INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/cuew.h
++  DESTINATION include/) 
+\ No newline at end of file
+--- src/cuew.c	2016-04-01 13:41:43 -0600
++++ src/cuew.c	2016-04-01 13:41:11 -0600
+@@ -15,7 +15,9 @@
+  */
+ 
+ #ifdef _MSC_VER
++#if _MSC_VER < 1900
+ #  define snprintf _snprintf
++#endif 
+ #  define popen _popen
+ #  define pclose _pclose
+ #  define _CRT_SECURE_NO_WARNINGS

build_files/build_environment/patches/embree.diff

@@ -12,19 +12,3 @@ diff -Naur orig/common/sys/platform.h external_embree/common/sys/platform.h
  #else
  #define dll_export __attribute__ ((visibility ("default")))
  #define dll_import 
-diff --git orig/common/tasking/CMakeLists.txt external_embree/common/tasking/CMakeLists.txt
---- orig/common/tasking/CMakeLists.txt
-+++ external_embree/common/tasking/CMakeLists.txt
-@@ -27,7 +27,11 @@
-     else()
-       # If not found try getting older TBB via module (FindTBB.cmake)
-       unset(TBB_DIR CACHE)
--      find_package(TBB 4.1 REQUIRED tbb)
-+      if (TBB_STATIC_LIB)
-+        find_package(TBB 4.1 REQUIRED tbb_static)
-+      else()
-+        find_package(TBB 4.1 REQUIRED tbb)
-+      endif()
-       if (TBB_FOUND)
-         TARGET_LINK_LIBRARIES(tasking PUBLIC TBB)
-         TARGET_INCLUDE_DIRECTORIES(tasking PUBLIC "${TBB_INCLUDE_DIRS}")

build_files/build_environment/patches/ispc.diff

@@ -1,6 +1,43 @@
-diff -Naur ispc-1.17.0.org/CMakeLists.txt ispc-1.17.0/CMakeLists.txt
---- ispc-1.17.0.org/CMakeLists.txt	2022-01-15 01:35:15 -0700
-+++ ispc-1.17.0/CMakeLists.txt	2022-02-12 12:44:24 -0700
+diff -Naur external_ispc/CMakeLists.txt external_ispc_fixed/CMakeLists.txt
+--- external_ispc/CMakeLists.txt	2020-04-23 17:29:06 -0600
++++ external_ispc_fixed/CMakeLists.txt	2020-05-05 09:01:09 -0600
+@@ -389,7 +389,7 @@
+ 
+ # Link against Clang libraries
+ foreach(clangLib ${CLANG_LIBRARY_LIST})
+-    find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS})
++    find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS} ${CLANG_LIBRARY_DIR})
+     list(APPEND CLANG_LIBRARY_FULL_PATH_LIST ${${clangLib}Path})
+ endforeach()
+ target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_FULL_PATH_LIST})
+diff -Naur orig/CMakeLists.txt external_ispc/CMakeLists.txt
+--- orig/CMakeLists.txt 2020-05-05 09:19:11 -0600
++++ external_ispc/CMakeLists.txt        2020-05-05 09:26:44 -0600
+@@ -333,7 +333,7 @@
+
+ # Include directories
+ target_include_directories(${PROJECT_NAME} PRIVATE
+-                           ${LLVM_INCLUDE_DIRS}
++                           ${LLVM_INCLUDE_DIRS} ${CLANG_INCLUDE_DIRS}
+                            ${GENX_DEPS_DIR}/include
+                            ${CMAKE_CURRENT_SOURCE_DIR}/src
+                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR})
+diff -Naur orig/cmake/GenerateBuiltins.cmake.txt external_ispc/cmake/GenerateBuiltins.cmake.txt
++++ orig/cmake/GenerateBuiltins.cmake	2020-05-25 13:32:40.830803821 +0200
++++ external_ispc/cmake/GenerateBuiltins.cmake	2020-05-25 13:32:40.830803821 +0200
+@@ -97,6 +97,8 @@
+ 
+     if ("${bit}" STREQUAL "32" AND ${arch} STREQUAL "x86")
+         set(target_arch "i686")
++        # Blender: disable 32bit due to build issues on Linux and being unnecessary.
++        set(SKIP ON)
+     elseif ("${bit}" STREQUAL "64" AND ${arch} STREQUAL "x86")
+         set(target_arch "x86_64")
+     elseif ("${bit}" STREQUAL "32" AND ${arch} STREQUAL "arm")
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46a8db8..f53beef 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -36,8 +36,12 @@
  cmake_minimum_required(VERSION 3.13)
  
@@ -16,25 +53,7 @@ diff -Naur ispc-1.17.0.org/CMakeLists.txt ispc-1.17.0/CMakeLists.txt
  endif()
  
  set(PROJECT_NAME ispc)
-@@ -443,7 +447,7 @@
- 
- # Include directories
- target_include_directories(${PROJECT_NAME} PRIVATE
--                           ${LLVM_INCLUDE_DIRS}
-+                           ${LLVM_INCLUDE_DIRS} ${CLANG_INCLUDE_DIRS}
-                            ${XE_DEPS_DIR}/include
-                            ${CMAKE_CURRENT_SOURCE_DIR}/src
-                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR})
-@@ -507,7 +511,7 @@
- 
- # Link against Clang libraries
- foreach(clangLib ${CLANG_LIBRARY_LIST})
--    find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS})
-+    find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS} ${CLANG_LIBRARY_DIR})
-     list(APPEND CLANG_LIBRARY_FULL_PATH_LIST ${${clangLib}Path})
- endforeach()
- target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_FULL_PATH_LIST})
-@@ -546,6 +550,29 @@
+@@ -412,6 +416,29 @@ else()
      endif()
  endif()
  
@@ -64,15 +83,3 @@ diff -Naur ispc-1.17.0.org/CMakeLists.txt ispc-1.17.0/CMakeLists.txt
  # Build target for utility checking host ISA
  if (ISPC_INCLUDE_UTILS)
      add_executable(check_isa "")
-diff -Naur ispc-1.17.0.org/cmake/GenerateBuiltins.cmake ispc-1.17.0/cmake/GenerateBuiltins.cmake
---- ispc-1.17.0.org/cmake/GenerateBuiltins.cmake	2022-01-15 01:35:15 -0700
-+++ ispc-1.17.0/cmake/GenerateBuiltins.cmake	2022-02-12 12:44:24 -0700
-@@ -124,6 +124,8 @@
- 
-     if ("${bit}" STREQUAL "32" AND ${arch} STREQUAL "x86")
-         set(target_arch "i686")
-+        # Blender: disable 32bit due to build issues on Linux and being unnecessary.
-+        set(SKIP ON)
-     elseif ("${bit}" STREQUAL "64" AND ${arch} STREQUAL "x86")
-         set(target_arch "x86_64")
-     elseif ("${bit}" STREQUAL "32" AND ${arch} STREQUAL "arm")

build_files/build_environment/patches/level-zero.diff

@@ -1,13 +0,0 @@
-diff -Naur external_levelzero_org/CMakeLists.txt external_levelzero/CMakeLists.txt
---- external_levelzero_org/CMakeLists.txt       2022-03-07 13:22:11 -0700
-+++ external_levelzero/CMakeLists.txt   2022-03-29 13:22:15 -0600
-@@ -77,9 +77,6 @@
-     #enabling Control Flow Guard
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /guard:cf")
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /guard:cf")
--    # enable Spectre Mitigation
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qspectre")
--    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Qspectre")
- endif()
-
- #CXX compiler support

build_files/build_environment/patches/nanovdb.diff

@@ -0,0 +1,374 @@
+Index: nanovdb/nanovdb/NanoVDB.h
+===================================================================
+--- a/nanovdb/nanovdb/NanoVDB.h	(revision 62751)
++++ b/nanovdb/nanovdb/NanoVDB.h	(working copy)
+@@ -152,8 +152,8 @@
+ 
+ #endif // __CUDACC_RTC__
+ 
+-#ifdef __CUDACC__
+-// Only define __hostdev__ when using NVIDIA CUDA compiler
++#if defined(__CUDACC__) || defined(__HIP__)
++// Only define __hostdev__ when using NVIDIA CUDA or HIP compiler
+ #define __hostdev__ __host__ __device__
+ #else
+ #define __hostdev__
+@@ -461,7 +461,7 @@
+ /// Maximum floating-point values
+ template<typename T>
+ struct Maximum;
+-#ifdef __CUDA_ARCH__
++#if defined(__CUDA_ARCH__) || defined(__HIP__)
+ template<>
+ struct Maximum<int>
+ {
+@@ -1006,10 +1006,10 @@
+ using Vec3i = Vec3<int>;
+ 
+ /// @brief Return a single precision floating-point vector of this coordinate
+-Vec3f Coord::asVec3s() const { return Vec3f(float(mVec[0]), float(mVec[1]), float(mVec[2])); }
++inline __hostdev__ Vec3f Coord::asVec3s() const { return Vec3f(float(mVec[0]), float(mVec[1]), float(mVec[2])); }
+ 
+ /// @brief Return a double precision floating-point vector of this coordinate
+-Vec3d Coord::asVec3d() const { return Vec3d(double(mVec[0]), double(mVec[1]), double(mVec[2])); }
++inline __hostdev__ Vec3d Coord::asVec3d() const { return Vec3d(double(mVec[0]), double(mVec[1]), double(mVec[2])); }
+ 
+ // ----------------------------> Vec4 <--------------------------------------
+ 
+@@ -1820,7 +1820,7 @@
+ }; // Map
+ 
+ template<typename Mat4T>
+-void Map::set(const Mat4T& mat, const Mat4T& invMat, double taper)
++__hostdev__ void Map::set(const Mat4T& mat, const Mat4T& invMat, double taper)
+ {
+     float * mf = mMatF, *vf = mVecF;
+     float*  mif = mInvMatF;
+@@ -2170,7 +2170,7 @@
+ }; // Class Grid
+ 
+ template<typename TreeT>
+-int Grid<TreeT>::findBlindDataForSemantic(GridBlindDataSemantic semantic) const
++__hostdev__ int Grid<TreeT>::findBlindDataForSemantic(GridBlindDataSemantic semantic) const
+ {
+     for (uint32_t i = 0, n = blindDataCount(); i < n; ++i)
+         if (blindMetaData(i).mSemantic == semantic)
+@@ -2328,7 +2328,7 @@
+ }; // Tree class
+ 
+ template<typename RootT>
+-void Tree<RootT>::extrema(ValueType& min, ValueType& max) const
++__hostdev__ void Tree<RootT>::extrema(ValueType& min, ValueType& max) const
+ {
+     min = this->root().valueMin();
+     max = this->root().valueMax();
+@@ -2336,7 +2336,7 @@
+ 
+ template<typename RootT>
+ template<typename NodeT>
+-const NodeT* Tree<RootT>::getNode(uint32_t i) const
++__hostdev__ const NodeT* Tree<RootT>::getNode(uint32_t i) const
+ {
+     static_assert(is_same<TreeNodeT<NodeT::LEVEL>, NodeT>::value, "Tree::getNode: unvalid node type");
+     NANOVDB_ASSERT(i < DataType::mCount[NodeT::LEVEL]);
+@@ -2345,7 +2345,7 @@
+ 
+ template<typename RootT>
+ template<int LEVEL>
+-const typename TreeNode<Tree<RootT>, LEVEL>::type* Tree<RootT>::getNode(uint32_t i) const
++__hostdev__ const typename TreeNode<Tree<RootT>, LEVEL>::type* Tree<RootT>::getNode(uint32_t i) const
+ {
+     NANOVDB_ASSERT(i < DataType::mCount[LEVEL]);
+     return reinterpret_cast<const TreeNodeT<LEVEL>*>(reinterpret_cast<const uint8_t*>(this) + DataType::mBytes[LEVEL]) + i;
+@@ -2353,7 +2353,7 @@
+ 
+ template<typename RootT>
+ template<typename NodeT>
+-NodeT* Tree<RootT>::getNode(uint32_t i)
++__hostdev__ NodeT* Tree<RootT>::getNode(uint32_t i)
+ {
+     static_assert(is_same<TreeNodeT<NodeT::LEVEL>, NodeT>::value, "Tree::getNode: invalid node type");
+     NANOVDB_ASSERT(i < DataType::mCount[NodeT::LEVEL]);
+@@ -2362,7 +2362,7 @@
+ 
+ template<typename RootT>
+ template<int LEVEL>
+-typename TreeNode<Tree<RootT>, LEVEL>::type* Tree<RootT>::getNode(uint32_t i)
++__hostdev__ typename TreeNode<Tree<RootT>, LEVEL>::type* Tree<RootT>::getNode(uint32_t i)
+ {
+     NANOVDB_ASSERT(i < DataType::mCount[LEVEL]);
+     return reinterpret_cast<TreeNodeT<LEVEL>*>(reinterpret_cast<uint8_t*>(this) + DataType::mBytes[LEVEL]) + i;
+@@ -2370,7 +2370,7 @@
+ 
+ template<typename RootT>
+ template<typename NodeT>
+-uint32_t Tree<RootT>::getNodeID(const NodeT& node) const
++__hostdev__ uint32_t Tree<RootT>::getNodeID(const NodeT& node) const
+ {
+     static_assert(is_same<TreeNodeT<NodeT::LEVEL>, NodeT>::value, "Tree::getNodeID: invalid node type");
+     const NodeT* first = reinterpret_cast<const NodeT*>(reinterpret_cast<const uint8_t*>(this) + DataType::mBytes[NodeT::LEVEL]);
+@@ -2380,7 +2380,7 @@
+ 
+ template<typename RootT>
+ template<typename NodeT>
+-uint32_t Tree<RootT>::getLinearOffset(const NodeT& node) const
++__hostdev__ uint32_t Tree<RootT>::getLinearOffset(const NodeT& node) const
+ {
+     return this->getNodeID(node) + DataType::mPFSum[NodeT::LEVEL];
+ }
+@@ -3366,7 +3366,7 @@
+ }; // LeafNode class
+ 
+ template<typename ValueT, typename CoordT, template<uint32_t> class MaskT, uint32_t LOG2DIM>
+-inline void LeafNode<ValueT, CoordT, MaskT, LOG2DIM>::updateBBox()
++inline __hostdev__ void LeafNode<ValueT, CoordT, MaskT, LOG2DIM>::updateBBox()
+ {
+     static_assert(LOG2DIM == 3, "LeafNode::updateBBox: only supports LOGDIM = 3!");
+     if (!this->isActive()) return;
+Index: nanovdb/nanovdb/util/SampleFromVoxels.h
+===================================================================
+--- a/nanovdb/nanovdb/util/SampleFromVoxels.h	(revision 62751)
++++ b/nanovdb/nanovdb/util/SampleFromVoxels.h	(working copy)
+@@ -22,7 +22,7 @@
+ #define NANOVDB_SAMPLE_FROM_VOXELS_H_HAS_BEEN_INCLUDED
+ 
+ // Only define __hostdev__ when compiling as NVIDIA CUDA
+-#ifdef __CUDACC__
++#if defined(__CUDACC__) || defined(__HIP__)
+ #define __hostdev__ __host__ __device__
+ #else
+ #include <cmath> // for floor
+@@ -136,7 +136,7 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()(const Vec3T& xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()(const Vec3T& xyz) const
+ {
+     const CoordT ijk = Round<CoordT>(xyz);
+     if (ijk != mPos) {
+@@ -147,7 +147,7 @@
+ }
+ 
+ template<typename TreeOrAccT>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()(const CoordT& ijk) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()(const CoordT& ijk) const
+ {
+     if (ijk != mPos) {
+         mPos = ijk;
+@@ -158,7 +158,7 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, false>::operator()(const Vec3T& xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, false>::operator()(const Vec3T& xyz) const
+ {
+     return mAcc.getValue(Round<CoordT>(xyz));
+ }
+@@ -195,7 +195,7 @@
+ }; // TrilinearSamplerBase
+ 
+ template<typename TreeOrAccT>
+-void TrilinearSampler<TreeOrAccT>::stencil(CoordT& ijk, ValueT (&v)[2][2][2]) const
++__hostdev__ void TrilinearSampler<TreeOrAccT>::stencil(CoordT& ijk, ValueT (&v)[2][2][2]) const
+ {
+     v[0][0][0] = mAcc.getValue(ijk); // i, j, k
+ 
+@@ -224,7 +224,7 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType TrilinearSampler<TreeOrAccT>::sample(const Vec3T<RealT> &uvw, const ValueT (&v)[2][2][2])
++__hostdev__ typename TreeOrAccT::ValueType TrilinearSampler<TreeOrAccT>::sample(const Vec3T<RealT> &uvw, const ValueT (&v)[2][2][2])
+ {
+ #if 0
+   auto lerp = [](ValueT a, ValueT b, ValueT w){ return fma(w, b-a, a); };// = w*(b-a) + a
+@@ -239,7 +239,7 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-Vec3T<typename TreeOrAccT::ValueType> TrilinearSampler<TreeOrAccT>::gradient(const Vec3T<RealT> &uvw, const ValueT (&v)[2][2][2])
++__hostdev__ Vec3T<typename TreeOrAccT::ValueType> TrilinearSampler<TreeOrAccT>::gradient(const Vec3T<RealT> &uvw, const ValueT (&v)[2][2][2])
+ {
+     static_assert(std::is_floating_point<ValueT>::value, "TrilinearSampler::gradient requires a floating-point type");
+ #if 0
+@@ -270,7 +270,7 @@
+ }
+ 
+ template<typename TreeOrAccT>
+-bool TrilinearSampler<TreeOrAccT>::zeroCrossing(const ValueT (&v)[2][2][2])
++__hostdev__ bool TrilinearSampler<TreeOrAccT>::zeroCrossing(const ValueT (&v)[2][2][2])
+ {
+     static_assert(std::is_floating_point<ValueT>::value, "TrilinearSampler::zeroCrossing requires a floating-point type");
+     const bool less = v[0][0][0] < ValueT(0);
+@@ -363,7 +363,7 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, true>::operator()(Vec3T<RealT> xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, true>::operator()(Vec3T<RealT> xyz) const
+ {
+     this->cache(xyz);
+     return BaseT::sample(xyz, mVal);
+@@ -370,7 +370,7 @@
+ }
+ 
+ template<typename TreeOrAccT>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, true>::operator()(const CoordT &ijk) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, true>::operator()(const CoordT &ijk) const
+ {
+     return  ijk == mPos ? mVal[0][0][0] : BaseT::mAcc.getValue(ijk);
+ }
+@@ -377,7 +377,7 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, true>::gradient(Vec3T<RealT> xyz) const
++__hostdev__ Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, true>::gradient(Vec3T<RealT> xyz) const
+ {
+     this->cache(xyz);
+     return BaseT::gradient(xyz, mVal);
+@@ -393,7 +393,7 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-void SampleFromVoxels<TreeOrAccT, 1, true>::cache(Vec3T<RealT>& xyz) const
++__hostdev__ void SampleFromVoxels<TreeOrAccT, 1, true>::cache(Vec3T<RealT>& xyz) const
+ {
+     CoordT ijk = Floor<CoordT>(xyz);
+     if (ijk != mPos) {
+@@ -406,7 +406,7 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator()(Vec3T<RealT> xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator()(Vec3T<RealT> xyz) const
+ {
+     ValueT val[2][2][2];
+     CoordT ijk = Floor<CoordT>(xyz);
+@@ -418,7 +418,7 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator()(Vec3T<RealT> xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator()(Vec3T<RealT> xyz) const
+ {
+     auto lerp = [](ValueT a, ValueT b, RealT w) { return a + ValueT(w) * (b - a); };
+ 
+@@ -463,7 +463,7 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-inline Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, false>::gradient(Vec3T<RealT> xyz) const
++inline __hostdev__ Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, false>::gradient(Vec3T<RealT> xyz) const
+ {
+     ValueT val[2][2][2];
+     CoordT ijk = Floor<CoordT>(xyz);
+@@ -473,7 +473,7 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-bool SampleFromVoxels<TreeOrAccT, 1, false>::zeroCrossing(Vec3T<RealT> xyz) const
++__hostdev__ bool SampleFromVoxels<TreeOrAccT, 1, false>::zeroCrossing(Vec3T<RealT> xyz) const
+ {
+     ValueT val[2][2][2];
+     CoordT ijk = Floor<CoordT>(xyz);
+@@ -510,7 +510,7 @@
+ }; // TriquadraticSamplerBase
+ 
+ template<typename TreeOrAccT>
+-void TriquadraticSampler<TreeOrAccT>::stencil(const CoordT &ijk, ValueT (&v)[3][3][3]) const
++__hostdev__ void TriquadraticSampler<TreeOrAccT>::stencil(const CoordT &ijk, ValueT (&v)[3][3][3]) const
+ {
+     CoordT p(ijk[0] - 1, 0, 0);
+     for (int dx = 0; dx < 3; ++dx, ++p[0]) {
+@@ -526,7 +526,7 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType TriquadraticSampler<TreeOrAccT>::sample(const Vec3T<RealT> &uvw, const ValueT (&v)[3][3][3])
++__hostdev__ typename TreeOrAccT::ValueType TriquadraticSampler<TreeOrAccT>::sample(const Vec3T<RealT> &uvw, const ValueT (&v)[3][3][3])
+ {
+     auto kernel = [](const ValueT* value, double weight)->ValueT {
+         return weight * (weight * (0.5f * (value[0] + value[2]) - value[1]) + 
+@@ -545,7 +545,7 @@
+ }
+ 
+ template<typename TreeOrAccT>
+-bool TriquadraticSampler<TreeOrAccT>::zeroCrossing(const ValueT (&v)[3][3][3])
++__hostdev__ bool TriquadraticSampler<TreeOrAccT>::zeroCrossing(const ValueT (&v)[3][3][3])
+ {
+     static_assert(std::is_floating_point<ValueT>::value, "TrilinearSampler::zeroCrossing requires a floating-point type");
+     const bool less = v[0][0][0] < ValueT(0);
+@@ -624,7 +624,7 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, true>::operator()(Vec3T<RealT> xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, true>::operator()(Vec3T<RealT> xyz) const
+ {
+     this->cache(xyz);
+     return BaseT::sample(xyz, mVal);
+@@ -631,7 +631,7 @@
+ }
+ 
+ template<typename TreeOrAccT>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, true>::operator()(const CoordT &ijk) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, true>::operator()(const CoordT &ijk) const
+ {
+     return  ijk == mPos ? mVal[1][1][1] : BaseT::mAcc.getValue(ijk);
+ }
+@@ -646,7 +646,7 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-void SampleFromVoxels<TreeOrAccT, 2, true>::cache(Vec3T<RealT>& xyz) const
++__hostdev__ void SampleFromVoxels<TreeOrAccT, 2, true>::cache(Vec3T<RealT>& xyz) const
+ {
+     CoordT ijk = Floor<CoordT>(xyz);
+     if (ijk != mPos) {
+@@ -657,7 +657,7 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, false>::operator()(Vec3T<RealT> xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, false>::operator()(Vec3T<RealT> xyz) const
+ {
+     ValueT val[3][3][3];
+     CoordT ijk = Floor<CoordT>(xyz);
+@@ -667,7 +667,7 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-bool SampleFromVoxels<TreeOrAccT, 2, false>::zeroCrossing(Vec3T<RealT> xyz) const
++__hostdev__ bool SampleFromVoxels<TreeOrAccT, 2, false>::zeroCrossing(Vec3T<RealT> xyz) const
+ {
+     ValueT val[3][3][3];
+     CoordT ijk = Floor<CoordT>(xyz);
+@@ -710,7 +710,7 @@
+ }; // TricubicSampler
+ 
+ template<typename TreeOrAccT>
+-void TricubicSampler<TreeOrAccT>::stencil(const CoordT& ijk, ValueT (&C)[64]) const
++__hostdev__ void TricubicSampler<TreeOrAccT>::stencil(const CoordT& ijk, ValueT (&C)[64]) const
+ {
+     auto fetch = [&](int i, int j, int k) -> ValueT& { return C[((i + 1) << 4) + ((j + 1) << 2) + k + 1]; };
+ 
+@@ -929,7 +929,7 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 3, true>::operator()(Vec3T<RealT> xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 3, true>::operator()(Vec3T<RealT> xyz) const
+ {
+     this->cache(xyz);
+     return BaseT::sample(xyz, mC);
+@@ -937,7 +937,7 @@
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-void SampleFromVoxels<TreeOrAccT, 3, true>::cache(Vec3T<RealT>& xyz) const
++__hostdev__ void SampleFromVoxels<TreeOrAccT, 3, true>::cache(Vec3T<RealT>& xyz) const
+ {
+     CoordT ijk = Floor<CoordT>(xyz);
+     if (ijk != mPos) {

build_files/build_environment/patches/openvdb.diff

@@ -1,16 +1,35 @@
-diff -ur openvdb-9.0.0/cmake/FindTBB.cmake openvdb/cmake/FindTBB.cmake
---- openvdb-9.0.0/cmake/FindTBB.cmake	2021-10-30 03:55:40.000000000 +0100
-+++ openvdb/cmake/FindTBB.cmake	2022-03-31 11:33:15.592329750 +0100
-@@ -252,7 +252,8 @@
-       set(_TBB_LIB_NAME "${_TBB_LIB_NAME}${TBB_DEBUG_SUFFIX}")
-     endif()
- 
--    find_library(Tbb_${COMPONENT}_LIBRARY_${BUILD_TYPE} ${_TBB_LIB_NAME}
-+    find_library(Tbb_${COMPONENT}_LIBRARY_${BUILD_TYPE}
-+      NAMES ${_TBB_LIB_NAME} ${_TBB_LIB_NAME}_static
-       ${_FIND_TBB_ADDITIONAL_OPTIONS}
-       PATHS ${_TBB_LIBRARYDIR_SEARCH_DIRS}
-       PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR} lib64 lib
+diff -Naur openvdb-8.0.0/cmake/FindIlmBase.cmake openvdb/cmake/FindIlmBase.cmake
+--- openvdb-8.0.0/cmake/FindIlmBase.cmake	2020-12-24 10:13:14 -0700
++++ openvdb/cmake/FindIlmBase.cmake	2021-02-05 12:07:49 -0700
+@@ -217,6 +217,12 @@
+     set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
+   endif()
+   list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES "${_IlmBase_Version_Suffix}.lib")
++  list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
++    "_s.lib"
++  )
++  list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
++    "_s_d.lib"
++  )
+ else()
+   if(ILMBASE_USE_STATIC_LIBS)
+     set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+diff -Naur openvdb-8.0.0/cmake/FindOpenEXR.cmake openvdb/cmake/FindOpenEXR.cmake
+--- openvdb-8.0.0/cmake/FindOpenEXR.cmake	2020-12-24 10:13:14 -0700
++++ openvdb/cmake/FindOpenEXR.cmake	2021-02-05 12:23:39 -0700
+@@ -210,6 +210,12 @@
+     set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
+   endif()
+   list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES "${_OpenEXR_Version_Suffix}.lib")
++  list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
++    "_s.lib"
++  )
++  list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
++    "_s_d.lib"
++  )
+ else()
+   if(OPENEXR_USE_STATIC_LIBS)
+     set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
 diff -Naur openvdb-8.0.0/openvdb/openvdb/CMakeLists.txt openvdb/openvdb/openvdb/CMakeLists.txt
 --- openvdb-8.0.0/openvdb/openvdb/CMakeLists.txt	2020-12-24 10:13:14 -0700
 +++ openvdb/openvdb/openvdb/CMakeLists.txt	2021-02-05 11:18:33 -0700
@@ -99,321 +118,3 @@ diff -Naur openvdb-8.0.0/openvdb/openvdb/version.rc.in openvdb/openvdb/openvdb/v
 +
 +    END
 +END
-diff --git a/nanovdb/nanovdb/NanoVDB.h b/nanovdb/nanovdb/NanoVDB.h
-index cc2e54b77..703d2eabc 100644
---- a/nanovdb/nanovdb/NanoVDB.h
-+++ b/nanovdb/nanovdb/NanoVDB.h
-@@ -161,8 +161,8 @@ typedef unsigned long long uint64_t;
- 
- #endif // __CUDACC_RTC__
- 
--#ifdef __CUDACC__
--// Only define __hostdev__ when using NVIDIA CUDA compiler
-+#if defined(__CUDACC__) || defined(__HIP__)
-+// Only define __hostdev__ when using NVIDIA CUDA or HIP compiler
- #define __hostdev__ __host__ __device__
- #else
- #define __hostdev__
-@@ -611,7 +611,7 @@ struct Delta<double>
- /// Maximum floating-point values
- template<typename T>
- struct Maximum;
--#ifdef __CUDA_ARCH__
-+#if defined(__CUDA_ARCH__) || defined(__HIP__)
- template<>
- struct Maximum<int>
- {
-@@ -1176,10 +1176,10 @@ using Vec3f = Vec3<float>;
- using Vec3i = Vec3<int>;
- 
- /// @brief Return a single precision floating-point vector of this coordinate
--Vec3f Coord::asVec3s() const { return Vec3f(float(mVec[0]), float(mVec[1]), float(mVec[2])); }
-+__hostdev__ inline Vec3f Coord::asVec3s() const { return Vec3f(float(mVec[0]), float(mVec[1]), float(mVec[2])); }
- 
- /// @brief Return a double precision floating-point vector of this coordinate
--Vec3d Coord::asVec3d() const { return Vec3d(double(mVec[0]), double(mVec[1]), double(mVec[2])); }
-+__hostdev__ inline Vec3d Coord::asVec3d() const { return Vec3d(double(mVec[0]), double(mVec[1]), double(mVec[2])); }
- 
- // ----------------------------> Vec4 <--------------------------------------
- 
-@@ -2042,7 +2042,7 @@ struct Map
- }; // Map
- 
- template<typename Mat4T>
--void Map::set(const Mat4T& mat, const Mat4T& invMat, double taper)
-+__hostdev__ void Map::set(const Mat4T& mat, const Mat4T& invMat, double taper)
- {
-     float * mf = mMatF, *vf = mVecF;
-     float*  mif = mInvMatF;
-@@ -2486,7 +2486,7 @@ class Grid : private GridData
- }; // Class Grid
- 
- template<typename TreeT>
--int Grid<TreeT>::findBlindDataForSemantic(GridBlindDataSemantic semantic) const
-+__hostdev__ int Grid<TreeT>::findBlindDataForSemantic(GridBlindDataSemantic semantic) const
- {
-     for (uint32_t i = 0, n = this->blindDataCount(); i < n; ++i)
-         if (this->blindMetaData(i).mSemantic == semantic)
-@@ -2671,7 +2671,7 @@ class Tree : private TreeData<RootT::LEVEL>
- }; // Tree class
- 
- template<typename RootT>
--void Tree<RootT>::extrema(ValueType& min, ValueType& max) const
-+__hostdev__ void Tree<RootT>::extrema(ValueType& min, ValueType& max) const
- {
-     min = this->root().minimum();
-     max = this->root().maximum();
-@@ -3880,7 +3880,7 @@ class LeafNode : private LeafData<BuildT, CoordT, MaskT, Log2Dim>
- }; // LeafNode class
- 
- template<typename ValueT, typename CoordT, template<uint32_t> class MaskT, uint32_t LOG2DIM>
--inline void LeafNode<ValueT, CoordT, MaskT, LOG2DIM>::updateBBox()
-+__hostdev__ inline void LeafNode<ValueT, CoordT, MaskT, LOG2DIM>::updateBBox()
- {
-     static_assert(LOG2DIM == 3, "LeafNode::updateBBox: only supports LOGDIM = 3!");
-     if (!this->isActive()) return;
-diff --git a/nanovdb/nanovdb/util/SampleFromVoxels.h b/nanovdb/nanovdb/util/SampleFromVoxels.h
-index 852123dac..e779d66cf 100644
---- a/nanovdb/nanovdb/util/SampleFromVoxels.h
-+++ b/nanovdb/nanovdb/util/SampleFromVoxels.h
-@@ -22,7 +22,7 @@
- #define NANOVDB_SAMPLE_FROM_VOXELS_H_HAS_BEEN_INCLUDED
- 
- // Only define __hostdev__ when compiling as NVIDIA CUDA
--#ifdef __CUDACC__
-+#if defined(__CUDACC__) || defined(__HIP__)
- #define __hostdev__ __host__ __device__
- #else
- #include <cmath> // for floor
-@@ -136,7 +136,7 @@ class SampleFromVoxels<TreeOrAccT, 0, false>
- 
- template<typename TreeOrAccT>
- template<typename Vec3T>
--typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()(const Vec3T& xyz) const
-+__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()(const Vec3T& xyz) const
- {
-     const CoordT ijk = Round<CoordT>(xyz);
-     if (ijk != mPos) {
-@@ -147,7 +147,7 @@ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()
- }
- 
- template<typename TreeOrAccT>
--typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()(const CoordT& ijk) const
-+__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()(const CoordT& ijk) const
- {
-     if (ijk != mPos) {
-         mPos = ijk;
-@@ -158,7 +158,7 @@ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()
- 
- template<typename TreeOrAccT>
- template<typename Vec3T>
--typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, false>::operator()(const Vec3T& xyz) const
-+__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, false>::operator()(const Vec3T& xyz) const
- {
-     return mAcc.getValue(Round<CoordT>(xyz));
- }
-@@ -195,7 +195,7 @@ class TrilinearSampler
- }; // TrilinearSamplerBase
- 
- template<typename TreeOrAccT>
--void TrilinearSampler<TreeOrAccT>::stencil(CoordT& ijk, ValueT (&v)[2][2][2]) const
-+__hostdev__ void TrilinearSampler<TreeOrAccT>::stencil(CoordT& ijk, ValueT (&v)[2][2][2]) const
- {
-     v[0][0][0] = mAcc.getValue(ijk); // i, j, k
- 
-@@ -224,7 +224,7 @@ void TrilinearSampler<TreeOrAccT>::stencil(CoordT& ijk, ValueT (&v)[2][2][2]) co
- 
- template<typename TreeOrAccT>
- template<typename RealT, template<typename...> class Vec3T>
--typename TreeOrAccT::ValueType TrilinearSampler<TreeOrAccT>::sample(const Vec3T<RealT> &uvw, const ValueT (&v)[2][2][2])
-+__hostdev__ typename TreeOrAccT::ValueType TrilinearSampler<TreeOrAccT>::sample(const Vec3T<RealT> &uvw, const ValueT (&v)[2][2][2])
- {
- #if 0
-   auto lerp = [](ValueT a, ValueT b, ValueT w){ return fma(w, b-a, a); };// = w*(b-a) + a
-@@ -239,7 +239,7 @@ typename TreeOrAccT::ValueType TrilinearSampler<TreeOrAccT>::sample(const Vec3T<
- 
- template<typename TreeOrAccT>
- template<typename RealT, template<typename...> class Vec3T>
--Vec3T<typename TreeOrAccT::ValueType> TrilinearSampler<TreeOrAccT>::gradient(const Vec3T<RealT> &uvw, const ValueT (&v)[2][2][2])
-+__hostdev__ Vec3T<typename TreeOrAccT::ValueType> TrilinearSampler<TreeOrAccT>::gradient(const Vec3T<RealT> &uvw, const ValueT (&v)[2][2][2])
- {
-     static_assert(is_floating_point<ValueT>::value, "TrilinearSampler::gradient requires a floating-point type");
- #if 0
-@@ -270,7 +270,7 @@ Vec3T<typename TreeOrAccT::ValueType> TrilinearSampler<TreeOrAccT>::gradient(con
- }
- 
- template<typename TreeOrAccT>
--bool TrilinearSampler<TreeOrAccT>::zeroCrossing(const ValueT (&v)[2][2][2])
-+__hostdev__ bool TrilinearSampler<TreeOrAccT>::zeroCrossing(const ValueT (&v)[2][2][2])
- {
-     static_assert(is_floating_point<ValueT>::value, "TrilinearSampler::zeroCrossing requires a floating-point type");
-     const bool less = v[0][0][0] < ValueT(0);
-@@ -363,21 +363,21 @@ class SampleFromVoxels<TreeOrAccT, 1, true> : public TrilinearSampler<TreeOrAccT
- 
- template<typename TreeOrAccT>
- template<typename RealT, template<typename...> class Vec3T>
--typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, true>::operator()(Vec3T<RealT> xyz) const
-+__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, true>::operator()(Vec3T<RealT> xyz) const
- {
-     this->cache(xyz);
-     return BaseT::sample(xyz, mVal);
- }
- 
- template<typename TreeOrAccT>
--typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, true>::operator()(const CoordT &ijk) const
-+__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, true>::operator()(const CoordT &ijk) const
- {
-     return  ijk == mPos ? mVal[0][0][0] : BaseT::mAcc.getValue(ijk);
- }
- 
- template<typename TreeOrAccT>
- template<typename RealT, template<typename...> class Vec3T>
--Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, true>::gradient(Vec3T<RealT> xyz) const
-+__hostdev__ Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, true>::gradient(Vec3T<RealT> xyz) const
- {
-     this->cache(xyz);
-     return BaseT::gradient(xyz, mVal);
-@@ -393,7 +393,7 @@ __hostdev__ bool SampleFromVoxels<TreeOrAccT, 1, true>::zeroCrossing(Vec3T<RealT
- 
- template<typename TreeOrAccT>
- template<typename RealT, template<typename...> class Vec3T>
--void SampleFromVoxels<TreeOrAccT, 1, true>::cache(Vec3T<RealT>& xyz) const
-+__hostdev__ void SampleFromVoxels<TreeOrAccT, 1, true>::cache(Vec3T<RealT>& xyz) const
- {
-     CoordT ijk = Floor<CoordT>(xyz);
-     if (ijk != mPos) {
-@@ -406,7 +406,7 @@ void SampleFromVoxels<TreeOrAccT, 1, true>::cache(Vec3T<RealT>& xyz) const
- 
- template<typename TreeOrAccT>
- template<typename RealT, template<typename...> class Vec3T>
--typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator()(Vec3T<RealT> xyz) const
-+__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator()(Vec3T<RealT> xyz) const
- {
-     ValueT val[2][2][2];
-     CoordT ijk = Floor<CoordT>(xyz);
-@@ -418,7 +418,7 @@ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator(
- 
- template<typename TreeOrAccT>
- template<typename RealT, template<typename...> class Vec3T>
--typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator()(Vec3T<RealT> xyz) const
-+__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator()(Vec3T<RealT> xyz) const
- {
-     auto lerp = [](ValueT a, ValueT b, RealT w) { return a + ValueT(w) * (b - a); };
- 
-@@ -463,7 +463,7 @@ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator(
- 
- template<typename TreeOrAccT>
- template<typename RealT, template<typename...> class Vec3T>
--inline Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, false>::gradient(Vec3T<RealT> xyz) const
-+__hostdev__ inline Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, false>::gradient(Vec3T<RealT> xyz) const
- {
-     ValueT val[2][2][2];
-     CoordT ijk = Floor<CoordT>(xyz);
-@@ -473,7 +473,7 @@ inline Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, fal
- 
- template<typename TreeOrAccT>
- template<typename RealT, template<typename...> class Vec3T>
--bool SampleFromVoxels<TreeOrAccT, 1, false>::zeroCrossing(Vec3T<RealT> xyz) const
-+__hostdev__ bool SampleFromVoxels<TreeOrAccT, 1, false>::zeroCrossing(Vec3T<RealT> xyz) const
- {
-     ValueT val[2][2][2];
-     CoordT ijk = Floor<CoordT>(xyz);
-@@ -510,7 +510,7 @@ class TriquadraticSampler
- }; // TriquadraticSamplerBase
- 
- template<typename TreeOrAccT>
--void TriquadraticSampler<TreeOrAccT>::stencil(const CoordT &ijk, ValueT (&v)[3][3][3]) const
-+__hostdev__ void TriquadraticSampler<TreeOrAccT>::stencil(const CoordT &ijk, ValueT (&v)[3][3][3]) const
- {
-     CoordT p(ijk[0] - 1, 0, 0);
-     for (int dx = 0; dx < 3; ++dx, ++p[0]) {
-@@ -526,7 +526,7 @@ void TriquadraticSampler<TreeOrAccT>::stencil(const CoordT &ijk, ValueT (&v)[3][
- 
- template<typename TreeOrAccT>
- template<typename RealT, template<typename...> class Vec3T>
--typename TreeOrAccT::ValueType TriquadraticSampler<TreeOrAccT>::sample(const Vec3T<RealT> &uvw, const ValueT (&v)[3][3][3])
-+__hostdev__ typename TreeOrAccT::ValueType TriquadraticSampler<TreeOrAccT>::sample(const Vec3T<RealT> &uvw, const ValueT (&v)[3][3][3])
- {
-     auto kernel = [](const ValueT* value, double weight)->ValueT {
-         return weight * (weight * (0.5f * (value[0] + value[2]) - value[1]) +
-@@ -545,7 +545,7 @@ typename TreeOrAccT::ValueType TriquadraticSampler<TreeOrAccT>::sample(const Vec
- }
- 
- template<typename TreeOrAccT>
--bool TriquadraticSampler<TreeOrAccT>::zeroCrossing(const ValueT (&v)[3][3][3])
-+__hostdev__ bool TriquadraticSampler<TreeOrAccT>::zeroCrossing(const ValueT (&v)[3][3][3])
- {
-     static_assert(is_floating_point<ValueT>::value, "TrilinearSampler::zeroCrossing requires a floating-point type");
-     const bool less = v[0][0][0] < ValueT(0);
-@@ -624,14 +624,14 @@ class SampleFromVoxels<TreeOrAccT, 2, true> : public TriquadraticSampler<TreeOrA
- 
- template<typename TreeOrAccT>
- template<typename RealT, template<typename...> class Vec3T>
--typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, true>::operator()(Vec3T<RealT> xyz) const
-+__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, true>::operator()(Vec3T<RealT> xyz) const
- {
-     this->cache(xyz);
-     return BaseT::sample(xyz, mVal);
- }
- 
- template<typename TreeOrAccT>
--typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, true>::operator()(const CoordT &ijk) const
-+__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, true>::operator()(const CoordT &ijk) const
- {
-     return  ijk == mPos ? mVal[1][1][1] : BaseT::mAcc.getValue(ijk);
- }
-@@ -646,7 +646,7 @@ __hostdev__ bool SampleFromVoxels<TreeOrAccT, 2, true>::zeroCrossing(Vec3T<RealT
- 
- template<typename TreeOrAccT>
- template<typename RealT, template<typename...> class Vec3T>
--void SampleFromVoxels<TreeOrAccT, 2, true>::cache(Vec3T<RealT>& xyz) const
-+__hostdev__ void SampleFromVoxels<TreeOrAccT, 2, true>::cache(Vec3T<RealT>& xyz) const
- {
-     CoordT ijk = Floor<CoordT>(xyz);
-     if (ijk != mPos) {
-@@ -657,7 +657,7 @@ void SampleFromVoxels<TreeOrAccT, 2, true>::cache(Vec3T<RealT>& xyz) const
- 
- template<typename TreeOrAccT>
- template<typename RealT, template<typename...> class Vec3T>
--typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, false>::operator()(Vec3T<RealT> xyz) const
-+__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, false>::operator()(Vec3T<RealT> xyz) const
- {
-     ValueT val[3][3][3];
-     CoordT ijk = Floor<CoordT>(xyz);
-@@ -667,7 +667,7 @@ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, false>::operator(
- 
- template<typename TreeOrAccT>
- template<typename RealT, template<typename...> class Vec3T>
--bool SampleFromVoxels<TreeOrAccT, 2, false>::zeroCrossing(Vec3T<RealT> xyz) const
-+__hostdev__ bool SampleFromVoxels<TreeOrAccT, 2, false>::zeroCrossing(Vec3T<RealT> xyz) const
- {
-     ValueT val[3][3][3];
-     CoordT ijk = Floor<CoordT>(xyz);
-@@ -710,7 +710,7 @@ class TricubicSampler
- }; // TricubicSampler
- 
- template<typename TreeOrAccT>
--void TricubicSampler<TreeOrAccT>::stencil(const CoordT& ijk, ValueT (&C)[64]) const
-+__hostdev__ void TricubicSampler<TreeOrAccT>::stencil(const CoordT& ijk, ValueT (&C)[64]) const
- {
-     auto fetch = [&](int i, int j, int k) -> ValueT& { return C[((i + 1) << 4) + ((j + 1) << 2) + k + 1]; };
- 
-@@ -929,7 +929,7 @@ class SampleFromVoxels<TreeOrAccT, 3, true> : public TricubicSampler<TreeOrAccT>
- 
- template<typename TreeOrAccT>
- template<typename RealT, template<typename...> class Vec3T>
--typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 3, true>::operator()(Vec3T<RealT> xyz) const
-+__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 3, true>::operator()(Vec3T<RealT> xyz) const
- {
-     this->cache(xyz);
-     return BaseT::sample(xyz, mC);
-@@ -937,7 +937,7 @@ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 3, true>::operator()
- 
- template<typename TreeOrAccT>
- template<typename RealT, template<typename...> class Vec3T>
--void SampleFromVoxels<TreeOrAccT, 3, true>::cache(Vec3T<RealT>& xyz) const
-+__hostdev__ void SampleFromVoxels<TreeOrAccT, 3, true>::cache(Vec3T<RealT>& xyz) const
- {
-     CoordT ijk = Floor<CoordT>(xyz);
-     if (ijk != mPos) {
-

build_files/build_environment/patches/osl.diff

@@ -48,6 +48,25 @@ diff -Naur org/CMakeLists.txt external_osl/CMakeLists.txt
 
  set (OSL_NO_DEFAULT_TEXTURESYSTEM OFF CACHE BOOL "Do not use create a raw OIIO::TextureSystem")
  if (OSL_NO_DEFAULT_TEXTURESYSTEM)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 990f50d69..46ef7351d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -252,11 +252,9 @@ install (EXPORT OSL_EXPORTED_TARGETS
+         FILE ${OSL_TARGETS_EXPORT_NAME}
+         NAMESPACE ${PROJECT_NAME}::)
+ 
+-
+-
+-
+-osl_add_all_tests()
+-
++if (${PROJECT_NAME}_BUILD_TESTS AND NOT ${PROJECT_NAME}_IS_SUBPROJECT)
++	osl_add_all_tests()
++endif ()
+ 
+ if (NOT ${PROJECT_NAME}_IS_SUBPROJECT)
+     include (packaging)
 diff -Naur external_osl_orig/src/cmake/externalpackages.cmake external_osl/src/cmake/externalpackages.cmake
 --- external_osl_orig/src/cmake/externalpackages.cmake  2021-06-01 13:44:18 -0600
 +++ external_osl/src/cmake/externalpackages.cmake       2021-06-28 07:44:32 -0600

build_files/build_environment/patches/usd.diff

@@ -10,22 +10,217 @@ diff -x .git -ur usd.orig/cmake/defaults/Packages.cmake external_usd/cmake/defau
  add_definitions(${TBB_DEFINITIONS})
  
  # --math
-
-diff -Naur usd_orig/cmake/defaults/msvcdefaults.cmake external_usd/cmake/defaults/msvcdefaults.cmake
---- usd_orig/cmake/defaults/msvcdefaults.cmake	2022-02-18 14:49:09 -0700
-+++ external_usd/cmake/defaults/msvcdefaults.cmake	2022-03-14 11:41:50 -0600
-@@ -120,9 +120,6 @@
- # for all translation units.
- set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /bigobj")
+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
+@@ -996,6 +996,12 @@
+     foreach(lib ${PXR_OBJECT_LIBS})
+         string(TOUPPER ${lib} uppercaseName)
+         list(APPEND exports "${uppercaseName}_EXPORTS=1")
++        # When building for blender, we do NOT want to export all symbols on windows.
++        # This is a dirty hack, but USD makes it impossible to do the right thing
++        # with the default options exposed.
++        if (WIN32)
++            list(APPEND exports "PXR_STATIC=1")
++        endif()
+     endforeach()
+     foreach(lib ${PXR_OBJECT_LIBS})
+         set(objects "${objects};\$<TARGET_OBJECTS:${lib}>")
+diff -ru USD-20.11/pxr/base/tf/pxrLZ4/lz4.cpp external_usd/pxr/base/tf/pxrLZ4/lz4.cpp
+--- USD-20.11/pxr/base/tf/pxrLZ4/lz4.cpp        2020-10-14 19:25:19.000000000 +0100
++++ external_usd/pxr/base/tf/pxrLZ4/lz4.cpp     2021-02-09 09:28:51.496190085 +0000
+@@ -614,6 +614,15 @@
+ /*-************************************
+ *  Internal Definitions used in Tests
+ **************************************/
++
++/*******************************************************************
++ * Disabled in Blender. The BLOSC library also exposes these
++ * functions, and this causes 'duplicate symbol' linker errors.
++ *
++ * This problem has been reported upstream at
++ * https://github.com/PixarAnimationStudios/USD/issues/1447
++ *
++ *******************************************************************
+ #if defined (__cplusplus)
+ extern "C" {
+ #endif
+@@ -627,6 +636,7 @@
+ #if defined (__cplusplus)
+ }
+ #endif
++********************************************************************/
  
--# 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-")
+ /*-******************************
+ *  Compression functions
+
+From 442d087962f762deeb8b6e49a0955753fcf9aeb9 Mon Sep 17 00:00:00 2001
+From: Tsahi Zidenberg <tsahee@amazon.com>
+Date: Sun, 15 Nov 2020 15:18:24 +0000
+Subject: [PATCH 1/2] stackTrace: support aarch64/linux
+
+stacktrace calls syscall directly via assembler. Create compatible
+aarch64 code.
+---
+ pxr/base/arch/stackTrace.cpp | 30 ++++++++++++++++++++++++------
+ 1 file changed, 24 insertions(+), 6 deletions(-)
+
+diff --git a/pxr/base/arch/stackTrace.cpp b/pxr/base/arch/stackTrace.cpp
+index dcc1dfd46..c11aabeb1 100644
+--- a/pxr/base/arch/stackTrace.cpp
++++ b/pxr/base/arch/stackTrace.cpp
+@@ -583,7 +583,6 @@ nonLockingLinux__execve (const char *file,
+                          char *const argv[],
+                          char *const envp[])
+ {
+-#if defined(ARCH_BITS_64)
+     /*
+      * We make a direct system call here, because we can't find an
+      * execve which corresponds with the non-locking fork we call
+@@ -594,7 +593,27 @@ nonLockingLinux__execve (const char *file,
+      * hangs in a threaded app.  (We use the non-locking fork to get
+      * around problems with forking when we have had memory
+      * corruption.)  whew.
+-     *
++     */
++
++    unsigned long result;
++
++#if defined (__aarch64__)
++    {
++        register long __file_result asm ("x0") = (long)file;
++        register char* const* __argv asm ("x1") = argv;
++        register char* const* __envp asm ("x2") = envp;
++        register long __num_execve asm ("x8") = 221;
++        __asm__ __volatile__ (
++            "svc 0"
++            : "=r" (__file_result)
++            : "r"(__num_execve), "r" (__file_result), "r" (__argv), "r" (__envp)
++            : "memory"
++        );
++        result = __file_result;
++    }
++#elif defined(ARCH_CPU_INTEL) && defined(ARCH_BITS_64)
++
++    /*
+      * %rdi, %rsi, %rdx, %rcx, %r8, %r9 are args 0-5
+      * syscall clobbers %rcx and %r11
+      *
+@@ -603,7 +622,6 @@ nonLockingLinux__execve (const char *file,
+      * constraints to gcc.
+      */
+ 
+-    unsigned long result;
+     __asm__ __volatile__ (
+         "mov    %0, %%rdi    \n\t"
+         "mov    %%rcx, %%rsi \n\t"
+@@ -614,6 +632,9 @@ nonLockingLinux__execve (const char *file,
+         : "0" (file), "c" (argv), "d" (envp)
+         : "memory", "cc", "r11"
+     );
++#else
++#error Unknown architecture
++#endif
+ 
+     if (result >= 0xfffffffffffff000) {
+         errno = -result;
+@@ -621,9 +642,6 @@ nonLockingLinux__execve (const char *file,
+     }
+ 
+     return result;
+-#else
+-#error Unknown architecture
+-#endif
+ }
+ 
+ #endif
+
+From a1dffe02519bb3c6ccbbe8c6c58304da5db98995 Mon Sep 17 00:00:00 2001
+From: Tsahi Zidenberg <tsahee@amazon.com>
+Date: Sun, 15 Nov 2020 15:22:52 +0000
+Subject: [PATCH 2/2] timing: support aarch64/linux
+
+The aarch64 arch-timer is directly accessible to userspace via two
+registers:
+CNTVCT_EL0 - holds the current counter value
+CNTFRQ_EL0 - holds the counter frequency (in Hz)
+---
+ pxr/base/arch/timing.cpp | 6 ++++++
+ pxr/base/arch/timing.h   | 6 +++++-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/pxr/base/arch/timing.cpp b/pxr/base/arch/timing.cpp
+index 27ad58fed..9022950c1 100644
+--- a/pxr/base/arch/timing.cpp
++++ b/pxr/base/arch/timing.cpp
+@@ -59,6 +59,11 @@ ARCH_HIDDEN
+ void
+ Arch_InitTickTimer()
+ {
++#ifdef __aarch64__
++    uint64_t counter_hz;
++    __asm __volatile("mrs	%0, CNTFRQ_EL0" : "=&r" (counter_hz));
++    Arch_NanosecondsPerTick = double(1e9) / double(counter_hz);
++#else
+     // NOTE: Normally ifstream would be cleaner, but it causes crashes when
+     //       used in conjunction with DSOs and the Intel Compiler.
+     FILE *in;
+@@ -135,6 +140,7 @@ Arch_InitTickTimer()
+     }
+ 
+     Arch_NanosecondsPerTick = double(1e9) / double(cpuHz);
++#endif
+ }
+ #elif defined(ARCH_OS_WINDOWS)
+ 
+diff --git a/pxr/base/arch/timing.h b/pxr/base/arch/timing.h
+index 67ec0d15f..6dc3e85a0 100644
+--- a/pxr/base/arch/timing.h
++++ b/pxr/base/arch/timing.h
+@@ -36,7 +36,7 @@
+ /// \addtogroup group_arch_SystemFunctions
+ ///@{
+ 
+-#if defined(ARCH_OS_LINUX)
++#if defined(ARCH_OS_LINUX) && defined(ARCH_CPU_INTEL)
+ #include <x86intrin.h>
+ #elif defined(ARCH_OS_DARWIN)
+ #include <mach/mach_time.h>
+@@ -69,6 +69,10 @@ ArchGetTickTime()
+ #elif defined(ARCH_CPU_INTEL)
+     // On Intel we'll use the rdtsc instruction.
+     return __rdtsc();
++#elif defined (__aarch64__)
++    uint64_t result;
++    __asm __volatile("mrs	%0, CNTVCT_EL0" : "=&r" (result));
++    return result;
+ #else
+ #error Unknown architecture.
+ #endif
+
+diff --git a/pxr/base/arch/demangle.cpp b/pxr/base/arch/demangle.cpp
+index 67ec0d15f..6dc3e85a0 100644
+--- a/pxr/base/arch/demangle.cpp
++++ b/pxr/base/arch/demangle.cpp
+@@ -36,6 +36,7 @@
+ #if (ARCH_COMPILER_GCC_MAJOR == 3 && ARCH_COMPILER_GCC_MINOR >= 1) || \
+     ARCH_COMPILER_GCC_MAJOR > 3 || defined(ARCH_COMPILER_CLANG)
+ #define _AT_LEAST_GCC_THREE_ONE_OR_CLANG
++#include <cxxabi.h>
+ #endif
+ 
+ PXR_NAMESPACE_OPEN_SCOPE
+@@ -138,7 +139,6 @@
+ #endif
+ 
+ #if defined(_AT_LEAST_GCC_THREE_ONE_OR_CLANG)
+-#include <cxxabi.h>
+ 
+ /*
+  * This routine doesn't work when you get to gcc3.4.
 
 diff --git a/pxr/base/work/singularTask.h b/pxr/base/work/singularTask.h
+index 67ec0d15f..6dc3e85a0 100644
 --- a/pxr/base/work/singularTask.h
 +++ b/pxr/base/work/singularTask.h
 @@ -120,7 +120,7 @@
@@ -37,66 +232,3 @@ diff --git a/pxr/base/work/singularTask.h b/pxr/base/work/singularTask.h
                      do { _fn(); } while (
                          !count.compare_exchange_strong(old, 0));
                  });
-
-diff --git a/pxr/usd/sdr/shaderMetadataHelpers.h b/pxr/usd/sdr/shaderMetadataHelpers.h
---- a/pxr/usd/sdr/shaderMetadataHelpers.h
-+++ b/pxr/usd/sdr/shaderMetadataHelpers.h
-@@ -32,6 +32,8 @@
- #include "pxr/base/tf/token.h"
- #include "pxr/usd/sdr/declare.h"
- 
-+#include <limits>
-+
- PXR_NAMESPACE_OPEN_SCOPE
- 
- /// \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.

build_files/build_environment/windows/build_deps.cmd

@@ -46,15 +46,6 @@ if "%3" == "debug" set CMAKE_DEBUG_OPTIONS=-DWITH_OPTIMIZED_DEBUG=Off
 set dobuild=1
 if "%4" == "nobuild" set dobuild=0
 
-REM If Python is be available certain deps may try to 
-REM to use this over the version we build, to prevent that
-REM make sure python is NOT in the path
-for %%X in (python.exe) do (set PYTHON=%%~$PATH:X)
-if EXIST "%PYTHON%" (
-  echo PYTHON found at %PYTHON% dependencies cannot be build with python available in the path
-  goto exit
-)
-
 set SOURCE_DIR=%~dp0\..
 set BUILD_DIR=%cd%\build
 set HARVEST_DIR=%BUILD_DIR%\output
@@ -107,8 +98,8 @@ echo %DATE% %TIME% : Start > %StatusFile%
 cmake -G "%CMAKE_BUILDER%" %CMAKE_BUILD_ARCH% -Thost=x64  %SOURCE_DIR% -DPACKAGE_DIR=%BUILD_DIR%/packages -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DBUILD_MODE=Release -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/
 echo %DATE% %TIME% : Release Configuration done >> %StatusFile%
 if "%dobuild%" == "1" (
-	msbuild /m:1 "ll.vcxproj" /p:Configuration=Release /fl /flp:logfile=BlenderDeps_llvm.log;Verbosity=normal
-	msbuild /m:1 "BlenderDependencies.sln" /p:Configuration=Release /fl /flp:logfile=BlenderDeps.log;Verbosity=minimal  /verbosity:minimal
+	msbuild /m "ll.vcxproj" /p:Configuration=Release /fl /flp:logfile=BlenderDeps_llvm.log;Verbosity=normal
+	msbuild /m "BlenderDependencies.sln" /p:Configuration=Release /fl /flp:logfile=BlenderDeps.log;Verbosity=minimal  /verbosity:minimal
 	echo %DATE% %TIME% : Release Build done >> %StatusFile%
 	cmake --build . --target Harvest_Release_Results  > Harvest_Release.txt
 )
@@ -120,8 +111,8 @@ cd %Staging%\%BuildDir%%ARCH%D
 cmake -G "%CMAKE_BUILDER%" %CMAKE_BUILD_ARCH% -Thost=x64 %SOURCE_DIR% -DPACKAGE_DIR=%BUILD_DIR%/packages -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DCMAKE_BUILD_TYPE=Debug -DBUILD_MODE=Debug -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/  %CMAKE_DEBUG_OPTIONS%
 echo %DATE% %TIME% : Debug Configuration done >> %StatusFile%
 if "%dobuild%" == "1" (
-	msbuild /m:1 "ll.vcxproj" /p:Configuration=Debug /fl /flp:logfile=BlenderDeps_llvm.log;;Verbosity=normal 
-	msbuild /m:1 "BlenderDependencies.sln" /p:Configuration=Debug /verbosity:n /fl /flp:logfile=BlenderDeps.log;;Verbosity=normal
+	msbuild /m "ll.vcxproj" /p:Configuration=Debug /fl /flp:logfile=BlenderDeps_llvm.log;;Verbosity=normal 
+	msbuild /m "BlenderDependencies.sln" /p:Configuration=Debug /verbosity:n /fl /flp:logfile=BlenderDeps.log;;Verbosity=normal
 	echo %DATE% %TIME% : Debug Build done >> %StatusFile%
 	cmake --build . --target Harvest_Debug_Results> Harvest_Debug.txt
 )

build_files/cmake/Modules/FindOpenEXR.cmake

@@ -85,9 +85,9 @@ STRING(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENE
 IF(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0")
   SET(_openexr_FIND_COMPONENTS
     Iex
+    IlmThread
     OpenEXR
     OpenEXRCore
-    IlmThread
   )
 ELSE()
   SET(_openexr_FIND_COMPONENTS

build_files/cmake/config/blender_full.cmake

@@ -30,7 +30,6 @@ set(WITH_IMAGE_HDR           ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENEXR       ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENJPEG      ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_TIFF          ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_WEBP          ON  CACHE BOOL "" FORCE)
 set(WITH_INPUT_NDOF          ON  CACHE BOOL "" FORCE)
 set(WITH_INPUT_IME           ON  CACHE BOOL "" FORCE)
 set(WITH_INTERNATIONAL       ON  CACHE BOOL "" FORCE)

build_files/cmake/config/blender_lite.cmake

@@ -34,7 +34,6 @@ set(WITH_IMAGE_HDR           OFF CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENEXR       OFF CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENJPEG      OFF CACHE BOOL "" FORCE)
 set(WITH_IMAGE_TIFF          OFF CACHE BOOL "" FORCE)
-set(WITH_IMAGE_WEBP          OFF CACHE BOOL "" FORCE)
 set(WITH_INPUT_NDOF          OFF CACHE BOOL "" FORCE)
 set(WITH_INTERNATIONAL       OFF CACHE BOOL "" FORCE)
 set(WITH_JACK                OFF CACHE BOOL "" FORCE)

build_files/cmake/config/blender_release.cmake

@@ -31,7 +31,6 @@ set(WITH_IMAGE_HDR           ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENEXR       ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENJPEG      ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_TIFF          ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_WEBP          ON  CACHE BOOL "" FORCE)
 set(WITH_INPUT_NDOF          ON  CACHE BOOL "" FORCE)
 set(WITH_INPUT_IME           ON  CACHE BOOL "" FORCE)
 set(WITH_INTERNATIONAL       ON  CACHE BOOL "" FORCE)

build_files/cmake/platform/platform_apple.cmake

@@ -71,7 +71,6 @@ set(CMAKE_PREFIX_PATH ${LIB_SUBDIRS})
 # Find precompiled libraries, and avoid system or user-installed ones.
 
 if(EXISTS ${LIBDIR})
-  include(platform_old_libs_update)
   without_system_libs_begin()
 endif()
 
@@ -215,12 +214,7 @@ if(WITH_SDL)
   find_package(SDL2)
   set(SDL_INCLUDE_DIR ${SDL2_INCLUDE_DIRS})
   set(SDL_LIBRARY ${SDL2_LIBRARIES})
-  string(APPEND PLATFORM_LINKFLAGS " -framework ForceFeedback -framework GameController")
-  if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
-    # The minimum macOS version of the libraries makes it so this is included in SDL on arm64
-    # but not x86_64.
-    string(APPEND PLATFORM_LINKFLAGS " -framework CoreHaptics")
-  endif()
+  string(APPEND PLATFORM_LINKFLAGS " -framework ForceFeedback -framework GameController -framework CoreHaptics")
 endif()
 
 set(PNG_ROOT ${LIBDIR}/png)

build_files/cmake/platform/platform_old_libs_update.cmake

@@ -1,46 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2022 Blender Foundation. All rights reserved.
-
-# Auto update existing CMake caches for new libraries
-
-function(unset_cache_variables pattern)
-  get_cmake_property(_cache_variables CACHE_VARIABLES)
-  foreach (_cache_variable ${_cache_variables})
-    if("${_cache_variable}" MATCHES "${pattern}")
-      unset(${_cache_variable} CACHE)
-    endif()
-  endforeach()
-endfunction()
-
-# Detect update from 3.1 to 3.2 libs.
-if(UNIX AND
-   DEFINED OPENEXR_VERSION AND
-   OPENEXR_VERSION VERSION_LESS "3.0.0" AND
-   EXISTS ${LIBDIR}/imath)
-  message(STATUS "Auto updating CMake configuration for Blender 3.2 libraries")
-
-  unset_cache_variables("^OPENIMAGEIO")
-  unset_cache_variables("^OPENEXR")
-  unset_cache_variables("^IMATH")
-  unset_cache_variables("^PNG")
-  unset_cache_variables("^USD")
-  unset_cache_variables("^WEBP")
-  unset_cache_variables("^NANOVDB")
-endif()
-
-# Automatically set WebP on/off depending if libraries are available.
-if(EXISTS ${LIBDIR}/webp)
-  if(WITH_OPENIMAGEIO)
-    set(WITH_IMAGE_WEBP ON CACHE BOOL "" FORCE)
-  endif()
-else()
-  set(WITH_IMAGE_WEBP OFF)
-endif()
-
-# NanoVDB moved into openvdb.
-if(UNIX AND DEFINED NANOVDB_INCLUDE_DIR)
-  if(NOT EXISTS ${NANOVDB_INCLUDE_DIR} AND
-     EXISTS ${LIBDIR}/openvdb/include/nanovdb)
-    unset_cache_variables("^NANOVDB")
-  endif()
-endif()

build_files/cmake/platform/platform_unix.cmake

@@ -45,9 +45,6 @@ if(EXISTS ${LIBDIR})
   # which is a part of OpenCollada. They have different ABI, and we
   # do need to use the official one.
   set(CMAKE_PREFIX_PATH ${LIBDIR}/zlib ${LIB_SUBDIRS})
-
-  include(platform_old_libs_update)
-
   set(WITH_STATIC_LIBS ON)
   # OpenMP usually can't be statically linked into shared libraries,
   # due to not being compiled with position independent code.
@@ -376,7 +373,6 @@ if(WITH_IMAGE_WEBP)
   find_package_wrapper(WebP)
   if(NOT WEBP_FOUND)
     set(WITH_IMAGE_WEBP OFF)
-    message(WARNING "WebP not found, disabling WITH_IMAGE_WEBP")
   endif()
 endif()
 
@@ -398,9 +394,6 @@ if(WITH_OPENIMAGEIO)
   if(WITH_IMAGE_OPENEXR)
     list(APPEND OPENIMAGEIO_LIBRARIES "${OPENEXR_LIBRARIES}")
   endif()
-  if(WITH_IMAGE_WEBP)
-    list(APPEND OPENIMAGEIO_LIBRARIES "${WEBP_LIBRARIES}")
-  endif()
 
   if(NOT OPENIMAGEIO_FOUND)
     set(WITH_OPENIMAGEIO OFF)

build_files/cmake/platform/platform_win32.cmake

@@ -262,8 +262,6 @@ if(NOT EXISTS "${LIBDIR}/")
   message(FATAL_ERROR "\n\nWindows requires pre-compiled libs at: '${LIBDIR}'. Please run `make update` in the blender source folder to obtain them.")
 endif()
 
-include(platform_old_libs_update)
-
 if(CMAKE_GENERATOR MATCHES "^Visual Studio.+" AND # Only supported in the VS IDE
    MSVC_VERSION GREATER_EQUAL 1924            AND # Supported for 16.4+
    WITH_CLANG_TIDY                                # And Clang Tidy needs to be on
@@ -345,18 +343,13 @@ if(WITH_FFTW3)
   set(FFTW3_LIBPATH ${FFTW3}/lib)
 endif()
 
-if(WITH_IMAGE_WEBP)
-  windows_find_package(WebP)
-  if(NOT WEBP_FOUND)
-    if(EXISTS ${LIBDIR}/webp)
-      set(WEBP_INCLUDE_DIRS ${LIBDIR}/webp/include)
-      set(WEBP_ROOT_DIR ${LIBDIR}/webp)
-      set(WEBP_LIBRARIES ${LIBDIR}/webp/lib/webp.lib ${LIBDIR}/webp/lib/webpdemux.lib ${LIBDIR}/webp/lib/webpmux.lib)
-      set(WEBP_FOUND ON)
-    else()
-      message(STATUS "WITH_IMAGE_WEBP is ON but WEBP libraries are not found, setting WITH_IMAGE_WEBP=OFF")
-      set(WITH_IMAGE_WEBP OFF)
-    endif()
+windows_find_package(WebP)
+if(NOT WEBP_FOUND)
+  if(EXISTS ${LIBDIR}/webp)
+    set(WEBP_INCLUDE_DIRS ${LIBDIR}/webp/include)
+    set(WEBP_ROOT_DIR ${LIBDIR}/webp)
+    set(WEBP_LIBRARIES ${LIBDIR}/webp/lib/webp.lib ${LIBDIR}/webp/lib/webpdemux.lib ${LIBDIR}/webp/lib/webpmux.lib)
+    set(WEBP_FOUND ON)
   endif()
 endif()
 
@@ -421,60 +414,27 @@ if(WITH_CODEC_FFMPEG)
 endif()
 
 if(WITH_IMAGE_OPENEXR)
-  # Imath and OpenEXR have a single combined build option and include and library variables
-  # used by the rest of the build system.
-  set(IMATH_ROOT_DIR ${LIBDIR}/imath)
-  set(IMATH_VERSION "3.14")
-  windows_find_package(IMATH REQUIRED)
-  if(NOT IMATH_FOUND)
-    set(IMATH ${LIBDIR}/imath)
-    set(IMATH_INCLUDE_DIR ${IMATH}/include)
-    set(IMATH_INCLUDE_DIRS ${IMATH_INCLUDE_DIR} ${IMATH}/include/Imath)
-    set(IMATH_LIBPATH ${IMATH}/lib)
-    set(IMATH_LIBRARIES
-      optimized ${IMATH_LIBPATH}/Imath_s.lib
-      debug ${IMATH_LIBPATH}/Imath_s_d.lib
-    )
-  endif()
-  set(OPENEXR_ROOT_DIR ${LIBDIR}/openexr)
-  set(OPENEXR_VERSION "3.14")
-  windows_find_package(OPENEXR REQUIRED)
+  windows_find_package(OpenEXR REQUIRED)
   if(NOT OpenEXR_FOUND)
+    set(OPENEXR_ROOT_DIR ${LIBDIR}/openexr)
+    set(OPENEXR_VERSION "2.1")
     warn_hardcoded_paths(OpenEXR)
     set(OPENEXR ${LIBDIR}/openexr)
     set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
-    set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIRS} ${OPENEXR}/include/OpenEXR)
+    set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR}/include/OpenEXR)
     set(OPENEXR_LIBPATH ${OPENEXR}/lib)
-    # Check if the 3.x library name exists
-    # if not assume this is a 2.x library folder
-    if(EXISTS "${OPENEXR_LIBPATH}/OpenEXR_s.lib")
-      set(OPENEXR_LIBRARIES
-        optimized ${OPENEXR_LIBPATH}/Iex_s.lib
-        optimized ${OPENEXR_LIBPATH}/IlmThread_s.lib
-        optimized ${OPENEXR_LIBPATH}/OpenEXR_s.lib
-        optimized ${OPENEXR_LIBPATH}/OpenEXRCore_s.lib
-        optimized ${OPENEXR_LIBPATH}/OpenEXRUtil_s.lib
-        debug ${OPENEXR_LIBPATH}/Iex_s_d.lib
-        debug ${OPENEXR_LIBPATH}/IlmThread_s_d.lib
-        debug ${OPENEXR_LIBPATH}/OpenEXR_s_d.lib
-        debug ${OPENEXR_LIBPATH}/OpenEXRCore_s_d.lib
-        debug ${OPENEXR_LIBPATH}/OpenEXRUtil_s_d.lib
-        ${IMATH_LIBRARIES}
-      )
-    else()
-      set(OPENEXR_LIBRARIES
-        optimized ${OPENEXR_LIBPATH}/Iex_s.lib
-        optimized ${OPENEXR_LIBPATH}/Half_s.lib
-        optimized ${OPENEXR_LIBPATH}/IlmImf_s.lib
-        optimized ${OPENEXR_LIBPATH}/Imath_s.lib
-        optimized ${OPENEXR_LIBPATH}/IlmThread_s.lib
-        debug ${OPENEXR_LIBPATH}/Iex_s_d.lib
-        debug ${OPENEXR_LIBPATH}/Half_s_d.lib
-        debug ${OPENEXR_LIBPATH}/IlmImf_s_d.lib
-        debug ${OPENEXR_LIBPATH}/Imath_s_d.lib
-        debug ${OPENEXR_LIBPATH}/IlmThread_s_d.lib
-      )
-    endif()
+    set(OPENEXR_LIBRARIES
+      optimized ${OPENEXR_LIBPATH}/Iex_s.lib
+      optimized ${OPENEXR_LIBPATH}/Half_s.lib
+      optimized ${OPENEXR_LIBPATH}/IlmImf_s.lib
+      optimized ${OPENEXR_LIBPATH}/Imath_s.lib
+      optimized ${OPENEXR_LIBPATH}/IlmThread_s.lib
+      debug ${OPENEXR_LIBPATH}/Iex_s_d.lib
+      debug ${OPENEXR_LIBPATH}/Half_s_d.lib
+      debug ${OPENEXR_LIBPATH}/IlmImf_s_d.lib
+      debug ${OPENEXR_LIBPATH}/Imath_s_d.lib
+      debug ${OPENEXR_LIBPATH}/IlmThread_s_d.lib
+    )
   endif()
 endif()
 
@@ -540,14 +500,8 @@ if(WITH_BOOST)
     if(NOT BOOST_VERSION)
       message(FATAL_ERROR "Unable to determine Boost version")
     endif()
-    set(BOOST_POSTFIX "vc142-mt-x64-${BOOST_VERSION}.lib")
-    set(BOOST_DEBUG_POSTFIX "vc142-mt-gd-x64-${BOOST_VERSION}.lib")
-    if(NOT EXISTS ${BOOST_LIBPATH}/libboost_date_time-${BOOST_POSTFIX})
-      # If the new library names do not exist fall back to the old ones
-      # to ease the transition period between the libs.
-      set(BOOST_POSTFIX "vc141-mt-x64-${BOOST_VERSION}.lib")
-      set(BOOST_DEBUG_POSTFIX "vc141-mt-gd-x64-${BOOST_VERSION}.lib")
-    endif()
+    set(BOOST_POSTFIX "vc141-mt-x64-${BOOST_VERSION}.lib")
+    set(BOOST_DEBUG_POSTFIX "vc141-mt-gd-x64-${BOOST_VERSION}.lib")
     set(BOOST_LIBRARIES
       optimized ${BOOST_LIBPATH}/libboost_date_time-${BOOST_POSTFIX}
       optimized ${BOOST_LIBPATH}/libboost_filesystem-${BOOST_POSTFIX}
@@ -591,6 +545,7 @@ if(WITH_OPENIMAGEIO)
     set(OIIO_DEBUG debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_d.lib debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util_d.lib)
     set(OPENIMAGEIO_LIBRARIES ${OIIO_OPTIMIZED} ${OIIO_DEBUG})
   endif()
+
   set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0")
   set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe")
   add_definitions(-DOIIO_STATIC_DEFINE)
@@ -620,7 +575,6 @@ if(WITH_LLVM)
     message(WARNING "LLVM debug libs not present on this system. Using release libs for debug builds.")
     set(LLVM_LIBRARY ${LLVM_LIBRARY_OPTIMIZED})
   endif()
-
 endif()
 
 if(WITH_OPENCOLORIO)
@@ -640,6 +594,7 @@ if(WITH_OPENCOLORIO)
       debug ${OPENCOLORIO_LIBPATH}/pystring_d.lib
     )
   endif()
+
   set(OPENCOLORIO_DEFINITIONS "-DOpenColorIO_SKIP_IMPORTS")
 endif()
 
@@ -649,24 +604,17 @@ if(WITH_OPENVDB)
     set(OPENVDB ${LIBDIR}/openVDB)
     set(OPENVDB_LIBPATH ${OPENVDB}/lib)
     set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include)
-    set(OPENVDB_LIBRARIES optimized ${OPENVDB_LIBPATH}/openvdb.lib debug ${OPENVDB_LIBPATH}/openvdb_d.lib )
+    set(OPENVDB_LIBRARIES optimized ${OPENVDB_LIBPATH}/openvdb.lib debug ${OPENVDB_LIBPATH}/openvdb_d.lib)
   endif()
+
   set(OPENVDB_DEFINITIONS -DNOMINMAX -D_USE_MATH_DEFINES)
 endif()
 
 if(WITH_NANOVDB)
-  set(NANOVDB ${LIBDIR}/openvdb)
+  set(NANOVDB ${LIBDIR}/nanoVDB)
   set(NANOVDB_INCLUDE_DIR ${NANOVDB}/include)
-  if(NOT EXISTS "${NANOVDB_INCLUDE_DIR}/nanovdb")
-    # When not found, could be an older lib folder with where nanovdb
-    # had its own lib folder, to ease the transition period, fall back
-    # to that copy if the copy in openvdb is not found.
-    set(NANOVDB ${LIBDIR}/nanoVDB)
-    set(NANOVDB_INCLUDE_DIR ${NANOVDB}/include)
-  endif()
 endif()
 
-
 if(WITH_OPENIMAGEDENOISE)
   set(OPENIMAGEDENOISE ${LIBDIR}/OpenImageDenoise)
   set(OPENIMAGEDENOISE_LIBPATH ${LIBDIR}/OpenImageDenoise/lib)
@@ -692,12 +640,7 @@ endif()
 
 if(WITH_IMAGE_OPENJPEG)
   set(OPENJPEG ${LIBDIR}/openjpeg)
-  set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include/openjpeg-2.4)
-  if(NOT EXISTS "${OPENJPEG_INCLUDE_DIRS}")
-    # when not found, could be an older lib folder with openjpeg 2.3
-    # to ease the transition period, fall back if 2.4 is not found.
-    set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include/openjpeg-2.3)
-  endif()
+  set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include/openjpeg-2.3)
   set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/openjp2.lib)
 endif()
 
@@ -840,16 +783,9 @@ if(WITH_USD)
   windows_find_package(USD)
   if(NOT USD_FOUND)
     set(USD_INCLUDE_DIRS ${LIBDIR}/usd/include)
-    set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/usd_usd_m.lib)
-    set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/usd_usd_m_d.lib)
+    set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/libusd_m.lib)
+    set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/libusd_m_d.lib)
     set(USD_LIBRARY_DIR ${LIBDIR}/usd/lib)
-    # Older USD had different filenames, if the new ones are
-    # not found see if the older ones exist, to ease the
-    # transition period while landing libs.
-    if(NOT EXISTS "${USD_RELEASE_LIB}")
-      set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/libusd_m.lib)
-      set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/libusd_m_d.lib)
-    endif()
     set(USD_LIBRARIES
       debug ${USD_DEBUG_LIB}
       optimized ${USD_RELEASE_LIB}

build_files/config/pipeline_config.yaml

@@ -5,38 +5,38 @@
 update-code:
     git:
         submodules:
-        -   branch: blender-v3.2-release
+        -   branch: master
             commit_id: HEAD
             path: release/scripts/addons
-        -   branch: blender-v3.2-release
+        -   branch: master
             commit_id: HEAD
             path: release/scripts/addons_contrib
-        -   branch: blender-v3.2-release
+        -   branch: master
             commit_id: HEAD
             path: release/datafiles/locale
-        -   branch: blender-v3.2-release
+        -   branch: master
             commit_id: HEAD
             path: source/tools
     svn:
         libraries:
             darwin-arm64:
-                branch: tags/blender-3.2-release
+                branch: trunk
                 commit_id: HEAD
                 path: lib/darwin_arm64
             darwin-x86_64:
-                branch: tags/blender-3.2-release
+                branch: trunk
                 commit_id: HEAD
                 path: lib/darwin
             linux-x86_64:
-                branch: tags/blender-3.2-release
+                branch: trunk
                 commit_id: HEAD
                 path: lib/linux_centos7_x86_64
             windows-amd64:
-                branch: tags/blender-3.2-release
+                branch: trunk
                 commit_id: HEAD
                 path: lib/win64_vc15
         tests:
-            branch: tags/blender-3.2-release
+            branch: trunk
             commit_id: HEAD
             path: lib/tests
         benchmarks:
@@ -54,8 +54,6 @@ buildbot:
         version: '10.1.243'
     cuda11:
         version: '11.4.1'
-    hip:
-        version: '5.0.20451'
     optix:
         version: '7.3.0'
     cmake:

build_files/windows/find_dependencies.cmd

@@ -3,10 +3,13 @@ for %%X in (svn.exe) do (set SVN=%%~$PATH:X)
 for %%X in (cmake.exe) do (set CMAKE=%%~$PATH:X)
 for %%X in (ctest.exe) do (set CTEST=%%~$PATH:X)
 for %%X in (git.exe) do (set GIT=%%~$PATH:X)
-REM For python, default on 310 but if that does not exist also check
-REM the 311, 312 and finally 39 folders to see if those are there, it checks
-REM this far ahead to ensure good lib folder compatibility in the future
-REM it falls back to 3.9 just incase it is a very old lib folder.
+REM For python, default on 39 but if that does not exist also check
+REM the 310,311 and 312 folders to see if those are there, it checks
+REM this far ahead to ensure good lib folder compatibility in the future.
+set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\39\bin\python.exe
+if EXIST %PYTHON% (
+	goto detect_python_done
+)
 set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\310\bin\python.exe
 if EXIST %PYTHON% (
 	goto detect_python_done
@@ -19,10 +22,6 @@ set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\312\bin\python.exe
 if EXIST %PYTHON% (
 	goto detect_python_done
 )
-set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\39\bin\python.exe
-if EXIST %PYTHON% (
-	goto detect_python_done
-)
 
 if NOT EXIST %PYTHON% (
     echo Warning: Python not found, there is likely an issue with the library folder

doc/blender_file_format/BlendFileDnaExporter_25.py

@@ -411,7 +411,7 @@ def main():
         # read blend header from blend file
         log.info("2: read file:")
 
-        if dir not in sys.path:
+        if not dir in sys.path:
             sys.path.append(dir)
         import BlendFileReader
 

doc/python_api/examples/bpy.types.Context.temp_override.1.py

@@ -10,7 +10,7 @@ Notes:
 
 - Temporary context overrides may be nested, when this is done, members will be added to the existing overrides.
 
-- Context members are restored outside the scope of the context-manager.
+- Context members are restored outside the scope of the context.
   The only exception to this is when the data is no longer available.
 
   In the event windowing data was removed (for example), the state of the context is left as-is.

doc/python_api/examples/bpy.types.Image.py

@@ -1,46 +0,0 @@
-"""
-Image Data
-++++++++++
-
-The Image data-block is a shallow wrapper around image or video file(s)
-(on disk, as packed data, or generated).
-
-All actual data like the pixel buffer, size, resolution etc. is
-cached in an :class:`imbuf.types.ImBuf` image buffer (or several buffers
-in some cases, like UDIM textures, multi-views, animations...).
-
-Several properties and functions of the Image data-block are then actually
-using/modifying its image buffer, and not the Image data-block itself.
-
-.. warning::
-
-   One key limitation is that image buffers are not shared between different
-   Image data-blocks, and they are not duplicated when copying an image.
-
-   So until a modified image buffer is saved on disk, duplicating its Image
-   data-block will not propagate the underlying buffer changes to the new Image.
-
-
-This example script generates an Image data-block with a given size,
-change its first pixel, rescale it, and duplicates the image.
-
-The duplicated image still has the same size and colors as the original image
-at its creation, all editing in the original image's buffer is 'lost' in its copy.
-"""
-
-import bpy
-
-image_src = bpy.data.images.new('src', 1024, 102)
-print(image_src.size)
-print(image_src.pixels[0:4])
-
-image_src.scale(1024, 720)
-image_src.pixels[0:4] = (0.5, 0.5, 0.5, 0.5)
-image_src.update()
-print(image_src.size)
-print(image_src.pixels[0:4])
-
-image_dest = image_src.copy()
-image_dest.update()
-print(image_dest.size)
-print(image_dest.pixels[0:4])

doc/python_api/examples/gpu.8.py

@@ -43,7 +43,7 @@ with offscreen.bind():
 offscreen.free()
 
 
-if IMAGE_NAME not in bpy.data.images:
+if not IMAGE_NAME in bpy.data.images:
     bpy.data.images.new(IMAGE_NAME, WIDTH, HEIGHT)
 image = bpy.data.images[IMAGE_NAME]
 image.scale(WIDTH, HEIGHT)

doc/python_api/rst/bgl.rst

@@ -4,12 +4,6 @@ OpenGL Wrapper (bgl)
 
 .. module:: bgl
 
-.. warning::
-
-   This module is deprecated and will be removed in a future release,
-   when OpenGL is replaced by Metal and Vulkan.
-   Use the graphics API independent :mod:`gpu` module instead.
-
 This module wraps OpenGL constants and functions, making them available from
 within Blender Python.
 

doc/python_api/sphinx_changelog_gen.py

@@ -3,111 +3,59 @@
 # <pep8 compliant>
 
 """
----------------
+Dump the python API into a text file so we can generate changelogs.
 
-Dump the python API into a JSON file, or generate changelogs from those JSON API dumps.
+output from this tool should be added into "doc/python_api/rst/change_log.rst"
 
-Typically, changelog output from this tool should be added into "doc/python_api/rst/change_log.rst"
+# dump api blender_version.py in CWD
+blender --background --python doc/python_api/sphinx_changelog_gen.py -- --dump
 
-API dump files are saved together with the generated API doc on the server, with a general index file.
-This way the changelog generation simply needs to re-download the previous version's dump for the diffing process.
-
----------------
-
-# Dump api blender_version.json in CWD:
-blender --background  --factory-startup --python doc/python_api/sphinx_changelog_gen.py -- \
-        --indexpath="path/to/api/docs/api_dump_index.json" \
-        dump --filepath-out="path/to/api/docs/<version>/api_dump.json"
-
-# Create changelog:
+# create changelog
 blender --background --factory-startup --python doc/python_api/sphinx_changelog_gen.py -- \
-        --indexpath="path/to/api/docs/api_dump_index.json" \
-        changelog --filepath-out doc/python_api/rst/change_log.rst
+        --api_from blender_2_63_0.py \
+        --api_to   blender_2_64_0.py \
+        --api_out changes.rst
 
-# Api comparison can also run without blender,
-# will by default generate changeloig between the last two available versions listed in the index,
-# unless input files are provided explicitely:
+
+# Api comparison can also run without blender
 python doc/python_api/sphinx_changelog_gen.py -- \
-        --indexpath="path/to/api/docs/api_dump_index.json" \
-        changelog --filepath-in-from blender_api_2_63_0.json \
-                  --filepath-in-to   blender_api_2_64_0.json \
-                  --filepath-out changes.rst
+        --api_from blender_api_2_63_0.py \
+        --api_to   blender_api_2_64_0.py \
+        --api_out changes.rst
 
---------------
-
-API dump index format:
-
-{[version_main, version_sub]: "<version>/api_dump.json", ...
-}
-
-API dump format:
-
-[
-    [version_main, vserion_sub, version_path],
-    {"module.name":
-        {"parent.class":
-            {"basic_type", "member_name":
-                ["Name", type, range, length, default, descr, f_args, f_arg_types, f_ret_types]}, ...
-        }, ...
-    }
-]
+# Save the latest API dump in this folder, renaming it with its revision.
+# This way the next person updating it doesn't need to build an old Blender only for that
 
 """
 
-import json
-import os
-
+# format
+'''
+{"module.name":
+    {"parent.class":
+        {"basic_type", "member_name":
+            ("Name", type, range, length, default, descr, f_args, f_arg_types, f_ret_types)}, ...
+    }, ...
+}
+'''
 
 api_names = "basic_type" "name", "type", "range", "length", "default", "descr", "f_args", "f_arg_types", "f_ret_types"
+
 API_BASIC_TYPE = 0
 API_F_ARGS = 7
 
 
-def api_version():
-    try:
-        import bpy
-    except:
-        return None, None
-    version = tuple(bpy.app.version[:2])
-    version_key = "%d.%d" % (version[0], version[1])
-    return version, version_key
+def api_dunp_fname():
+    import bpy
+    return "blender_api_%s.py" % "_".join([str(i) for i in bpy.app.version])
 
 
-def api_version_previous_in_index(index, version):
-    print("Searching for previous version to %s in %r" % (version, index))
-    version_prev = (version[0], version[1])
-    while True:
-        version_prev = (version_prev[0], version_prev[1] - 1)
-        if version_prev[1] < 0:
-            version_prev = (version_prev[0] - 1, 99)
-        if version_prev[0] < 0:
-            return None, None
-        version_prev_key = "%d.%d" % (version_prev[0], version_prev[1])
-        if version_prev_key in index:
-            print("Found previous version %s: %r" % (version_prev, index[version_prev_key]))
-            return version_prev, version_prev_key
-
-
-class JSONEncoderAPIDump(json.JSONEncoder):
-    def default(self, o):
-        if o is ...:
-            return "..."
-        if isinstance(o, set):
-            return tuple(o)
-        return json.JSONEncoder.default(self, o)
-
-
-def api_dump(args):
-    import rna_info
-    import inspect
-
-    version, version_key = api_version()
-    if version is None:
-        raise(ValueError("API dumps can only be generated from within Blender."))
-
+def api_dump():
     dump = {}
     dump_module = dump["bpy.types"] = {}
 
+    import rna_info
+    import inspect
+
     struct = rna_info.BuildRNAInfo()[0]
     for struct_id, struct_info in sorted(struct.items()):
 
@@ -209,25 +157,17 @@ def api_dump(args):
             )
         del funcs
 
-    filepath_out = args.filepath_out
-    with open(filepath_out, 'w', encoding='utf-8') as file_handle:
-        json.dump((version, dump), file_handle, cls=JSONEncoderAPIDump)
+    import pprint
 
-    indexpath = args.indexpath
-    rootpath = os.path.dirname(indexpath)
-    if os.path.exists(indexpath):
-        with open(indexpath, 'r', encoding='utf-8') as file_handle:
-            index = json.load(file_handle)
-    else:
-        index = {}
-    index[version_key] = os.path.relpath(filepath_out, rootpath)
-    with open(indexpath, 'w', encoding='utf-8') as file_handle:
-        json.dump(index, file_handle)
-
-    print("API version %s dumped into %r, and index %r has been updated" % (version_key, filepath_out, indexpath))
+    filename = api_dunp_fname()
+    filehandle = open(filename, 'w', encoding='utf-8')
+    tot = filehandle.write(pprint.pformat(dump, width=1))
+    filehandle.close()
+    print("%s, %d bytes written" % (filename, tot))
 
 
 def compare_props(a, b, fuzz=0.75):
+
     # must be same basic_type, function != property
     if a[0] != b[0]:
         return False
@@ -242,44 +182,15 @@ def compare_props(a, b, fuzz=0.75):
     return ((tot / totlen) >= fuzz)
 
 
-def api_changelog(args):
-    indexpath = args.indexpath
-    filepath_in_from = args.filepath_in_from
-    filepath_in_to = args.filepath_in_to
-    filepath_out = args.filepath_out
+def api_changelog(api_from, api_to, api_out):
 
-    rootpath = os.path.dirname(indexpath)
+    file_handle = open(api_from, 'r', encoding='utf-8')
+    dict_from = eval(file_handle.read())
+    file_handle.close()
 
-    version, version_key = api_version()
-    if version is None and (filepath_in_from is None or filepath_in_to is None):
-        raise(ValueError("API dumps files must be given when ran outside of Blender."))
-
-    with open(indexpath, 'r', encoding='utf-8') as file_handle:
-        index = json.load(file_handle)
-
-    if filepath_in_to == None:
-        filepath_in_to = index.get(version_key, None)
-    if filepath_in_to == None:
-        raise(ValueError("Cannot find API dump file for Blender version " + str(version) + " in index file."))
-
-    print("Found to file: %r" % filepath_in_to)
-
-    if filepath_in_from == None:
-        version_from, version_from_key = api_version_previous_in_index(index, version)
-        if version_from is None:
-            raise(ValueError("No previous version of Blender could be found in the index."))
-        filepath_in_from = index.get(version_from_key, None)
-    if filepath_in_from is None:
-        raise(ValueError("Cannot find API dump file for previous Blender version " + str(version_from) + " in index file."))
-
-    print("Found from file: %r" % filepath_in_from)
-
-    with open(os.path.join(rootpath, filepath_in_from), 'r', encoding='utf-8') as file_handle:
-        _, dict_from = json.load(file_handle)
-
-    with open(os.path.join(rootpath, filepath_in_to), 'r', encoding='utf-8') as file_handle:
-        dump_version, dict_to = json.load(file_handle)
-        assert(tuple(dump_version) == version)
+    file_handle = open(api_to, 'r', encoding='utf-8')
+    dict_to = eval(file_handle.read())
+    file_handle.close()
 
     api_changes = []
 
@@ -340,66 +251,63 @@ def api_changelog(args):
 
     # also document function argument changes
 
-    with open(filepath_out, 'w', encoding='utf-8') as fout:
-        fw = fout.write
+    fout = open(api_out, 'w', encoding='utf-8')
+    fw = fout.write
+    # print(api_changes)
 
-        # Write header.
-        fw(""
-           ":tocdepth: 2\n"
-           "\n"
-           "Blender API Change Log\n"
-           "**********************\n"
-           "\n"
-           ".. note, this document is auto generated by sphinx_changelog_gen.py\n"
-           "\n"
-           "\n"
-           "%s to %s\n"
-           "============\n"
-           "\n" % (version_from_key, version_key))
+    # :class:`bpy_struct.id_data`
 
-        def write_title(title, title_char):
-            fw("%s\n%s\n\n" % (title, title_char * len(title)))
+    def write_title(title, title_char):
+        fw("%s\n%s\n\n" % (title, title_char * len(title)))
 
-        for mod_id, class_id, props_moved, props_new, props_old, func_args in api_changes:
-            class_name = class_id.split(".")[-1]
-            title = mod_id + "." + class_name
-            write_title(title, "-")
+    for mod_id, class_id, props_moved, props_new, props_old, func_args in api_changes:
+        class_name = class_id.split(".")[-1]
+        title = mod_id + "." + class_name
+        write_title(title, "-")
 
-            if props_new:
-                write_title("Added", "^")
-                for prop_id in props_new:
-                    fw("* :class:`%s.%s.%s`\n" % (mod_id, class_name, prop_id))
-                fw("\n")
+        if props_new:
+            write_title("Added", "^")
+            for prop_id in props_new:
+                fw("* :class:`%s.%s.%s`\n" % (mod_id, class_name, prop_id))
+            fw("\n")
 
-            if props_old:
-                write_title("Removed", "^")
-                for prop_id in props_old:
-                    fw("* **%s**\n" % prop_id)  # can't link to removed docs
-                fw("\n")
+        if props_old:
+            write_title("Removed", "^")
+            for prop_id in props_old:
+                fw("* **%s**\n" % prop_id)  # can't link to removed docs
+            fw("\n")
 
-            if props_moved:
-                write_title("Renamed", "^")
-                for prop_id_old, prop_id in props_moved:
-                    fw("* **%s** -> :class:`%s.%s.%s`\n" % (prop_id_old, mod_id, class_name, prop_id))
-                fw("\n")
+        if props_moved:
+            write_title("Renamed", "^")
+            for prop_id_old, prop_id in props_moved:
+                fw("* **%s** -> :class:`%s.%s.%s`\n" % (prop_id_old, mod_id, class_name, prop_id))
+            fw("\n")
 
-            if func_args:
-                write_title("Function Arguments", "^")
-                for func_id, args_old, args_new in func_args:
-                    args_new = ", ".join(args_new)
-                    args_old = ", ".join(args_old)
-                    fw("* :class:`%s.%s.%s` (%s), *was (%s)*\n" % (mod_id, class_name, func_id, args_new, args_old))
-                fw("\n")
+        if func_args:
+            write_title("Function Arguments", "^")
+            for func_id, args_old, args_new in func_args:
+                args_new = ", ".join(args_new)
+                args_old = ", ".join(args_old)
+                fw("* :class:`%s.%s.%s` (%s), *was (%s)*\n" % (mod_id, class_name, func_id, args_new, args_old))
+            fw("\n")
 
-    print("Written: %r" % filepath_out)
+    fout.close()
+
+    print("Written: %r" % api_out)
 
 
-def main(argv=None):
+def main():
     import sys
-    import argparse
+    import os
 
-    if argv is None:
-        argv = sys.argv
+    try:
+        import argparse
+    except ImportError:
+        print("Old Blender, just dumping")
+        api_dump()
+        return
+
+    argv = sys.argv
 
     if "--" not in argv:
         argv = []  # as if no args are passed
@@ -410,39 +318,42 @@ def main(argv=None):
     usage_text = "Run blender in background mode with this script: "
     "blender --background --factory-startup --python %s -- [options]" % os.path.basename(__file__)
 
-    parser = argparse.ArgumentParser(description=usage_text,
-                                     epilog=__doc__,
-                                     formatter_class=argparse.RawDescriptionHelpFormatter)
+    epilog = "Run this before releases"
+
+    parser = argparse.ArgumentParser(description=usage_text, epilog=epilog)
+
     parser.add_argument(
-        "--indexpath", dest="indexpath", metavar='FILE', required=True,
-        help="Path of the JSON file containing the index of all available API dumps.")
+        "--dump", dest="dump", action='store_true',
+        help="When set the api will be dumped into blender_version.py")
 
-    parser_commands = parser.add_subparsers(required=True)
+    parser.add_argument(
+        "--api_from", dest="api_from", metavar='FILE',
+        help="File to compare from (previous version)")
+    parser.add_argument(
+        "--api_to", dest="api_to", metavar='FILE',
+        help="File to compare from (current)")
+    parser.add_argument(
+        "--api_out", dest="api_out", metavar='FILE',
+        help="Output sphinx changelog")
 
-    parser_dump = parser_commands.add_parser('dump', help="Dump the current Blender Python API into a JSON file.")
-    parser_dump.add_argument(
-        "--filepath-out", dest="filepath_out", metavar='FILE', required=True,
-        help="Path of the JSON file containing the dump of the API.")
-    parser_dump.set_defaults(func=api_dump)
+    args = parser.parse_args(argv)  # In this example we won't use the args
 
-    parser_changelog = parser_commands.add_parser('changelog', help="Generate the RST changelog page based on two Blender Python API JSON dumps.")
+    if not argv:
+        print("No args given!")
+        parser.print_help()
+        return
 
-    parser_changelog.add_argument(
-        "--filepath-in-from", dest="filepath_in_from", metavar='FILE', default=None,
-        help="JSON dump file to compare from (typically, previous version). "
-             "If not given, will be automatically determined from current Blender version and index file.")
-    parser_changelog.add_argument(
-        "--filepath-in-to", dest="filepath_in_to", metavar='FILE', default=None,
-        help="JSON dump file to compare to (typically, current version). "
-             "If not given, will be automatically determined from current Blender version and index file.")
-    parser_changelog.add_argument(
-        "--filepath-out", dest="filepath_out", metavar='FILE', required=True,
-        help="Output sphinx changelog RST file.")
-    parser_changelog.set_defaults(func=api_changelog)
+    if args.dump:
+        api_dump()
+    else:
+        if args.api_from and args.api_to and args.api_out:
+            api_changelog(args.api_from, args.api_to, args.api_out)
+        else:
+            print("Error: --api_from/api_to/api_out args needed")
+            parser.print_help()
+            return
 
-    args = parser.parse_args(argv)
-
-    args.func(args)
+    print("batch job finished, exiting")
 
 
 if __name__ == "__main__":

doc/python_api/sphinx_doc_gen.py

@@ -121,26 +121,6 @@ def handle_args():
                              "(default=False)",
                         required=False)
 
-    parser.add_argument(
-        "--api-changelog-generate",
-        dest="changelog",
-        default=False,
-        action='store_true',
-        help="Generate the API changelog RST file "
-        "(default=False, requires `--api-dump-index-path` parameter)",
-        required=False,
-    )
-
-    parser.add_argument(
-        "--api-dump-index-path",
-        dest="api_dump_index_path",
-        metavar='FILE',
-        default=None,
-        help="Path to the API dump index JSON file "
-        "(required when `--api-changelog-generate` is True)",
-        required=False,
-    )
-
     parser.add_argument("-o", "--output",
                         dest="output_dir",
                         type=str,
@@ -488,26 +468,6 @@ if ARGS.sphinx_build_pdf:
         sphinx_make_pdf_log = os.path.join(ARGS.output_dir, ".latex_make.log")
         SPHINX_MAKE_PDF_STDOUT = open(sphinx_make_pdf_log, "w", encoding="utf-8")
 
-
-# --------------------------------CHANGELOG GENERATION--------------------------------------
-
-def generate_changelog():
-    import importlib.util
-    spec = importlib.util.spec_from_file_location("sphinx_changelog_gen",
-                                                  os.path.abspath(os.path.join(SCRIPT_DIR, "sphinx_changelog_gen.py")))
-    sphinx_changelog_gen = importlib.util.module_from_spec(spec)
-    spec.loader.exec_module(sphinx_changelog_gen)
-
-    API_DUMP_INDEX_FILEPATH = ARGS.api_dump_index_path
-    API_DUMP_ROOT = os.path.dirname(API_DUMP_INDEX_FILEPATH)
-    API_DUMP_FILEPATH = os.path.abspath(os.path.join(API_DUMP_ROOT, BLENDER_VERSION_DOTS, "api_dump.json"))
-    API_CHANGELOG_FILEPATH = os.path.abspath(os.path.join(SPHINX_IN_TMP, "change_log.rst"))
-
-    sphinx_changelog_gen.main(("--", "--indexpath", API_DUMP_INDEX_FILEPATH, "dump", "--filepath-out", API_DUMP_FILEPATH))
-
-    sphinx_changelog_gen.main(("--", "--indexpath", API_DUMP_INDEX_FILEPATH, "changelog", "--filepath-out", API_CHANGELOG_FILEPATH))
-
-
 # --------------------------------API DUMP--------------------------------------
 
 # lame, python won't give some access
@@ -1514,12 +1474,6 @@ def pyrna2sphinx(basepath):
             pyprop2sphinx("   ", fw, identifier, py_prop)
         del py_properties, py_prop
 
-        # C/Python attributes: `GetSetDescriptorType`.
-        key = descr = None
-        for key, descr in sorted(struct.get_py_c_properties_getset()):
-            py_descr2sphinx("   ", fw, descr, "bpy.types", struct_id, key)
-        del key, descr
-
         for func in struct.functions:
             args_str = ", ".join(prop.get_arg_default(force=False) for prop in func.args)
 
@@ -2365,9 +2319,6 @@ def main():
 
     rna2sphinx(SPHINX_IN_TMP)
 
-    if ARGS.changelog:
-        generate_changelog()
-
     if ARGS.full_rebuild:
         # only for full updates
         shutil.rmtree(SPHINX_IN, True)

extern/audaspace/include/util/Buffer.h

@@ -34,7 +34,7 @@ class AUD_API Buffer
 {
 private:
 	/// The size of the buffer in bytes.
-	long long m_size;
+	int m_size;
 
 	/// The pointer to the buffer memory.
 	data_t* m_buffer;
@@ -48,7 +48,7 @@ public:
 	 * Creates a new buffer.
 	 * \param size The size of the buffer in bytes.
 	 */
-	Buffer(long long size = 0);
+	Buffer(int size = 0);
 
 	/**
 	 * Destroys the buffer.
@@ -63,7 +63,7 @@ public:
 	/**
 	 * Returns the size of the buffer in bytes.
 	 */
-	long long getSize() const;
+	int getSize() const;
 
 	/**
 	 * Resizes the buffer.
@@ -71,7 +71,7 @@ public:
 	 * \param keep Whether to keep the old data. If the new buffer is smaller,
 	 *        the data at the end will be lost.
 	 */
-	void resize(long long size, bool keep = false);
+	void resize(int size, bool keep = false);
 
 	/**
 	 * Makes sure the buffer has a minimum size.
@@ -81,7 +81,7 @@ public:
 	 * \param keep Whether to keep the old data. If the new buffer is smaller,
 	 *        the data at the end will be lost.
 	 */
-	void assureSize(long long size, bool keep = false);
+	void assureSize(int size, bool keep = false);
 };
 
 AUD_NAMESPACE_END

extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp

@@ -361,7 +361,7 @@ int FFMPEGReader::read_packet(void* opaque, uint8_t* buf, int buf_size)
 {
 	FFMPEGReader* reader = reinterpret_cast<FFMPEGReader*>(opaque);
 
-	long long size = std::min(static_cast<long long>(buf_size), reader->m_membuffer->getSize() - reader->m_membufferpos);
+	int size = std::min(buf_size, reader->m_membuffer->getSize() - reader->m_membufferpos);
 
 	if(size < 0)
 		return -1;

extern/audaspace/plugins/ffmpeg/FFMPEGReader.h

@@ -114,7 +114,7 @@ private:
 	/**
 	 * Reading position of the buffer.
 	 */
-	long long m_membufferpos;
+	int m_membufferpos;
 
 	/**
 	 * Whether the audio data has to be interleaved after reading.

extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp

@@ -23,9 +23,7 @@
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avio.h>
-#if LIBAVCODEC_VERSION_MAJOR >= 59
 #include <libavutil/channel_layout.h>
-#endif
 }
 
 AUD_NAMESPACE_BEGIN
@@ -400,7 +398,7 @@ FFMPEGWriter::FFMPEGWriter(std::string filename, DeviceSpecs specs, Container fo
 		m_specs.rate = m_codecCtx->sample_rate;
 
 #ifdef FFMPEG_OLD_CODE
-		m_codecCtx->codec_id = audio_codec;
+		m_codecCtx->codec_id = outputFmt->audio_codec;
 #endif
 
 		m_codecCtx->codec_type = AVMEDIA_TYPE_AUDIO;

extern/audaspace/src/util/Buffer.cpp

@@ -25,7 +25,7 @@
 
 AUD_NAMESPACE_BEGIN
 
-Buffer::Buffer(long long size)
+Buffer::Buffer(int size)
 {
 	m_size = size;
 	m_buffer = (data_t*) std::malloc(size + ALIGNMENT);
@@ -41,12 +41,12 @@ sample_t* Buffer::getBuffer() const
 	return (sample_t*) ALIGN(m_buffer);
 }
 
-long long Buffer::getSize() const
+int Buffer::getSize() const
 {
 	return m_size;
 }
 
-void Buffer::resize(long long size, bool keep)
+void Buffer::resize(int size, bool keep)
 {
 	if(keep)
 	{
@@ -63,7 +63,7 @@ void Buffer::resize(long long size, bool keep)
 	m_size = size;
 }
 
-void Buffer::assureSize(long long size, bool keep)
+void Buffer::assureSize(int size, bool keep)
 {
 	if(m_size < size)
 		resize(size, keep);

extern/audaspace/src/util/StreamBuffer.cpp

@@ -18,12 +18,8 @@
 #include "util/BufferReader.h"
 #include "util/Buffer.h"
 
-#include <algorithm>
-
 // 5 sec * 48000 samples/sec * 4 bytes/sample * 6 channels
 #define BUFFER_RESIZE_BYTES 5760000
-// 90 min * 60 sec/min * 48000 samples/sec * 4 bytes/sample * 2 channels
-#define MAXIMUM_INITIAL_BUFFER_SIZE_BYTES 2073600000
 
 AUD_NAMESPACE_BEGIN
 
@@ -36,15 +32,14 @@ StreamBuffer::StreamBuffer(std::shared_ptr<ISound> sound) :
 
 	int sample_size = AUD_SAMPLE_SIZE(m_specs);
 	int length;
-	long long index = 0;
+	int index = 0;
 	bool eos = false;
 
 	// get an approximated size if possible
-	long long size = std::min(reader->getLength(), MAXIMUM_INITIAL_BUFFER_SIZE_BYTES / sample_size);
-	long long size_increase = BUFFER_RESIZE_BYTES / sample_size;
+	int size = reader->getLength();
 
 	if(size <= 0)
-		size = size_increase;
+		size = BUFFER_RESIZE_BYTES / sample_size;
 	else
 		size += m_specs.rate;
 
@@ -52,16 +47,13 @@ StreamBuffer::StreamBuffer(std::shared_ptr<ISound> sound) :
 	while(!eos)
 	{
 		// increase
-		m_buffer->resize(static_cast<long long>(size) * sample_size, true);
+		m_buffer->resize(size*sample_size, true);
 
 		// read more
 		length = size-index;
 		reader->read(length, eos, m_buffer->getBuffer() + index * m_specs.channels);
 		if(index == m_buffer->getSize() / sample_size)
-		{
-			size += size_increase;
-			size_increase <<= 1;
-		}
+			size += BUFFER_RESIZE_BYTES / sample_size;
 		index += length;
 	}
 

extern/mantaflow/CMakeLists.txt

@@ -259,10 +259,3 @@ set(LIB
 )
 
 blender_add_lib(extern_mantaflow "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
-
-# The VDB libs above are only added to as INTERFACE libs by blender_add_lib,
-# meaning extern_mantaflow itself actually does not have a dependency on the
-# openvdb libraries, and CMAKE is free to link the vdb libs before
-# extern_mantaflow causing linker errors on linux. By explicitly declaring
-# a dependency here, cmake will do the right thing.
-target_link_libraries(extern_mantaflow PRIVATE ${OPENVDB_LIBRARIES})

intern/cycles/CMakeLists.txt

@@ -18,10 +18,8 @@ endif()
 
 # External Libraries
 
-if(NOT CYCLES_STANDALONE_REPOSITORY)
-  include(cmake/external_libs.cmake)
-  include(cmake/macros.cmake)
-endif()
+include(cmake/external_libs.cmake)
+include(cmake/macros.cmake)
 
 # Build Flags
 # todo: this code could be refactored a bit to avoid duplication
@@ -223,6 +221,7 @@ include_directories(
   ${OPENIMAGEIO_INCLUDE_DIRS}
   ${OPENEXR_INCLUDE_DIRS}
   ${PUGIXML_INCLUDE_DIR}
+  ${TBB_INCLUDE_DIRS}
 )
 
 if(WITH_CYCLES_DEBUG)
@@ -271,6 +270,22 @@ if(WITH_CYCLES_EMBREE)
   )
 endif()
 
+if(WITH_NANOVDB)
+  add_definitions(-DWITH_NANOVDB)
+  include_directories(
+    SYSTEM
+    ${NANOVDB_INCLUDE_DIR}
+  )
+endif()
+
+if(WITH_OPENSUBDIV)
+  add_definitions(-DWITH_OPENSUBDIV)
+  include_directories(
+    SYSTEM
+    ${OPENSUBDIV_INCLUDE_DIRS}
+  )
+endif()
+
 if(WITH_OPENIMAGEDENOISE)
   add_definitions(-DWITH_OPENIMAGEDENOISE)
   include_directories(
@@ -291,53 +306,6 @@ if(WITH_CYCLES_LOGGING)
   )
 endif()
 
-if(WITH_ALEMBIC)
-  add_definitions(-DWITH_ALEMBIC)
-  include_directories(
-    SYSTEM
-    ${ALEMBIC_INCLUDE_DIRS}
-  )
-endif()
-
-# Includes that might be overrides by USD last, to avoid compiling
-# against the wrong versions of other libraries.
-include_directories(
-  SYSTEM
-  ${TBB_INCLUDE_DIRS}
-)
-
-if(WITH_OPENVDB)
-  add_definitions(-DWITH_OPENVDB ${OPENVDB_DEFINITIONS})
-  include_directories(
-    SYSTEM
-    ${OPENVDB_INCLUDE_DIRS}
-  )
-endif()
-
-if(WITH_NANOVDB)
-  add_definitions(-DWITH_NANOVDB)
-  include_directories(
-    SYSTEM
-    ${NANOVDB_INCLUDE_DIR}
-  )
-endif()
-
-if(WITH_OPENSUBDIV)
-  add_definitions(-DWITH_OPENSUBDIV)
-  include_directories(
-    SYSTEM
-    ${OPENSUBDIV_INCLUDE_DIRS}
-  )
-endif()
-
-if(WITH_OPENCOLORIO)
-  add_definitions(-DWITH_OCIO)
-  include_directories(
-    SYSTEM
-    ${OPENCOLORIO_INCLUDE_DIRS}
-  )
-endif()
-
 # NaN debugging
 if(WITH_CYCLES_DEBUG_NAN)
   add_definitions(-DWITH_CYCLES_DEBUG_NAN)
@@ -355,7 +323,11 @@ endif()
 
 # Warnings
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+  ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
+  ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion")
   ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros")
+  unset(_has_cxxflag_float_conversion)
+  unset(_has_cxxflag_double_promotion)
   unset(_has_no_error_unused_macros)
 endif()
 
@@ -427,7 +399,7 @@ if(WITH_GTESTS)
   add_subdirectory(test)
 endif()
 
-if(WITH_CYCLES_HYDRA_RENDER_DELEGATE OR (WITH_CYCLES_STANDALONE AND WITH_USD))
+if(WITH_CYCLES_HYDRA_RENDER_DELEGATE)
   add_subdirectory(hydra)
 endif()
 

intern/cycles/app/CMakeLists.txt

@@ -83,6 +83,13 @@ if(WITH_CYCLES_STANDALONE)
   target_link_libraries(cycles PRIVATE ${LIB})
 
   if(APPLE)
+    if(WITH_OPENCOLORIO)
+      set_property(TARGET cycles APPEND_STRING PROPERTY LINK_FLAGS " -framework IOKit -framework Carbon")
+    endif()
+    if(WITH_OPENIMAGEDENOISE AND "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
+      # OpenImageDenoise uses BNNS from the Accelerate framework.
+      set_property(TARGET cycles APPEND_STRING PROPERTY LINK_FLAGS " -framework Accelerate")
+    endif()
     if(WITH_CYCLES_STANDALONE_GUI)
       set_property(TARGET cycles APPEND_STRING PROPERTY LINK_FLAGS
         " -framework Cocoa -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework ForceFeedback -framework CoreVideo")
@@ -96,10 +103,6 @@ if(WITH_CYCLES_STANDALONE)
   if(CYCLES_STANDALONE_REPOSITORY)
     cycles_install_libraries(cycles)
   endif()
-
-  install(PROGRAMS
-    $<TARGET_FILE:cycles>
-    DESTINATION ${CMAKE_INSTALL_PREFIX})
 endif()
 
 #####################################################################

intern/cycles/app/cycles_server.cpp

@@ -0,0 +1,109 @@
+/* SPDX-License-Identifier: Apache-2.0
+ * Copyright 2011-2022 Blender Foundation */
+
+#include <stdio.h>
+
+#include "device/device.h"
+
+#include "util/args.h"
+#include "util/foreach.h"
+#include "util/log.h"
+#include "util/path.h"
+#include "util/stats.h"
+#include "util/string.h"
+#include "util/task.h"
+
+using namespace ccl;
+
+int main(int argc, const char **argv)
+{
+  util_logging_init(argv[0]);
+  path_init();
+
+  /* device types */
+  string devicelist = "";
+  string devicename = "cpu";
+  bool list = false, debug = false;
+  int threads = 0, verbosity = 1;
+
+  vector<DeviceType> &types = Device::available_types();
+
+  foreach (DeviceType type, types) {
+    if (devicelist != "")
+      devicelist += ", ";
+
+    devicelist += Device::string_from_type(type);
+  }
+
+  /* parse options */
+  ArgParse ap;
+
+  ap.options("Usage: cycles_server [options]",
+             "--device %s",
+             &devicename,
+             ("Devices to use: " + devicelist).c_str(),
+             "--list-devices",
+             &list,
+             "List information about all available devices",
+             "--threads %d",
+             &threads,
+             "Number of threads to use for CPU device",
+#ifdef WITH_CYCLES_LOGGING
+             "--debug",
+             &debug,
+             "Enable debug logging",
+             "--verbose %d",
+             &verbosity,
+             "Set verbosity of the logger",
+#endif
+             NULL);
+
+  if (ap.parse(argc, argv) < 0) {
+    fprintf(stderr, "%s\n", ap.geterror().c_str());
+    ap.usage();
+    exit(EXIT_FAILURE);
+  }
+
+  if (debug) {
+    util_logging_start();
+    util_logging_verbosity_set(verbosity);
+  }
+
+  if (list) {
+    vector<DeviceInfo> &devices = Device::available_devices();
+
+    printf("Devices:\n");
+
+    foreach (DeviceInfo &info, devices) {
+      printf("    %s%s\n", info.description.c_str(), (info.display_device) ? " (display)" : "");
+    }
+
+    exit(EXIT_SUCCESS);
+  }
+
+  /* find matching device */
+  DeviceType device_type = Device::type_from_string(devicename.c_str());
+  vector<DeviceInfo> &devices = Device::available_devices();
+  DeviceInfo device_info;
+
+  foreach (DeviceInfo &device, devices) {
+    if (device_type == device.type) {
+      device_info = device;
+      break;
+    }
+  }
+
+  TaskScheduler::init(threads);
+
+  while (1) {
+    Stats stats;
+    Device *device = Device::create(device_info, stats, true);
+    printf("Cycles Server with device: %s\n", device->info.description.c_str());
+    device->server_run();
+    delete device;
+  }
+
+  TaskScheduler::exit();
+
+  return 0;
+}

intern/cycles/app/cycles_standalone.cpp

@@ -23,10 +23,6 @@
 #include "util/unique_ptr.h"
 #include "util/version.h"
 
-#ifdef WITH_USD
-#  include "hydra/file_reader.h"
-#endif
-
 #include "app/cycles_xml.h"
 #include "app/oiio_output_driver.h"
 
@@ -98,16 +94,8 @@ static void scene_init()
 {
   options.scene = options.session->scene;
 
-  /* Read XML or USD */
-#ifdef WITH_USD
-  if (!string_endswith(string_to_lower(options.filepath), ".xml")) {
-    HD_CYCLES_NS::HdCyclesFileReader::read(options.session, options.filepath.c_str());
-  }
-  else
-#endif
-  {
-    xml_read_file(options.scene, options.filepath.c_str());
-  }
+  /* Read XML */
+  xml_read_file(options.scene, options.filepath.c_str());
 
   /* Camera width/height override? */
   if (!(options.width == 0 || options.height == 0)) {
@@ -381,7 +369,7 @@ static void options_parse(int argc, const char **argv)
 
   /* parse options */
   ArgParse ap;
-  bool help = false, profile = false, debug = false, version = false;
+  bool help = false, debug = false, version = false;
   int verbosity = 1;
 
   ap.options("Usage: cycles [options] file.xml",
@@ -423,9 +411,6 @@ static void options_parse(int argc, const char **argv)
              "--list-devices",
              &list,
              "List information about all available devices",
-             "--profile",
-             &profile,
-             "Enable profile logging",
 #ifdef WITH_CYCLES_LOGGING
              "--debug",
              &debug,
@@ -475,8 +460,6 @@ static void options_parse(int argc, const char **argv)
     exit(EXIT_SUCCESS);
   }
 
-  options.session_params.use_profiling = profile;
-
   if (ssname == "osl")
     options.scene_params.shadingsystem = SHADINGSYSTEM_OSL;
   else if (ssname == "svm")

intern/cycles/blender/addon/properties.py

@@ -589,6 +589,17 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
         default=0.1,
     )
 
+    # Really annoyingly, we have to keep it around for a few releases,
+    # otherwise forward compatibility breaks in really bad manner: CRASH!
+    #
+    # TODO(sergey): Remove this during 2.8x series of Blender.
+    filter_type: EnumProperty(
+        name="Filter Type",
+        description="Pixel filter type",
+        items=enum_filter_types,
+        default='BLACKMAN_HARRIS',
+    )
+
     pixel_filter_type: EnumProperty(
         name="Filter Type",
         description="Pixel filter type",
@@ -1505,12 +1516,9 @@ class CyclesPreferences(bpy.types.AddonPreferences):
                 col.label(text="and NVIDIA driver version 470 or newer", icon='BLANK1')
             elif device_type == 'HIP':
                 import sys
+                col.label(text="Requires discrete AMD GPU with RDNA architecture", icon='BLANK1')
                 if sys.platform[:3] == "win":
-                    col.label(text="Requires discrete AMD GPU with RDNA architecture", icon='BLANK1')
                     col.label(text="and AMD Radeon Pro 21.Q4 driver or newer", icon='BLANK1')
-                elif sys.platform.startswith("linux"):
-                    col.label(text="Requires discrete AMD GPU with RDNA architecture", icon='BLANK1')
-                    col.label(text="and AMD driver version 22.10 or newer", icon='BLANK1')
             elif device_type == 'METAL':
                 col.label(text="Requires Apple Silicon with macOS 12.2 or newer", icon='BLANK1')
                 col.label(text="or AMD with macOS 12.3 or newer", icon='BLANK1')

intern/cycles/blender/addon/ui.py

@@ -1446,10 +1446,28 @@ class CYCLES_WORLD_PT_surface(CyclesButtonsPanel, Panel):
         layout.use_property_split = True
 
         world = context.world
+        view_layer = context.view_layer
 
         if not panel_node_draw(layout, world, 'OUTPUT_WORLD', 'Surface'):
             layout.prop(world, "color")
 
+        row = layout.row(align=True)
+        row.use_property_decorate = False
+
+        sub = row.column(align=True)
+        sub.prop_search(
+            world,
+            "lightgroup",
+            view_layer,
+            "lightgroups",
+            text="Light Group",
+            results_are_suggestions=True,
+        )
+
+        sub = row.column(align=True)
+        sub.active = bool(world.lightgroup) and not any(lg.name == world.lightgroup for lg in view_layer.lightgroups)
+        sub.operator("scene.view_layer_add_lightgroup", icon='ADD', text="").name = world.lightgroup
+
 
 class CYCLES_WORLD_PT_volume(CyclesButtonsPanel, Panel):
     bl_label = "Volume"
@@ -1598,40 +1616,6 @@ class CYCLES_WORLD_PT_settings_volume(CyclesButtonsPanel, Panel):
         sub.prop(cworld, "volume_step_size")
 
 
-class CYCLES_WORLD_PT_settings_light_group(CyclesButtonsPanel, Panel):
-    bl_label = "Light Group"
-    bl_parent_id = "CYCLES_WORLD_PT_settings"
-    bl_context = "world"
-
-    @classmethod
-    def poll(cls, context):
-        return context.world and CyclesButtonsPanel.poll(context)
-
-    def draw(self, context):
-        layout = self.layout
-        layout.use_property_split = True
-        layout.use_property_decorate = False
-
-        world = context.world
-        view_layer = context.view_layer
-
-        row = layout.row(align=True)
-
-        sub = row.column(align=True)
-        sub.prop_search(
-            world,
-            "lightgroup",
-            view_layer,
-            "lightgroups",
-            text="Light Group",
-            results_are_suggestions=True,
-        )
-
-        sub = row.column(align=True)
-        sub.active = bool(world.lightgroup) and not any(lg.name == world.lightgroup for lg in view_layer.lightgroups)
-        sub.operator("scene.view_layer_add_lightgroup", icon='ADD', text="").name = world.lightgroup
-
-
 class CYCLES_MATERIAL_PT_preview(CyclesButtonsPanel, Panel):
     bl_label = "Preview"
     bl_context = "material"
@@ -2324,7 +2308,6 @@ classes = (
     CYCLES_WORLD_PT_settings,
     CYCLES_WORLD_PT_settings_surface,
     CYCLES_WORLD_PT_settings_volume,
-    CYCLES_WORLD_PT_settings_light_group,
     CYCLES_MATERIAL_PT_preview,
     CYCLES_MATERIAL_PT_surface,
     CYCLES_MATERIAL_PT_volume,

intern/cycles/blender/addon/version_update.py

@@ -155,17 +155,16 @@ def do_versions(self):
                     cscene.preview_samples = 10
 
                 # Filter
-                if cscene.get("filter_type", -1) == -1:
+                if not cscene.is_property_set("filter_type"):
                     cscene.pixel_filter_type = 'GAUSSIAN'
 
             if version <= (2, 76, 10):
                 cscene = scene.cycles
-                if not cscene.is_property_set("pixel_filter_type"):
-                    filter_type_int = cscene.get("filter_type", -1)
-                    if filter_type_int == 0:
-                        cscene.pixel_filter_type = 'BOX'
-                    elif filter_type_int == 1:
-                        cscene.pixel_filter_type = 'GAUSSIAN'
+                if cscene.is_property_set("filter_type"):
+                    if not cscene.is_property_set("pixel_filter_type"):
+                        cscene.pixel_filter_type = cscene.filter_type
+                    if cscene.filter_type == 'BLACKMAN_HARRIS':
+                        cscene.filter_type = 'GAUSSIAN'
 
             if version <= (2, 78, 2):
                 cscene = scene.cycles

intern/cycles/blender/mesh.cpp

@@ -267,82 +267,64 @@ static void mikk_compute_tangents(
   genTangSpaceDefault(&context);
 }
 
+/* Create sculpt vertex color attributes. */
+static void attr_create_sculpt_vertex_color(Scene *scene,
+                                            Mesh *mesh,
+                                            BL::Mesh &b_mesh,
+                                            bool subdivision)
+{
+  for (BL::MeshVertColorLayer &l : b_mesh.sculpt_vertex_colors) {
+    const bool active_render = l.active_render();
+    AttributeStandard vcol_std = (active_render) ? ATTR_STD_VERTEX_COLOR : ATTR_STD_NONE;
+    ustring vcol_name = ustring(l.name().c_str());
+
+    const bool need_vcol = mesh->need_attribute(scene, vcol_name) ||
+                           mesh->need_attribute(scene, vcol_std);
+
+    if (!need_vcol) {
+      continue;
+    }
+
+    AttributeSet &attributes = (subdivision) ? mesh->subd_attributes : mesh->attributes;
+    Attribute *vcol_attr = attributes.add(vcol_name, TypeRGBA, ATTR_ELEMENT_VERTEX);
+    vcol_attr->std = vcol_std;
+
+    float4 *cdata = vcol_attr->data_float4();
+    int numverts = b_mesh.vertices.length();
+
+    for (int i = 0; i < numverts; i++) {
+      *(cdata++) = get_float4(l.data[i].color());
+    }
+  }
+}
+
 template<typename TypeInCycles, typename GetValueAtIndex>
 static void fill_generic_attribute(BL::Mesh &b_mesh,
                                    TypeInCycles *data,
-                                   const BL::Attribute::domain_enum b_domain,
-                                   const bool subdivision,
+                                   const AttributeElement element,
                                    const GetValueAtIndex &get_value_at_index)
 {
-  switch (b_domain) {
-    case BL::Attribute::domain_CORNER: {
-      if (subdivision) {
-        for (BL::MeshPolygon &p : b_mesh.polygons) {
-          int n = p.loop_total();
-          for (int i = 0; i < n; i++) {
-            *data = get_value_at_index(p.loop_start() + i);
-            data++;
-          }
-        }
-      }
-      else {
-        for (BL::MeshLoopTriangle &t : b_mesh.loop_triangles) {
-          const int index = t.index() * 3;
-          BL::Array<int, 3> loops = t.loops();
-          data[index] = get_value_at_index(loops[0]);
-          data[index + 1] = get_value_at_index(loops[1]);
-          data[index + 2] = get_value_at_index(loops[2]);
-        }
+  switch (element) {
+    case ATTR_ELEMENT_CORNER: {
+      for (BL::MeshLoopTriangle &t : b_mesh.loop_triangles) {
+        const int index = t.index() * 3;
+        BL::Array<int, 3> loops = t.loops();
+        data[index] = get_value_at_index(loops[0]);
+        data[index + 1] = get_value_at_index(loops[1]);
+        data[index + 2] = get_value_at_index(loops[2]);
       }
       break;
     }
-    case BL::Attribute::domain_EDGE: {
-      if constexpr (std::is_same_v<TypeInCycles, uchar4>) {
-        /* uchar4 edge attributes do not exist, and averaging in place
-         * would not work. */
-        assert(0);
-      }
-      else {
-        /* Averge edge attributes at vertices. */
-        const size_t num_verts = b_mesh.vertices.length();
-        vector<int> count(num_verts, 0);
-
-        for (BL::MeshEdge &e : b_mesh.edges) {
-          BL::Array<int, 2> vertices = e.vertices();
-          TypeInCycles value = get_value_at_index(e.index());
-
-          data[vertices[0]] += value;
-          data[vertices[1]] += value;
-          count[vertices[0]]++;
-          count[vertices[1]]++;
-        }
-
-        for (size_t i = 0; i < num_verts; i++) {
-          if (count[i] > 1) {
-            data[i] /= (float)count[i];
-          }
-        }
-      }
-      break;
-    }
-    case BL::Attribute::domain_POINT: {
+    case ATTR_ELEMENT_VERTEX: {
       const int num_verts = b_mesh.vertices.length();
       for (int i = 0; i < num_verts; i++) {
         data[i] = get_value_at_index(i);
       }
       break;
     }
-    case BL::Attribute::domain_FACE: {
-      if (subdivision) {
-        const int num_polygons = b_mesh.polygons.length();
-        for (int i = 0; i < num_polygons; i++) {
-          data[i] = get_value_at_index(i);
-        }
-      }
-      else {
-        for (BL::MeshLoopTriangle &t : b_mesh.loop_triangles) {
-          data[t.index()] = get_value_at_index(t.polygon_index());
-        }
+    case ATTR_ELEMENT_FACE: {
+      for (BL::MeshLoopTriangle &t : b_mesh.loop_triangles) {
+        data[t.index()] = get_value_at_index(t.polygon_index());
       }
       break;
     }
@@ -390,22 +372,21 @@ static void attr_create_generic(Scene *scene,
                                 const bool need_motion,
                                 const float motion_scale)
 {
-  AttributeSet &attributes = (subdivision) ? mesh->subd_attributes : mesh->attributes;
+  if (subdivision) {
+    /* TODO: Handle subdivision correctly. */
+    return;
+  }
+  AttributeSet &attributes = mesh->attributes;
   static const ustring u_velocity("velocity");
 
-  int attribute_index = 0;
-  int render_color_index = b_mesh.attributes.render_color_index();
-
   for (BL::Attribute &b_attribute : b_mesh.attributes) {
     const ustring name{b_attribute.name().c_str()};
-    const bool is_render_color = (attribute_index++ == render_color_index);
 
     if (need_motion && name == u_velocity) {
       attr_create_motion(mesh, b_attribute, motion_scale);
     }
 
-    if (!(mesh->need_attribute(scene, name) ||
-          (is_render_color && mesh->need_attribute(scene, ATTR_STD_VERTEX_COLOR)))) {
+    if (!mesh->need_attribute(scene, name)) {
       continue;
     }
     if (attributes.find(name)) {
@@ -423,9 +404,6 @@ static void attr_create_generic(Scene *scene,
       case BL::Attribute::domain_POINT:
         element = ATTR_ELEMENT_VERTEX;
         break;
-      case BL::Attribute::domain_EDGE:
-        element = ATTR_ELEMENT_VERTEX;
-        break;
       case BL::Attribute::domain_FACE:
         element = ATTR_ELEMENT_FACE;
         break;
@@ -441,77 +419,41 @@ static void attr_create_generic(Scene *scene,
         BL::FloatAttribute b_float_attribute{b_attribute};
         Attribute *attr = attributes.add(name, TypeFloat, element);
         float *data = attr->data_float();
-        fill_generic_attribute(b_mesh, data, b_domain, subdivision, [&](int i) {
-          return b_float_attribute.data[i].value();
-        });
+        fill_generic_attribute(
+            b_mesh, data, element, [&](int i) { return b_float_attribute.data[i].value(); });
         break;
       }
       case BL::Attribute::data_type_BOOLEAN: {
         BL::BoolAttribute b_bool_attribute{b_attribute};
         Attribute *attr = attributes.add(name, TypeFloat, element);
         float *data = attr->data_float();
-        fill_generic_attribute(b_mesh, data, b_domain, subdivision, [&](int i) {
-          return (float)b_bool_attribute.data[i].value();
-        });
+        fill_generic_attribute(
+            b_mesh, data, element, [&](int i) { return (float)b_bool_attribute.data[i].value(); });
         break;
       }
       case BL::Attribute::data_type_INT: {
         BL::IntAttribute b_int_attribute{b_attribute};
         Attribute *attr = attributes.add(name, TypeFloat, element);
         float *data = attr->data_float();
-        fill_generic_attribute(b_mesh, data, b_domain, subdivision, [&](int i) {
-          return (float)b_int_attribute.data[i].value();
-        });
+        fill_generic_attribute(
+            b_mesh, data, element, [&](int i) { return (float)b_int_attribute.data[i].value(); });
         break;
       }
       case BL::Attribute::data_type_FLOAT_VECTOR: {
         BL::FloatVectorAttribute b_vector_attribute{b_attribute};
         Attribute *attr = attributes.add(name, TypeVector, element);
         float3 *data = attr->data_float3();
-        fill_generic_attribute(b_mesh, data, b_domain, subdivision, [&](int i) {
+        fill_generic_attribute(b_mesh, data, element, [&](int i) {
           BL::Array<float, 3> v = b_vector_attribute.data[i].vector();
           return make_float3(v[0], v[1], v[2]);
         });
         break;
       }
-      case BL::Attribute::data_type_BYTE_COLOR: {
-        BL::ByteColorAttribute b_color_attribute{b_attribute};
-
-        if (element == ATTR_ELEMENT_CORNER) {
-          element = ATTR_ELEMENT_CORNER_BYTE;
-        }
-        Attribute *attr = attributes.add(name, TypeRGBA, element);
-        if (is_render_color) {
-          attr->std = ATTR_STD_VERTEX_COLOR;
-        }
-
-        if (element == ATTR_ELEMENT_CORNER_BYTE) {
-          uchar4 *data = attr->data_uchar4();
-          fill_generic_attribute(b_mesh, data, b_domain, subdivision, [&](int i) {
-            /* Compress/encode vertex color using the sRGB curve. */
-            const float4 c = get_float4(b_color_attribute.data[i].color());
-            return color_float4_to_uchar4(color_linear_to_srgb_v4(c));
-          });
-        }
-        else {
-          float4 *data = attr->data_float4();
-          fill_generic_attribute(b_mesh, data, b_domain, subdivision, [&](int i) {
-            BL::Array<float, 4> v = b_color_attribute.data[i].color();
-            return make_float4(v[0], v[1], v[2], v[3]);
-          });
-        }
-        break;
-      }
       case BL::Attribute::data_type_FLOAT_COLOR: {
         BL::FloatColorAttribute b_color_attribute{b_attribute};
-
         Attribute *attr = attributes.add(name, TypeRGBA, element);
-        if (is_render_color) {
-          attr->std = ATTR_STD_VERTEX_COLOR;
-        }
-
         float4 *data = attr->data_float4();
-        fill_generic_attribute(b_mesh, data, b_domain, subdivision, [&](int i) {
+        fill_generic_attribute(b_mesh, data, element, [&](int i) {
           BL::Array<float, 4> v = b_color_attribute.data[i].color();
           return make_float4(v[0], v[1], v[2], v[3]);
         });
@@ -521,7 +463,7 @@ static void attr_create_generic(Scene *scene,
         BL::Float2Attribute b_float2_attribute{b_attribute};
         Attribute *attr = attributes.add(name, TypeFloat2, element);
         float2 *data = attr->data_float2();
-        fill_generic_attribute(b_mesh, data, b_domain, subdivision, [&](int i) {
+        fill_generic_attribute(b_mesh, data, element, [&](int i) {
           BL::Array<float, 2> v = b_float2_attribute.data[i].vector();
           return make_float2(v[0], v[1]);
         });
@@ -534,6 +476,69 @@ static void attr_create_generic(Scene *scene,
   }
 }
 
+/* Create vertex color attributes. */
+static void attr_create_vertex_color(Scene *scene, Mesh *mesh, BL::Mesh &b_mesh, bool subdivision)
+{
+  for (BL::MeshLoopColorLayer &l : b_mesh.vertex_colors) {
+    const bool active_render = l.active_render();
+    AttributeStandard vcol_std = (active_render) ? ATTR_STD_VERTEX_COLOR : ATTR_STD_NONE;
+    ustring vcol_name = ustring(l.name().c_str());
+
+    const bool need_vcol = mesh->need_attribute(scene, vcol_name) ||
+                           mesh->need_attribute(scene, vcol_std);
+
+    if (!need_vcol) {
+      continue;
+    }
+
+    Attribute *vcol_attr = NULL;
+
+    if (subdivision) {
+      if (active_render) {
+        vcol_attr = mesh->subd_attributes.add(vcol_std, vcol_name);
+      }
+      else {
+        vcol_attr = mesh->subd_attributes.add(vcol_name, TypeRGBA, ATTR_ELEMENT_CORNER_BYTE);
+      }
+
+      uchar4 *cdata = vcol_attr->data_uchar4();
+
+      for (BL::MeshPolygon &p : b_mesh.polygons) {
+        int n = p.loop_total();
+        for (int i = 0; i < n; i++) {
+          float4 color = get_float4(l.data[p.loop_start() + i].color());
+          /* Compress/encode vertex color using the sRGB curve. */
+          *(cdata++) = color_float4_to_uchar4(color);
+        }
+      }
+    }
+    else {
+      if (active_render) {
+        vcol_attr = mesh->attributes.add(vcol_std, vcol_name);
+      }
+      else {
+        vcol_attr = mesh->attributes.add(vcol_name, TypeRGBA, ATTR_ELEMENT_CORNER_BYTE);
+      }
+
+      uchar4 *cdata = vcol_attr->data_uchar4();
+
+      for (BL::MeshLoopTriangle &t : b_mesh.loop_triangles) {
+        int3 li = get_int3(t.loops());
+        float4 c1 = get_float4(l.data[li[0]].color());
+        float4 c2 = get_float4(l.data[li[1]].color());
+        float4 c3 = get_float4(l.data[li[2]].color());
+
+        /* Compress/encode vertex color using the sRGB curve. */
+        cdata[0] = color_float4_to_uchar4(c1);
+        cdata[1] = color_float4_to_uchar4(c2);
+        cdata[2] = color_float4_to_uchar4(c3);
+
+        cdata += 3;
+      }
+    }
+  }
+}
+
 /* Create uv map attributes. */
 static void attr_create_uv_map(Scene *scene, Mesh *mesh, BL::Mesh &b_mesh)
 {
@@ -997,6 +1002,8 @@ static void create_mesh(Scene *scene,
    * The calculate functions will check whether they're needed or not.
    */
   attr_create_pointiness(scene, mesh, b_mesh, subdivision);
+  attr_create_vertex_color(scene, mesh, b_mesh, subdivision);
+  attr_create_sculpt_vertex_color(scene, mesh, b_mesh, subdivision);
   attr_create_random_per_island(scene, mesh, b_mesh, subdivision);
   attr_create_generic(scene, mesh, b_mesh, subdivision, need_motion, motion_scale);
 

intern/cycles/blender/session.cpp

@@ -508,139 +508,87 @@ void BlenderSession::render_frame_finish()
   full_buffer_files_.clear();
 }
 
-static bool bake_setup_pass(Scene *scene, const string &bake_type_str, const int bake_filter)
+static PassType bake_type_to_pass(const string &bake_type_str, const int bake_filter)
 {
-  Integrator *integrator = scene->integrator;
   const char *bake_type = bake_type_str.c_str();
 
-  PassType type = PASS_NONE;
-  bool use_direct_light = false;
-  bool use_indirect_light = false;
-  bool include_albedo = false;
-
-  /* Data passes. */
+  /* data passes */
   if (strcmp(bake_type, "POSITION") == 0) {
-    type = PASS_POSITION;
+    return PASS_POSITION;
   }
   else if (strcmp(bake_type, "NORMAL") == 0) {
-    type = PASS_NORMAL;
+    return PASS_NORMAL;
   }
   else if (strcmp(bake_type, "UV") == 0) {
-    type = PASS_UV;
+    return PASS_UV;
   }
   else if (strcmp(bake_type, "ROUGHNESS") == 0) {
-    type = PASS_ROUGHNESS;
+    return PASS_ROUGHNESS;
   }
   else if (strcmp(bake_type, "EMIT") == 0) {
-    type = PASS_EMISSION;
+    return PASS_EMISSION;
   }
-  /* Environment pass. */
-  else if (strcmp(bake_type, "ENVIRONMENT") == 0) {
-    type = PASS_BACKGROUND;
-  }
-  /* AO passes. */
+  /* light passes */
   else if (strcmp(bake_type, "AO") == 0) {
-    type = PASS_AO;
+    return PASS_AO;
   }
-  /* Combined pass. */
   else if (strcmp(bake_type, "COMBINED") == 0) {
-    type = PASS_COMBINED;
-
-    use_direct_light = (bake_filter & BL::BakeSettings::pass_filter_DIRECT) != 0;
-    use_indirect_light = (bake_filter & BL::BakeSettings::pass_filter_INDIRECT) != 0;
-    include_albedo = (bake_filter & BL::BakeSettings::pass_filter_COLOR);
-
-    integrator->set_use_diffuse((bake_filter & BL::BakeSettings::pass_filter_DIFFUSE) != 0);
-    integrator->set_use_glossy((bake_filter & BL::BakeSettings::pass_filter_GLOSSY) != 0);
-    integrator->set_use_transmission((bake_filter & BL::BakeSettings::pass_filter_TRANSMISSION) !=
-                                     0);
-    integrator->set_use_emission((bake_filter & BL::BakeSettings::pass_filter_EMIT) != 0);
+    return PASS_COMBINED;
   }
-  /* Shadow pass. */
   else if (strcmp(bake_type, "SHADOW") == 0) {
-    type = PASS_SHADOW;
-    use_direct_light = true;
+    return PASS_SHADOW;
   }
-  /* Light component passes. */
   else if (strcmp(bake_type, "DIFFUSE") == 0) {
     if ((bake_filter & BL::BakeSettings::pass_filter_DIRECT) &&
         bake_filter & BL::BakeSettings::pass_filter_INDIRECT) {
-      type = PASS_DIFFUSE;
-      use_direct_light = true;
-      use_indirect_light = true;
+      return PASS_DIFFUSE;
     }
     else if (bake_filter & BL::BakeSettings::pass_filter_DIRECT) {
-      type = PASS_DIFFUSE_DIRECT;
-      use_direct_light = true;
+      return PASS_DIFFUSE_DIRECT;
     }
     else if (bake_filter & BL::BakeSettings::pass_filter_INDIRECT) {
-      type = PASS_DIFFUSE_INDIRECT;
-      use_indirect_light = true;
+      return PASS_DIFFUSE_INDIRECT;
     }
     else {
-      type = PASS_DIFFUSE_COLOR;
+      return PASS_DIFFUSE_COLOR;
     }
-
-    include_albedo = (bake_filter & BL::BakeSettings::pass_filter_COLOR);
   }
   else if (strcmp(bake_type, "GLOSSY") == 0) {
     if ((bake_filter & BL::BakeSettings::pass_filter_DIRECT) &&
         bake_filter & BL::BakeSettings::pass_filter_INDIRECT) {
-      type = PASS_GLOSSY;
-      use_direct_light = true;
-      use_indirect_light = true;
+      return PASS_GLOSSY;
     }
     else if (bake_filter & BL::BakeSettings::pass_filter_DIRECT) {
-      type = PASS_GLOSSY_DIRECT;
-      use_direct_light = true;
+      return PASS_GLOSSY_DIRECT;
     }
     else if (bake_filter & BL::BakeSettings::pass_filter_INDIRECT) {
-      type = PASS_GLOSSY_INDIRECT;
-      use_indirect_light = true;
+      return PASS_GLOSSY_INDIRECT;
     }
     else {
-      type = PASS_GLOSSY_COLOR;
+      return PASS_GLOSSY_COLOR;
     }
-
-    include_albedo = (bake_filter & BL::BakeSettings::pass_filter_COLOR);
   }
   else if (strcmp(bake_type, "TRANSMISSION") == 0) {
     if ((bake_filter & BL::BakeSettings::pass_filter_DIRECT) &&
         bake_filter & BL::BakeSettings::pass_filter_INDIRECT) {
-      type = PASS_TRANSMISSION;
-      use_direct_light = true;
-      use_indirect_light = true;
+      return PASS_TRANSMISSION;
     }
     else if (bake_filter & BL::BakeSettings::pass_filter_DIRECT) {
-      type = PASS_TRANSMISSION_DIRECT;
-      use_direct_light = true;
+      return PASS_TRANSMISSION_DIRECT;
     }
     else if (bake_filter & BL::BakeSettings::pass_filter_INDIRECT) {
-      type = PASS_TRANSMISSION_INDIRECT;
-      use_indirect_light = true;
+      return PASS_TRANSMISSION_INDIRECT;
     }
     else {
-      type = PASS_TRANSMISSION_COLOR;
+      return PASS_TRANSMISSION_COLOR;
     }
-
-    include_albedo = (bake_filter & BL::BakeSettings::pass_filter_COLOR);
+  }
+  /* extra */
+  else if (strcmp(bake_type, "ENVIRONMENT") == 0) {
+    return PASS_BACKGROUND;
   }
 
-  if (type == PASS_NONE) {
-    return false;
-  }
-
-  /* Create pass. */
-  Pass *pass = scene->create_node<Pass>();
-  pass->set_name(ustring("Combined"));
-  pass->set_type(type);
-  pass->set_include_albedo(include_albedo);
-
-  /* Disable direct indirect light for performance when not needed. */
-  integrator->set_use_direct_light(use_direct_light);
-  integrator->set_use_indirect_light(use_indirect_light);
-
-  return true;
+  return PASS_COMBINED;
 }
 
 void BlenderSession::bake(BL::Depsgraph &b_depsgraph_,
@@ -655,25 +603,39 @@ void BlenderSession::bake(BL::Depsgraph &b_depsgraph_,
   /* Initialize bake manager, before we load the baking kernels. */
   scene->bake_manager->set(scene, b_object.name());
 
+  /* Add render pass that we want to bake, and name it Combined so that it is
+   * used as that on the Blender side. */
+  Pass *pass = scene->create_node<Pass>();
+  pass->set_name(ustring("Combined"));
+  pass->set_type(bake_type_to_pass(bake_type, bake_filter));
+  pass->set_include_albedo((bake_filter & BL::BakeSettings::pass_filter_COLOR));
+
   session->set_display_driver(nullptr);
   session->set_output_driver(make_unique<BlenderOutputDriver>(b_engine));
 
-  /* Sync scene. */
-  BL::Object b_camera_override(b_engine.camera_override());
-  sync->sync_camera(b_render, b_camera_override, width, height, "");
-  sync->sync_data(
-      b_render, b_depsgraph, b_v3d, b_camera_override, width, height, &python_thread_state);
-
-  /* Add render pass that we want to bake, and name it Combined so that it is
-   * used as that on the Blender side. */
-  if (!bake_setup_pass(scene, bake_type, bake_filter)) {
-    session->cancel(true);
-  }
-
-  /* Always use transparent background for baking. */
-  scene->background->set_transparent(true);
-
   if (!session->progress.get_cancel()) {
+    /* Sync scene. */
+    BL::Object b_camera_override(b_engine.camera_override());
+    sync->sync_camera(b_render, b_camera_override, width, height, "");
+    sync->sync_data(
+        b_render, b_depsgraph, b_v3d, b_camera_override, width, height, &python_thread_state);
+
+    /* Filtering settings for combined pass. */
+    if (pass->get_type() == PASS_COMBINED) {
+      Integrator *integrator = scene->integrator;
+      integrator->set_use_direct_light((bake_filter & BL::BakeSettings::pass_filter_DIRECT) != 0);
+      integrator->set_use_indirect_light((bake_filter & BL::BakeSettings::pass_filter_INDIRECT) !=
+                                         0);
+      integrator->set_use_diffuse((bake_filter & BL::BakeSettings::pass_filter_DIFFUSE) != 0);
+      integrator->set_use_glossy((bake_filter & BL::BakeSettings::pass_filter_GLOSSY) != 0);
+      integrator->set_use_transmission(
+          (bake_filter & BL::BakeSettings::pass_filter_TRANSMISSION) != 0);
+      integrator->set_use_emission((bake_filter & BL::BakeSettings::pass_filter_EMIT) != 0);
+    }
+
+    /* Always use transparent background for baking. */
+    scene->background->set_transparent(true);
+
     /* Load built-in images from Blender. */
     builtin_images_load();
   }
@@ -681,12 +643,10 @@ void BlenderSession::bake(BL::Depsgraph &b_depsgraph_,
   /* Object might have been disabled for rendering or excluded in some
    * other way, in that case Blender will report a warning afterwards. */
   bool object_found = false;
-  if (!session->progress.get_cancel()) {
-    foreach (Object *ob, scene->objects) {
-      if (ob->name == b_object.name()) {
-        object_found = true;
-        break;
-      }
+  foreach (Object *ob, scene->objects) {
+    if (ob->name == b_object.name()) {
+      object_found = true;
+      break;
     }
   }
 

intern/cycles/blender/util.h

@@ -262,11 +262,8 @@ static inline bool BKE_object_is_modified(BL::Object &self, BL::Scene &scene, bo
 static inline bool BKE_object_is_deform_modified(BObjectInfo &self, BL::Scene &scene, bool preview)
 {
   if (!self.is_real_object_data()) {
-    /* Comes from geometry nodes, can't use heuristic to guess if it's animated. */
-    return true;
+    return false;
   }
-
-  /* Use heuristic to quickly check if object is potentially animated. */
   return self.real_object.is_deform_modified(scene, (preview) ? (1 << 0) : (1 << 1)) ? true :
                                                                                        false;
 }

intern/cycles/cmake/external_libs.cmake

@@ -24,9 +24,6 @@ if(CYCLES_STANDALONE_REPOSITORY)
     else()
       set(_cycles_lib_dir "${CMAKE_SOURCE_DIR}/../lib/darwin_arm64")
     endif()
-
-    # Always use system zlib
-    find_package(ZLIB REQUIRED)
   elseif(WIN32)
     if(CMAKE_CL_64)
       set(_cycles_lib_dir "${CMAKE_SOURCE_DIR}/../lib/win64_vc15")
@@ -69,12 +66,10 @@ if(CYCLES_STANDALONE_REPOSITORY)
     _set_default(BOOST_ROOT "${_cycles_lib_dir}/boost")
     _set_default(BLOSC_ROOT_DIR "${_cycles_lib_dir}/blosc")
     _set_default(EMBREE_ROOT_DIR "${_cycles_lib_dir}/embree")
-    _set_default(IMATH_ROOT_DIR "${_cycles_lib_dir}/imath")
     _set_default(GLEW_ROOT_DIR "${_cycles_lib_dir}/glew")
     _set_default(JPEG_ROOT "${_cycles_lib_dir}/jpeg")
     _set_default(LLVM_ROOT_DIR "${_cycles_lib_dir}/llvm")
     _set_default(CLANG_ROOT_DIR "${_cycles_lib_dir}/llvm")
-    _set_default(NANOVDB_ROOT_DIR "${_cycles_lib_dir}/openvdb")
     _set_default(OPENCOLORIO_ROOT_DIR "${_cycles_lib_dir}/opencolorio")
     _set_default(OPENEXR_ROOT_DIR "${_cycles_lib_dir}/openexr")
     _set_default(OPENIMAGEDENOISE_ROOT_DIR "${_cycles_lib_dir}/openimagedenoise")
@@ -85,11 +80,8 @@ if(CYCLES_STANDALONE_REPOSITORY)
     _set_default(OSL_ROOT_DIR "${_cycles_lib_dir}/osl")
     _set_default(PNG_ROOT "${_cycles_lib_dir}/png")
     _set_default(PUGIXML_ROOT_DIR "${_cycles_lib_dir}/pugixml")
-    _set_default(SDL2_ROOT_DIR "${_cycles_lib_dir}/sdl")
     _set_default(TBB_ROOT_DIR "${_cycles_lib_dir}/tbb")
     _set_default(TIFF_ROOT "${_cycles_lib_dir}/tiff")
-    _set_default(USD_ROOT_DIR "${_cycles_lib_dir}/usd")
-    _set_default(WEBP_ROOT_DIR "${_cycles_lib_dir}/webp")
     _set_default(ZLIB_ROOT "${_cycles_lib_dir}/zlib")
 
     # Ignore system libraries
@@ -99,6 +91,23 @@ if(CYCLES_STANDALONE_REPOSITORY)
   endif()
 endif()
 
+###########################################################################
+# USD
+###########################################################################
+
+if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_HYDRA_RENDER_DELEGATE)
+  set(WITH_USD ON)
+endif()
+if(WITH_CYCLES_HYDRA_RENDER_DELEGATE)
+  find_package(pxr CONFIG REQUIRED PATHS ${PXR_ROOT} ${USD_ROOT} NO_DEFAULT_PATH)
+  if(pxr_FOUND)
+    set(PXR_LIBRARY_DIR ${PXR_CMAKE_DIR}/lib)
+    set(USD_INCLUDE_DIRS ${PXR_INCLUDE_DIRS})
+  else()
+    set(WITH_USD OFF)
+  endif()
+endif()
+
 ###########################################################################
 # Zlib
 ###########################################################################
@@ -180,7 +189,6 @@ if(CYCLES_STANDALONE_REPOSITORY)
 
   find_package(JPEG REQUIRED)
   find_package(TIFF REQUIRED)
-  find_package(WebP)
 
   if(EXISTS ${_cycles_lib_dir})
     set(PNG_NAMES png16 libpng16 png libpng)
@@ -269,22 +277,20 @@ endif()
 if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_OPENCOLORIO)
   set(WITH_OPENCOLORIO ON)
 
-  if(NOT USD_OVERRIDE_OPENCOLORIO)
-    if(MSVC AND EXISTS ${_cycles_lib_dir})
-      set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO_ROOT_DIR}/include)
-      set(OPENCOLORIO_LIBRARIES
-        optimized ${OPENCOLORIO_ROOT_DIR}/lib/OpenColorIO.lib
-        optimized ${OPENCOLORIO_ROOT_DIR}/lib/libyaml-cpp.lib
-        optimized ${OPENCOLORIO_ROOT_DIR}/lib/libexpatMD.lib
-        optimized ${OPENCOLORIO_ROOT_DIR}/lib/pystring.lib
-        debug ${OPENCOLORIO_ROOT_DIR}/lib/OpencolorIO_d.lib
-        debug ${OPENCOLORIO_ROOT_DIR}/lib/libyaml-cpp_d.lib
-        debug ${OPENCOLORIO_ROOT_DIR}/lib/libexpatdMD.lib
-        debug ${OPENCOLORIO_ROOT_DIR}/lib/pystring_d.lib
-      )
-    else()
-      find_package(OpenColorIO REQUIRED)
-    endif()
+  if(MSVC AND EXISTS ${_cycles_lib_dir})
+    set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO_ROOT_DIR}/include)
+    set(OPENCOLORIO_LIBRARIES
+      optimized ${OPENCOLORIO_ROOT_DIR}/lib/OpenColorIO.lib
+      optimized ${OPENCOLORIO_ROOT_DIR}/lib/libyaml-cpp.lib
+      optimized ${OPENCOLORIO_ROOT_DIR}/lib/libexpatMD.lib
+      optimized ${OPENCOLORIO_ROOT_DIR}/lib/pystring.lib
+      debug ${OPENCOLORIO_ROOT_DIR}/lib/OpencolorIO_d.lib
+      debug ${OPENCOLORIO_ROOT_DIR}/lib/libyaml-cpp_d.lib
+      debug ${OPENCOLORIO_ROOT_DIR}/lib/libexpatdMD.lib
+      debug ${OPENCOLORIO_ROOT_DIR}/lib/pystring_d.lib
+    )
+  else()
+    find_package(OpenColorIO REQUIRED)
   endif()
 endif()
 
@@ -360,7 +366,7 @@ if(CYCLES_STANDALONE_REPOSITORY)
     set(BOOST_LIBPATH ${Boost_LIBRARY_DIRS})
   endif()
 
-  set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB ${BOOST_DEFINITIONS}")
+  set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
 endif()
 
 ###########################################################################
@@ -408,10 +414,26 @@ endif()
 # OpenSubdiv
 ###########################################################################
 
+if(WITH_CYCLES_HYDRA_RENDER_DELEGATE AND PXR_LIBRARY_DIR AND (WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV))
+  find_library(OPENSUBDIV_LIBRARY_CPU_DEBUG_PXR NAMES osdCPU_d osdCPU PATHS ${PXR_LIBRARY_DIR} NO_CACHE NO_DEFAULT_PATH)
+  find_library(OPENSUBDIV_LIBRARY_GPU_DEBUG_PXR NAMES osdGPU_d osdGPU PATHS ${PXR_LIBRARY_DIR} NO_CACHE NO_DEFAULT_PATH)
+  find_library(OPENSUBDIV_LIBRARY_CPU_RELEASE_PXR NAMES osdCPU PATHS ${PXR_LIBRARY_DIR} NO_CACHE NO_DEFAULT_PATH)
+  find_library(OPENSUBDIV_LIBRARY_GPU_RELEASE_PXR NAMES osdGPU PATHS ${PXR_LIBRARY_DIR} NO_CACHE NO_DEFAULT_PATH)
+  if(OPENSUBDIV_LIBRARY_CPU_RELEASE_PXR AND OPENSUBDIV_LIBRARY_GPU_RELEASE_PXR)
+    set(OPENSUBDIV_INCLUDE_DIRS ${PXR_INCLUDE_DIRS})
+    set(OPENSUBDIV_LIBRARIES
+      optimized ${OPENSUBDIV_LIBRARY_CPU_RELEASE_PXR}
+      optimized ${OPENSUBDIV_LIBRARY_GPU_RELEASE_PXR}
+      debug ${OPENSUBDIV_LIBRARY_CPU_DEBUG_PXR}
+      debug ${OPENSUBDIV_LIBRARY_GPU_DEBUG_PXR}
+    )
+  endif()
+endif()
+
 if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_OPENSUBDIV)
   set(WITH_OPENSUBDIV ON)
 
-  if(NOT USD_OVERRIDE_OPENSUBDIV)
+  if(NOT OPENSUBDIV_LIBRARY_CPU_RELEASE_PXR OR NOT OPENSUBDIV_LIBRARY_GPU_RELEASE_PXR)
     if(MSVC AND EXISTS ${_cycles_lib_dir})
       set(OPENSUBDIV_INCLUDE_DIRS ${OPENSUBDIV_ROOT_DIR}/include)
       set(OPENSUBDIV_LIBRARIES
@@ -430,11 +452,19 @@ endif()
 # OpenVDB
 ###########################################################################
 
+if(WITH_CYCLES_HYDRA_RENDER_DELEGATE AND PXR_LIBRARY_DIR AND (WITH_OPENVDB OR WITH_CYCLES_OPENVDB))
+  find_library(OPENVDB_LIBRARY_PXR NAMES openvdb PATHS ${PXR_LIBRARY_DIR} NO_CACHE NO_DEFAULT_PATH)
+  if(OPENVDB_LIBRARY_PXR)
+    set(OPENVDB_INCLUDE_DIRS ${PXR_INCLUDE_DIRS})
+    set(OPENVDB_LIBRARIES ${OPENVDB_LIBRARY_PXR})
+  endif()
+endif()
+
 if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_OPENVDB)
   set(WITH_OPENVDB ON)
   set(OPENVDB_DEFINITIONS -DNOMINMAX -D_USE_MATH_DEFINES)
 
-  if(NOT USD_OVERRIDE_OPENVDB)
+  if(NOT OPENVDB_LIBRARY_PXR)
     find_package(OpenVDB REQUIRED)
 
     if(MSVC AND EXISTS ${_cycles_lib_dir})
@@ -448,20 +478,6 @@ if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_OPENVDB)
   endif()
 endif()
 
-###########################################################################
-# NanoVDB
-###########################################################################
-
-if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_NANOVDB)
-  set(WITH_NANOVDB ON)
-
-  if(MSVC AND EXISTS ${_cycles_lib_dir})
-    set(NANOVDB_INCLUDE_DIR ${NANOVDB_ROOT_DIR}/include)
-  else()
-    find_package(NanoVDB REQUIRED)
-  endif()
-endif()
-
 ###########################################################################
 # OpenImageDenoise
 ###########################################################################
@@ -488,8 +504,20 @@ endif()
 # TBB
 ###########################################################################
 
+if(WITH_CYCLES_HYDRA_RENDER_DELEGATE AND PXR_LIBRARY_DIR)
+  find_library(TBB_LIBRARY_DEBUG_PXR NAMES tbb_debug tbb PATHS ${PXR_LIBRARY_DIR} NO_CACHE NO_DEFAULT_PATH)
+  find_library(TBB_LIBRARY_RELEASE_PXR NAMES tbb PATHS ${PXR_LIBRARY_DIR} NO_CACHE NO_DEFAULT_PATH)
+  if(TBB_LIBRARY_RELEASE_PXR)
+    set(TBB_INCLUDE_DIRS ${PXR_INCLUDE_DIRS})
+    set(TBB_LIBRARIES
+      optimized ${TBB_LIBRARY_RELEASE_PXR}
+      debug ${TBB_LIBRARY_DEBUG_PXR}
+    )
+  endif()
+endif()
+
 if(CYCLES_STANDALONE_REPOSITORY)
-  if(NOT USD_OVERRIDE_TBB)
+  if(NOT TBB_LIBRARY_RELEASE_PXR)
     if(MSVC AND EXISTS ${_cycles_lib_dir})
       set(TBB_INCLUDE_DIRS ${TBB_ROOT_DIR}/include)
       set(TBB_LIBRARIES
@@ -558,8 +586,7 @@ endif()
 # OpenGL
 ###########################################################################
 
-if((WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI) OR
-   WITH_CYCLES_HYDRA_RENDER_DELEGATE)
+if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI)
   if(CYCLES_STANDALONE_REPOSITORY)
     if(NOT DEFINED OpenGL_GL_PREFERENCE)
       set(OpenGL_GL_PREFERENCE "LEGACY")
@@ -597,7 +624,7 @@ endif()
 # CUDA
 ###########################################################################
 
-if(WITH_CYCLES_DEVICE_CUDA AND (WITH_CYCLES_CUDA_BINARIES OR NOT WITH_CUDA_DYNLOAD))
+if(WITH_CYCLES_CUDA_BINARIES OR NOT WITH_CUDA_DYNLOAD)
   find_package(CUDA) # Try to auto locate CUDA toolkit
   if(CUDA_FOUND)
     message(STATUS "Found CUDA ${CUDA_NVCC_EXECUTABLE} (${CUDA_VERSION})")
@@ -647,3 +674,16 @@ if(WITH_CYCLES_DEVICE_METAL)
     message(STATUS "Found Metal: ${METAL_LIBRARY}")
   endif()
 endif()
+
+###########################################################################
+# macOS
+###########################################################################
+
+if(CYCLES_STANDALONE_REPOSITORY)
+  # On macOS, always use zlib from system.
+  if(APPLE)
+    set(ZLIB_ROOT /usr)
+    find_package(ZLIB REQUIRED)
+    find_package(PNG REQUIRED)
+  endif()
+endif()

intern/cycles/cmake/macros.cmake

@@ -74,19 +74,6 @@ macro(cycles_add_library target library_deps)
 endmacro()
 
 macro(cycles_external_libraries_append libraries)
-  if(APPLE)
-    list(APPEND ${libraries} "-framework Foundation")
-    if(WITH_USD)
-      list(APPEND ${libraries} "-framework CoreVideo -framework Cocoa")
-    endif()
-    if(WITH_CYCLES_STANDALONE_GUI OR WITH_USD)
-      list(APPEND ${libraries} "-framework OpenGL")
-    endif()
-  elseif(UNIX)
-    if(WITH_USD)
-      list(APPEND ${libraries} "X11")
-    endif()
-  endif()
   if(WITH_CYCLES_LOGGING)
     list(APPEND ${libraries} ${GLOG_LIBRARIES} ${GFLAGS_LIBRARIES})
   endif()
@@ -103,7 +90,6 @@ macro(cycles_external_libraries_append libraries)
     list(APPEND ${libraries} ${OPENCOLORIO_LIBRARIES})
     if(APPLE)
       list(APPEND ${libraries} "-framework IOKit")
-      list(APPEND ${libraries} "-framework Carbon")
     endif()
   endif()
   if(WITH_OPENVDB)

intern/cycles/device/cuda/device_impl.cpp

@@ -457,8 +457,6 @@ void CUDADevice::reserve_local_memory(const uint kernel_features)
     /* Use the biggest kernel for estimation. */
     const DeviceKernel test_kernel = (kernel_features & KERNEL_FEATURE_NODE_RAYTRACE) ?
                                          DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_RAYTRACE :
-                                     (kernel_features & KERNEL_FEATURE_MNEE) ?
-                                         DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_MNEE :
                                          DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE;
 
     /* Launch kernel, using just 1 block appears sufficient to reserve memory for all

intern/cycles/device/hip/device_impl.cpp

@@ -420,8 +420,6 @@ void HIPDevice::reserve_local_memory(const uint kernel_features)
     /* Use the biggest kernel for estimation. */
     const DeviceKernel test_kernel = (kernel_features & KERNEL_FEATURE_NODE_RAYTRACE) ?
                                          DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_RAYTRACE :
-                                     (kernel_features & KERNEL_FEATURE_MNEE) ?
-                                         DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_MNEE :
                                          DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE;
 
     /* Launch kernel, using just 1 block appears sufficient to reserve memory for all

intern/cycles/device/kernel.cpp

@@ -33,8 +33,6 @@ const char *device_kernel_as_string(DeviceKernel kernel)
       return "integrator_shade_surface";
     case DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_RAYTRACE:
       return "integrator_shade_surface_raytrace";
-    case DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_MNEE:
-      return "integrator_shade_surface_mnee";
     case DEVICE_KERNEL_INTEGRATOR_SHADE_VOLUME:
       return "integrator_shade_volume";
     case DEVICE_KERNEL_INTEGRATOR_MEGAKERNEL:

intern/cycles/device/metal/kernel.mm

@@ -489,8 +489,7 @@ bool MetalDeviceKernels::load(MetalDevice *device, int kernel_type)
             i == DEVICE_KERNEL_INTEGRATOR_INTERSECT_SHADOW ||
             i == DEVICE_KERNEL_INTEGRATOR_INTERSECT_SUBSURFACE ||
             i == DEVICE_KERNEL_INTEGRATOR_INTERSECT_VOLUME_STACK ||
-            i == DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_RAYTRACE ||
-            i == DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_MNEE) {
+            i == DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_RAYTRACE) {
           kernel_function_list = function_list;
         }
 

intern/cycles/device/metal/queue.mm

@@ -265,7 +265,6 @@ bool MetalDeviceQueue::enqueue(DeviceKernel kernel,
         case DEVICE_KERNEL_INTEGRATOR_INTERSECT_SUBSURFACE:
         case DEVICE_KERNEL_INTEGRATOR_INTERSECT_VOLUME_STACK:
         case DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_RAYTRACE:
-        case DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_MNEE:
           break;
         default:
           bvhMetalRT = nil;

intern/cycles/device/optix/device_impl.cpp

@@ -432,10 +432,9 @@ bool OptiXDevice::load_kernels(const uint kernel_features)
   }
 
   { /* Load and compile PTX module with OptiX kernels. */
-    string ptx_data, ptx_filename = path_get(
-                         (kernel_features & (KERNEL_FEATURE_NODE_RAYTRACE | KERNEL_FEATURE_MNEE)) ?
-                             "lib/kernel_optix_shader_raytrace.ptx" :
-                             "lib/kernel_optix.ptx");
+    string ptx_data, ptx_filename = path_get((kernel_features & KERNEL_FEATURE_NODE_RAYTRACE) ?
+                                                 "lib/kernel_optix_shader_raytrace.ptx" :
+                                                 "lib/kernel_optix.ptx");
     if (use_adaptive_compilation() || path_file_size(ptx_filename) == -1) {
       if (!getenv("OPTIX_ROOT_DIR")) {
         set_error(
@@ -445,9 +444,7 @@ bool OptiXDevice::load_kernels(const uint kernel_features)
       }
       ptx_filename = compile_kernel(
           kernel_features,
-          (kernel_features & (KERNEL_FEATURE_NODE_RAYTRACE | KERNEL_FEATURE_MNEE)) ?
-              "kernel_shader_raytrace" :
-              "kernel",
+          (kernel_features & KERNEL_FEATURE_NODE_RAYTRACE) ? "kernel_shader_raytrace" : "kernel",
           "optix",
           true);
     }
@@ -585,14 +582,6 @@ bool OptiXDevice::load_kernels(const uint kernel_features)
         "__direct_callable__svm_node_bevel";
   }
 
-  /* MNEE. */
-  if (kernel_features & KERNEL_FEATURE_MNEE) {
-    group_descs[PG_RGEN_SHADE_SURFACE_MNEE].kind = OPTIX_PROGRAM_GROUP_KIND_RAYGEN;
-    group_descs[PG_RGEN_SHADE_SURFACE_MNEE].raygen.module = optix_module;
-    group_descs[PG_RGEN_SHADE_SURFACE_MNEE].raygen.entryFunctionName =
-        "__raygen__kernel_optix_integrator_shade_surface_mnee";
-  }
-
   optix_assert(optixProgramGroupCreate(
       context, group_descs, NUM_PROGRAM_GROUPS, &group_options, nullptr, 0, groups));
 
@@ -674,46 +663,6 @@ bool OptiXDevice::load_kernels(const uint kernel_features)
         pipelines[PIP_SHADE_RAYTRACE], 0, dss, css, motion_blur ? 3 : 2));
   }
 
-  if (kernel_features & KERNEL_FEATURE_MNEE) {
-    /* Create MNEE pipeline. */
-    vector<OptixProgramGroup> pipeline_groups;
-    pipeline_groups.reserve(NUM_PROGRAM_GROUPS);
-    pipeline_groups.push_back(groups[PG_RGEN_SHADE_SURFACE_MNEE]);
-    pipeline_groups.push_back(groups[PG_MISS]);
-    pipeline_groups.push_back(groups[PG_HITD]);
-    pipeline_groups.push_back(groups[PG_HITS]);
-    pipeline_groups.push_back(groups[PG_HITL]);
-    pipeline_groups.push_back(groups[PG_HITV]);
-    if (motion_blur) {
-      pipeline_groups.push_back(groups[PG_HITD_MOTION]);
-      pipeline_groups.push_back(groups[PG_HITS_MOTION]);
-    }
-    if (kernel_features & KERNEL_FEATURE_POINTCLOUD) {
-      pipeline_groups.push_back(groups[PG_HITD_POINTCLOUD]);
-      pipeline_groups.push_back(groups[PG_HITS_POINTCLOUD]);
-    }
-    pipeline_groups.push_back(groups[PG_CALL_SVM_AO]);
-    pipeline_groups.push_back(groups[PG_CALL_SVM_BEVEL]);
-
-    optix_assert(optixPipelineCreate(context,
-                                     &pipeline_options,
-                                     &link_options,
-                                     pipeline_groups.data(),
-                                     pipeline_groups.size(),
-                                     nullptr,
-                                     0,
-                                     &pipelines[PIP_SHADE_MNEE]));
-
-    /* Combine ray generation and trace continuation stack size. */
-    const unsigned int css = stack_size[PG_RGEN_SHADE_SURFACE_MNEE].cssRG +
-                             link_options.maxTraceDepth * trace_css;
-    const unsigned int dss = 0;
-
-    /* Set stack size depending on pipeline options. */
-    optix_assert(
-        optixPipelineSetStackSize(pipelines[PIP_SHADE_MNEE], 0, dss, css, motion_blur ? 3 : 2));
-  }
-
   { /* Create intersection-only pipeline. */
     vector<OptixProgramGroup> pipeline_groups;
     pipeline_groups.reserve(NUM_PROGRAM_GROUPS);

intern/cycles/device/optix/device_impl.h

@@ -24,7 +24,6 @@ enum {
   PG_RGEN_INTERSECT_SUBSURFACE,
   PG_RGEN_INTERSECT_VOLUME_STACK,
   PG_RGEN_SHADE_SURFACE_RAYTRACE,
-  PG_RGEN_SHADE_SURFACE_MNEE,
   PG_MISS,
   PG_HITD, /* Default hit group. */
   PG_HITS, /* __SHADOW_RECORD_ALL__ hit group. */
@@ -47,7 +46,7 @@ static const int CALLABLE_PROGRAM_GROUPS_BASE = PG_CALL_SVM_AO;
 static const int NUM_CALLABLE_PROGRAM_GROUPS = 2;
 
 /* List of OptiX pipelines. */
-enum { PIP_SHADE_RAYTRACE, PIP_SHADE_MNEE, PIP_INTERSECT, NUM_PIPELINES };
+enum { PIP_SHADE_RAYTRACE, PIP_INTERSECT, NUM_PIPELINES };
 
 /* A single shader binding table entry. */
 struct SbtRecord {

intern/cycles/device/optix/queue.cpp

@@ -28,7 +28,6 @@ void OptiXDeviceQueue::init_execution()
 static bool is_optix_specific_kernel(DeviceKernel kernel)
 {
   return (kernel == DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_RAYTRACE ||
-          kernel == DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_MNEE ||
           kernel == DEVICE_KERNEL_INTEGRATOR_INTERSECT_CLOSEST ||
           kernel == DEVICE_KERNEL_INTEGRATOR_INTERSECT_SHADOW ||
           kernel == DEVICE_KERNEL_INTEGRATOR_INTERSECT_SUBSURFACE ||
@@ -64,8 +63,7 @@ bool OptiXDeviceQueue::enqueue(DeviceKernel kernel,
                         cuda_stream_));
 
   if (kernel == DEVICE_KERNEL_INTEGRATOR_INTERSECT_CLOSEST ||
-      kernel == DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_RAYTRACE ||
-      kernel == DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_MNEE) {
+      kernel == DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_RAYTRACE) {
     cuda_device_assert(
         cuda_device_,
         cuMemcpyHtoDAsync(launch_params_ptr + offsetof(KernelParamsOptiX, render_buffer),
@@ -84,10 +82,6 @@ bool OptiXDeviceQueue::enqueue(DeviceKernel kernel,
       pipeline = optix_device->pipelines[PIP_SHADE_RAYTRACE];
       sbt_params.raygenRecord = sbt_data_ptr + PG_RGEN_SHADE_SURFACE_RAYTRACE * sizeof(SbtRecord);
       break;
-    case DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_MNEE:
-      pipeline = optix_device->pipelines[PIP_SHADE_MNEE];
-      sbt_params.raygenRecord = sbt_data_ptr + PG_RGEN_SHADE_SURFACE_MNEE * sizeof(SbtRecord);
-      break;
     case DEVICE_KERNEL_INTEGRATOR_INTERSECT_CLOSEST:
       pipeline = optix_device->pipelines[PIP_INTERSECT];
       sbt_params.raygenRecord = sbt_data_ptr + PG_RGEN_INTERSECT_CLOSEST * sizeof(SbtRecord);

intern/cycles/graph/node_enum.h

@@ -19,10 +19,8 @@ struct NodeEnum {
   }
   void insert(const char *x, int y)
   {
-    ustring ustr_x(x);
-
-    left[ustr_x] = y;
-    right[y] = ustr_x;
+    left[ustring(x)] = y;
+    right[y] = ustring(x);
   }
 
   bool exists(ustring x) const

intern/cycles/hydra/CMakeLists.txt

@@ -26,8 +26,8 @@ set(INC_HD_CYCLES
   camera.h
   config.h
   curves.h
+  display_driver.h
   field.h
-  file_reader.h
   geometry.h
   geometry.inl
   instancer.h
@@ -48,8 +48,8 @@ set(SRC_HD_CYCLES
   attribute.cpp
   curves.cpp
   camera.cpp
+  display_driver.cpp
   field.cpp
-  file_reader.cpp
   instancer.cpp
   light.cpp
   material.cpp
@@ -73,28 +73,21 @@ if(WITH_OPENVDB)
   )
 endif()
 
-# Blender libraries do not include hgiGL, so build without display driver then.
-if(EXISTS ${USD_INCLUDE_DIR}/pxr/imaging/hgiGL)
-  add_definitions(-DWITH_HYDRA_DISPLAY_DRIVER)
-  list(APPEND SRC_HD_CYCLES display_driver.cpp)
-  list(APPEND INC_HD_CYCLES display_driver.h)
-endif()
-
 include_directories(${INC})
 include_directories(SYSTEM ${INC_SYS})
 
-add_library(cycles_hydra STATIC
+add_library(hdCyclesStatic STATIC
   ${SRC_HD_CYCLES}
   ${INC_HD_CYCLES}
 )
 
-target_compile_options(cycles_hydra
+target_compile_options(hdCyclesStatic
   PRIVATE
   $<$<CXX_COMPILER_ID:MSVC>:/wd4003 /wd4244 /wd4506>
   $<$<CXX_COMPILER_ID:GNU>:-Wno-float-conversion -Wno-double-promotion -Wno-deprecated>
 )
 
-target_compile_definitions(cycles_hydra
+target_compile_definitions(hdCyclesStatic
   PRIVATE
   GLOG_NO_ABBREVIATED_SEVERITIES=1
   OSL_DEBUG=$<CONFIG:DEBUG>
@@ -102,93 +95,57 @@ target_compile_definitions(cycles_hydra
   $<$<CXX_COMPILER_ID:MSVC>:NOMINMAX=1>
 )
 
-target_link_libraries(cycles_hydra
+target_link_libraries(hdCyclesStatic
   PUBLIC
-  ${USD_LIBRARIES}
+  hd
+  hgi
+  hgiGL
   PRIVATE
   ${LIB}
 )
 
-if(WITH_CYCLES_HYDRA_RENDER_DELEGATE)
-  set(HdCyclesPluginName hdCycles)
-  add_library(${HdCyclesPluginName} SHARED
-    plugin.h
-    plugin.cpp
-  )
+set(HdCyclesPluginName hdCycles)
+add_library(${HdCyclesPluginName} SHARED
+  plugin.h
+  plugin.cpp
+)
 
-  set_target_properties(${HdCyclesPluginName}
-    PROPERTIES PREFIX ""
-  )
+set_target_properties(${HdCyclesPluginName}
+  PROPERTIES PREFIX ""
+)
 
-  target_compile_definitions(${HdCyclesPluginName}
-    PRIVATE
-    MFB_PACKAGE_NAME=${HdCyclesPluginName}
-    MFB_ALT_PACKAGE_NAME=${HdCyclesPluginName}
-    GLOG_NO_ABBREVIATED_SEVERITIES=1
-    OSL_DEBUG=$<CONFIG:DEBUG>
-    TBB_USE_DEBUG=$<CONFIG:DEBUG>
-    $<$<CXX_COMPILER_ID:MSVC>:NOMINMAX=1>
-  )
+target_compile_definitions(${HdCyclesPluginName}
+  PRIVATE
+  MFB_PACKAGE_NAME=${HdCyclesPluginName}
+  MFB_ALT_PACKAGE_NAME=${HdCyclesPluginName}
+  GLOG_NO_ABBREVIATED_SEVERITIES=1
+  OSL_DEBUG=$<CONFIG:DEBUG>
+  TBB_USE_DEBUG=$<CONFIG:DEBUG>
+  $<$<CXX_COMPILER_ID:MSVC>:NOMINMAX=1>
+)
 
-  target_link_libraries(${HdCyclesPluginName}
-    cycles_hydra
-  )
-
-  if(APPLE)
-    set_property(
-      TARGET
-      ${HdCyclesPluginName}
-      APPEND_STRING PROPERTY LINK_FLAGS
-      " -Wl,-exported_symbols_list,'${CMAKE_CURRENT_SOURCE_DIR}/resources/apple_symbols.map'"
-    )
-  elseif(UNIX)
-    set_property(
-      TARGET
-      ${HdCyclesPluginName}
-      APPEND_STRING PROPERTY LINK_FLAGS
-      " -Wl,--version-script='${CMAKE_CURRENT_SOURCE_DIR}/resources/linux_symbols.map'"
-    )
-  endif()
-
-
-  if(WITH_CYCLES_BLENDER)
-    # Install inside add-on
-    set(CYCLES_HYDRA_INSTALL_PATH ${CYCLES_INSTALL_PATH}/hydra)
-  else()
-    # Install next to cycles executable
-    set(CYCLES_HYDRA_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/hydra)
-  endif()
+target_link_libraries(${HdCyclesPluginName}
+  hdCyclesStatic
+)
 
+if(WITH_CYCLES_BLENDER)
+  set(CYCLES_HYDRA_INSTALL_PATH "../")
+else()
+  set(CYCLES_HYDRA_INSTALL_PATH ${CMAKE_INSTALL_PREFIX})
   # Put the root plugInfo.json one level up
-  delayed_install("${CMAKE_CURRENT_SOURCE_DIR}" "plugInfo.json" ${CYCLES_HYDRA_INSTALL_PATH})
-  delayed_install("" $<TARGET_FILE:${HdCyclesPluginName}> ${CYCLES_HYDRA_INSTALL_PATH})
-
-  set_target_properties(${HdCyclesPluginName}
-    PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-  set(PLUG_INFO_ROOT "..")
-
-  if(WITH_CYCLES_BLENDER)
-    # Full path not yet know at this point and RELATIVE_PATH requires
-    # absolute path as input. So just set manually.
-    set(PLUG_INFO_LIBRARY_PATH "../${HdCyclesPluginName}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-    set(PLUG_INFO_RESOURCE_PATH "../..")
-  else()
-    file(RELATIVE_PATH
-      PLUG_INFO_LIBRARY_PATH
-      "${CYCLES_HYDRA_INSTALL_PATH}/${HdCyclesPluginName}"
-      "${CYCLES_HYDRA_INSTALL_PATH}/${HdCyclesPluginName}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-    file(RELATIVE_PATH PLUG_INFO_RESOURCE_PATH
-      "${CYCLES_HYDRA_INSTALL_PATH}/${HdCyclesPluginName}"
-      "${CYCLES_INSTALL_PATH}")
-  endif()
-
-  configure_file(resources/plugInfo.json
-    ${CMAKE_CURRENT_BINARY_DIR}/resources/plugInfo.json
-    @ONLY
-  )
-
-  delayed_install("${CMAKE_CURRENT_BINARY_DIR}/resources" "plugInfo.json" "${CYCLES_HYDRA_INSTALL_PATH}/${HdCyclesPluginName}/resources")
+  delayed_install("${CMAKE_CURRENT_SOURCE_DIR}" "plugInfo.json" ${CMAKE_INSTALL_PREFIX})
 endif()
+
+delayed_install("" $<TARGET_FILE:${HdCyclesPluginName}> ${CYCLES_HYDRA_INSTALL_PATH})
+
+set(PLUG_INFO_ROOT "..")
+
+file(RELATIVE_PATH PLUG_INFO_LIBRARY_PATH "${CYCLES_HYDRA_INSTALL_PATH}/${HdCyclesPluginName}" "${CYCLES_HYDRA_INSTALL_PATH}/${HdCyclesPluginName}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+file(RELATIVE_PATH PLUG_INFO_RESOURCE_PATH "${CYCLES_HYDRA_INSTALL_PATH}/${HdCyclesPluginName}" "${CYCLES_INSTALL_PATH}")
+
+configure_file(resources/plugInfo.json
+  ${CMAKE_CURRENT_BINARY_DIR}/resources/plugInfo.json
+  @ONLY
+)
+
+delayed_install("${CMAKE_CURRENT_BINARY_DIR}/resources" "plugInfo.json" "${CYCLES_HYDRA_INSTALL_PATH}/${HdCyclesPluginName}/resources")

intern/cycles/hydra/camera.cpp

@@ -281,12 +281,9 @@ void HdCyclesCamera::ApplyCameraSettings(HdRenderParam *renderParam,
   auto data = dataUnconformedWindow;
   CameraUtilConformWindow(&data, windowPolicy, width / height);
 
-  if (data.GetProjection() == GfCamera::Orthographic) {
-    cam->set_camera_type(CAMERA_ORTHOGRAPHIC);
-  }
-  else {
-    cam->set_camera_type(CAMERA_PERSPECTIVE);
-  }
+  static_assert(GfCamera::Perspective == CAMERA_PERSPECTIVE &&
+                GfCamera::Orthographic == CAMERA_ORTHOGRAPHIC);
+  cam->set_camera_type(static_cast<CameraType>(data.GetProjection()));
 
   const float metersPerUnit = static_cast<HdCyclesSession *>(renderParam)->GetStageMetersPerUnit();
 

intern/cycles/hydra/display_driver.cpp

@@ -19,6 +19,31 @@ HDCYCLES_NAMESPACE_OPEN_SCOPE
 HdCyclesDisplayDriver::HdCyclesDisplayDriver(HdCyclesSession *renderParam, Hgi *hgi)
     : _renderParam(renderParam), _hgi(hgi)
 {
+#ifdef _WIN32
+  hdc_ = GetDC(CreateWindowA("STATIC",
+                             "HdCycles",
+                             WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
+                             0,
+                             0,
+                             64,
+                             64,
+                             NULL,
+                             NULL,
+                             GetModuleHandle(NULL),
+                             NULL));
+
+  int pixelFormat = GetPixelFormat(wglGetCurrentDC());
+  PIXELFORMATDESCRIPTOR pfd = {sizeof(pfd)};
+  DescribePixelFormat((HDC)hdc_, pixelFormat, sizeof(pfd), &pfd);
+  SetPixelFormat((HDC)hdc_, pixelFormat, &pfd);
+
+  TF_VERIFY(gl_context_ = wglCreateContext((HDC)hdc_));
+  TF_VERIFY(wglShareLists(wglGetCurrentContext(), (HGLRC)gl_context_));
+#endif
+
+  glewInit();
+
+  glGenBuffers(1, &gl_pbo_id_);
 }
 
 HdCyclesDisplayDriver::~HdCyclesDisplayDriver()
@@ -27,92 +52,11 @@ HdCyclesDisplayDriver::~HdCyclesDisplayDriver()
     _hgi->DestroyTexture(&texture_);
   }
 
-  if (gl_pbo_id_) {
-    glDeleteBuffers(1, &gl_pbo_id_);
-  }
+  glDeleteBuffers(1, &gl_pbo_id_);
 
-  gl_context_dispose();
-}
-
-void HdCyclesDisplayDriver::gl_context_create()
-{
 #ifdef _WIN32
-  if (!gl_context_) {
-    hdc_ = GetDC(CreateWindowA("STATIC",
-                               "HdCycles",
-                               WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
-                               0,
-                               0,
-                               64,
-                               64,
-                               NULL,
-                               NULL,
-                               GetModuleHandle(NULL),
-                               NULL));
-
-    int pixelFormat = GetPixelFormat(wglGetCurrentDC());
-    PIXELFORMATDESCRIPTOR pfd = {sizeof(pfd)};
-    DescribePixelFormat((HDC)hdc_, pixelFormat, sizeof(pfd), &pfd);
-    SetPixelFormat((HDC)hdc_, pixelFormat, &pfd);
-
-    TF_VERIFY(gl_context_ = wglCreateContext((HDC)hdc_));
-    TF_VERIFY(wglShareLists(wglGetCurrentContext(), (HGLRC)gl_context_));
-  }
-  if (!gl_context_) {
-    return;
-  }
-#endif
-
-  if (!gl_pbo_id_) {
-    if (glewInit() != GLEW_OK) {
-      return;
-    }
-
-    glGenBuffers(1, &gl_pbo_id_);
-  }
-}
-
-bool HdCyclesDisplayDriver::gl_context_enable()
-{
-#ifdef _WIN32
-  if (!hdc_ || !gl_context_) {
-    return false;
-  }
-
-  mutex_.lock();
-
-  // Do not change context if this is called in the main thread
-  if (wglGetCurrentContext() == nullptr) {
-    if (!TF_VERIFY(wglMakeCurrent((HDC)hdc_, (HGLRC)gl_context_))) {
-      mutex_.unlock();
-      return false;
-    }
-  }
-
-  return true;
-#else
-  return false;
-#endif
-}
-
-void HdCyclesDisplayDriver::gl_context_disable()
-{
-#ifdef _WIN32
-  if (wglGetCurrentContext() == gl_context_) {
-    TF_VERIFY(wglMakeCurrent(nullptr, nullptr));
-  }
-
-  mutex_.unlock();
-#endif
-}
-
-void HdCyclesDisplayDriver::gl_context_dispose()
-{
-#ifdef _WIN32
-  if (gl_context_) {
-    TF_VERIFY(wglDeleteContext((HGLRC)gl_context_));
-    DestroyWindow(WindowFromDC((HDC)hdc_));
-  }
+  TF_VERIFY(wglDeleteContext((HGLRC)gl_context_));
+  DestroyWindow(WindowFromDC((HDC)hdc_));
 #endif
 }
 
@@ -124,9 +68,13 @@ bool HdCyclesDisplayDriver::update_begin(const Params &params,
                                          int texture_width,
                                          int texture_height)
 {
-  if (!gl_context_enable()) {
+#ifdef _WIN32
+  if (!hdc_ || !gl_context_) {
     return false;
   }
+#endif
+
+  graphics_interop_activate();
 
   if (gl_render_sync_) {
     glWaitSync((GLsync)gl_render_sync_, 0, GL_TIMEOUT_IGNORED);
@@ -151,14 +99,15 @@ bool HdCyclesDisplayDriver::update_begin(const Params &params,
 void HdCyclesDisplayDriver::update_end()
 {
   gl_upload_sync_ = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+
   glFlush();
 
-  gl_context_disable();
+  graphics_interop_deactivate();
 }
 
 void HdCyclesDisplayDriver::flush()
 {
-  gl_context_enable();
+  graphics_interop_activate();
 
   if (gl_upload_sync_) {
     glWaitSync((GLsync)gl_upload_sync_, 0, GL_TIMEOUT_IGNORED);
@@ -168,7 +117,7 @@ void HdCyclesDisplayDriver::flush()
     glWaitSync((GLsync)gl_render_sync_, 0, GL_TIMEOUT_IGNORED);
   }
 
-  gl_context_disable();
+  graphics_interop_deactivate();
 }
 
 half4 *HdCyclesDisplayDriver::map_texture_buffer()
@@ -208,12 +157,25 @@ DisplayDriver::GraphicsInterop HdCyclesDisplayDriver::graphics_interop_get()
 
 void HdCyclesDisplayDriver::graphics_interop_activate()
 {
-  gl_context_enable();
+  mutex_.lock();
+
+#ifdef _WIN32
+  // Do not change context if this is called in the main thread
+  if (wglGetCurrentContext() == nullptr) {
+    TF_VERIFY(wglMakeCurrent((HDC)hdc_, (HGLRC)gl_context_));
+  }
+#endif
 }
 
 void HdCyclesDisplayDriver::graphics_interop_deactivate()
 {
-  gl_context_disable();
+#ifdef _WIN32
+  if (wglGetCurrentContext() == gl_context_) {
+    TF_VERIFY(wglMakeCurrent(nullptr, nullptr));
+  }
+#endif
+
+  mutex_.unlock();
 }
 
 void HdCyclesDisplayDriver::clear()
@@ -230,12 +192,6 @@ void HdCyclesDisplayDriver::draw(const Params &params)
     return;
   }
 
-  if (!renderBuffer->IsResourceUsed()) {
-    return;
-  }
-
-  gl_context_create();
-
   // Cycles 'DisplayDriver' only supports 'half4' format
   TF_VERIFY(renderBuffer->GetFormat() == HdFormatFloat16Vec4);
 
@@ -275,6 +231,7 @@ void HdCyclesDisplayDriver::draw(const Params &params)
   glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
 
   gl_render_sync_ = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+
   glFlush();
 
   need_update_ = false;

intern/cycles/hydra/display_driver.h

@@ -38,11 +38,6 @@ class HdCyclesDisplayDriver final : public CCL_NS::DisplayDriver {
 
   void draw(const Params &params) override;
 
-  void gl_context_create();
-  bool gl_context_enable();
-  void gl_context_disable();
-  void gl_context_dispose();
-
   HdCyclesSession *const _renderParam;
   Hgi *const _hgi;
 
@@ -50,6 +45,7 @@ class HdCyclesDisplayDriver final : public CCL_NS::DisplayDriver {
   void *hdc_ = nullptr;
   void *gl_context_ = nullptr;
 #endif
+
   CCL_NS::thread_mutex mutex_;
 
   PXR_NS::HgiTextureHandle texture_;

intern/cycles/hydra/file_reader.cpp

@@ -1,125 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0
- * Copyright 2011-2022 Blender Foundation */
-
-#include "hydra/file_reader.h"
-#include "hydra/camera.h"
-#include "hydra/render_delegate.h"
-
-#include "util/path.h"
-#include "util/unique_ptr.h"
-
-#include "scene/scene.h"
-
-#include <pxr/base/plug/registry.h>
-#include <pxr/imaging/hd/dirtyList.h>
-#include <pxr/imaging/hd/renderDelegate.h>
-#include <pxr/imaging/hd/renderIndex.h>
-#include <pxr/imaging/hd/rprimCollection.h>
-#include <pxr/imaging/hd/task.h>
-#include <pxr/usd/usd/stage.h>
-#include <pxr/usd/usdGeom/camera.h>
-#include <pxr/usd/usdGeom/metrics.h>
-#include <pxr/usdImaging/usdImaging/delegate.h>
-
-HDCYCLES_NAMESPACE_OPEN_SCOPE
-
-/* Dummy task whose only purpose is to provide render tag tokens to the render index. */
-class DummyHdTask : public HdTask {
- public:
-  DummyHdTask(HdSceneDelegate *delegate, SdfPath const &id)
-      : HdTask(id), tags({HdRenderTagTokens->geometry, HdRenderTagTokens->render})
-  {
-  }
-
- protected:
-  void Sync(HdSceneDelegate *delegate, HdTaskContext *ctx, HdDirtyBits *dirtyBits) override
-  {
-  }
-
-  void Prepare(HdTaskContext *ctx, HdRenderIndex *render_index) override
-  {
-  }
-
-  void Execute(HdTaskContext *ctx) override
-  {
-  }
-
-  const TfTokenVector &GetRenderTags() const override
-  {
-    return tags;
-  }
-
-  TfTokenVector tags;
-};
-
-void HdCyclesFileReader::read(Session *session, const char *filepath, const bool use_camera)
-{
-  /* Initialize USD. */
-  PlugRegistry::GetInstance().RegisterPlugins(path_get("usd"));
-
-  /* Open Stage. */
-  UsdStageRefPtr stage = UsdStage::Open(filepath);
-  if (!stage) {
-    fprintf(stderr, "%s read error\n", filepath);
-    return;
-  }
-
-  /* Init paths. */
-  SdfPath root_path = SdfPath::AbsoluteRootPath();
-  SdfPath task_path("/_hdCycles/DummyHdTask");
-
-  /* Create render delegate. */
-  HdRenderSettingsMap settings_map;
-  settings_map.insert(std::make_pair(HdCyclesRenderSettingsTokens->stageMetersPerUnit,
-                                     VtValue(UsdGeomGetStageMetersPerUnit(stage))));
-
-  HdCyclesDelegate render_delegate(settings_map, session, true);
-
-  /* Create render index and scene delegate. */
-  unique_ptr<HdRenderIndex> render_index(HdRenderIndex::New(&render_delegate, {}));
-  unique_ptr<UsdImagingDelegate> scene_delegate = make_unique<UsdImagingDelegate>(
-      render_index.get(), root_path);
-
-  /* Add render tags and collection to render index. */
-  HdRprimCollection collection(HdTokens->geometry, HdReprSelector(HdReprTokens->smoothHull));
-  collection.SetRootPath(root_path);
-
-  render_index->InsertTask<DummyHdTask>(scene_delegate.get(), task_path);
-
-#if PXR_VERSION < 2111
-  HdDirtyListSharedPtr dirty_list = std::make_shared<HdDirtyList>(collection,
-                                                                  *(render_index.get()));
-  render_index->EnqueuePrimsToSync(dirty_list, collection);
-#else
-  render_index->EnqueueCollectionToSync(collection);
-#endif
-
-  /* Create prims. */
-  const UsdPrim &stage_root = stage->GetPseudoRoot();
-  scene_delegate->Populate(stage_root.GetStage()->GetPrimAtPath(root_path), {});
-
-  /* Sync prims. */
-  HdTaskContext task_context;
-  HdTaskSharedPtrVector tasks;
-  tasks.push_back(render_index->GetTask(task_path));
-
-  render_index->SyncAll(&tasks, &task_context);
-  render_delegate.CommitResources(&render_index->GetChangeTracker());
-
-  /* Use first camera in stage.
-   * TODO: get camera from UsdRender if available. */
-  if (use_camera) {
-    for (UsdPrim const &prim : stage->Traverse()) {
-      if (prim.IsA<UsdGeomCamera>()) {
-        HdSprim *sprim = render_index->GetSprim(HdPrimTypeTokens->camera, prim.GetPath());
-        if (sprim) {
-          HdCyclesCamera *camera = dynamic_cast<HdCyclesCamera *>(sprim);
-          camera->ApplyCameraSettings(render_delegate.GetRenderParam(), session->scene->camera);
-          break;
-        }
-      }
-    }
-  }
-}
-
-HDCYCLES_NAMESPACE_CLOSE_SCOPE

intern/cycles/hydra/file_reader.h

@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0
- * Copyright 2011-2022 Blender Foundation */
-
-#pragma once
-
-#include "hydra/config.h"
-
-#include "session/session.h"
-
-HDCYCLES_NAMESPACE_OPEN_SCOPE
-
-class HdCyclesFileReader {
- public:
-  static void read(Session *session, const char *filepath, const bool use_camera = true);
-};
-
-HDCYCLES_NAMESPACE_CLOSE_SCOPE

intern/cycles/hydra/geometry.inl

@@ -192,16 +192,11 @@ void HdCyclesGeometry<Base, CyclesBase>::Finalize(HdRenderParam *renderParam)
   }
 
   const SceneLock lock(renderParam);
-  const bool keep_nodes = static_cast<const HdCyclesSession *>(renderParam)->keep_nodes;
 
-  if (!keep_nodes) {
-    lock.scene->delete_node(_geom);
-  }
+  lock.scene->delete_node(_geom);
   _geom = nullptr;
 
-  if (!keep_nodes) {
-    lock.scene->delete_nodes(set<Object *>(_instances.begin(), _instances.end()));
-  }
+  lock.scene->delete_nodes(set<Object *>(_instances.begin(), _instances.end()));
   _instances.clear();
   _instances.shrink_to_fit();
 }

intern/cycles/hydra/light.cpp

@@ -352,12 +352,8 @@ void HdCyclesLight::Finalize(HdRenderParam *renderParam)
   }
 
   const SceneLock lock(renderParam);
-  const bool keep_nodes = static_cast<const HdCyclesSession *>(renderParam)->keep_nodes;
-
-  if (!keep_nodes) {
-    lock.scene->delete_node(_light);
-  }
 
+  lock.scene->delete_node(_light);
   _light = nullptr;
 }