Merge branch 'master' into node-group-single-socket-nodes

Changes the default group input/output nodes in groups to show only
a single socket. This is more convenient for keeping connections short
and put parameters closer to where they are used inside a group.

For input nodes this is purely a UI feature: they can already be
duplicated and unused sockets can be hidden (ctrl+h). The patch only
makes this the default setup of input nodes by providing all inputs
separately in the "Add Node" menu.

For output nodes the situation requires some functional changes,
because outputs have to be unique.

The "virtual" extension socket on group input/output nodes is now
disabled by default, since it adds a lot of visual noise without saving
much work (see discussion in T68733). The feature can be enabled with
a per-node flag.

Todo:
- [ ] Implement unique output handling across different node systems.

Differential Revision: https://developer.blender.org/D11853

CMakeLists.txt

@@ -110,10 +110,6 @@ if(POLICY CMP0074)
   cmake_policy(SET CMP0074 NEW)
 endif()
 
-# Install CODE|SCRIPT allow the use of generator expressions.
-if(POLICY CMP0087)
-  cmake_policy(SET CMP0087 NEW)
-endif()
 #-----------------------------------------------------------------------------
 # Load some macros.
 include(build_files/cmake/macros.cmake)
@@ -221,7 +217,7 @@ if(UNIX AND NOT (APPLE OR HAIKU))
   option(WITH_GHOST_X11 "Enable building Blender against X11 for windowing" ON)
   mark_as_advanced(WITH_GHOST_X11)
 
-  option(WITH_GHOST_WAYLAND "Enable building Blender against Wayland for windowing (under development)" OFF)
+  option(WITH_GHOST_WAYLAND "Enable building Blender against Wayland for windowing" ON)
   mark_as_advanced(WITH_GHOST_WAYLAND)
 endif()
 
@@ -403,33 +399,31 @@ option(WITH_CYCLES_CUDA_BINARIES    "Build Cycles CUDA binaries" OFF)
 option(WITH_CYCLES_CUBIN_COMPILER   "Build cubins with nvrtc based compiler instead of nvcc" OFF)
 option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF)
 mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
-set(CYCLES_TEST_DEVICES CPU CACHE STRING "Run regression tests on the specified device types (CPU CUDA OPTIX)" )
+set(CYCLES_TEST_DEVICES CPU CACHE STRING "Run regression tests on the specified device types (CPU CUDA OPTIX OPENCL)" )
 set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 sm_86 compute_75 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 unset(PLATFORM_DEFAULT)
-option(WITH_CYCLES_LOGGING      "Build Cycles with logging support" ON)
-option(WITH_CYCLES_DEBUG_NAN    "Build Cycles with additional asserts for detecting NaNs and invalid values" OFF)
+option(WITH_CYCLES_LOGGING  "Build Cycles with logging support" ON)
+option(WITH_CYCLES_DEBUG    "Build Cycles with extra debug capabilities" OFF)
 option(WITH_CYCLES_NATIVE_ONLY  "Build Cycles with native kernel only (which fits current CPU, use for development only)" OFF)
 option(WITH_CYCLES_KERNEL_ASAN  "Build Cycles kernels with address sanitizer when WITH_COMPILER_ASAN is on, even if it's very slow" OFF)
 mark_as_advanced(WITH_CYCLES_KERNEL_ASAN)
 mark_as_advanced(WITH_CYCLES_CUBIN_COMPILER)
 mark_as_advanced(WITH_CYCLES_LOGGING)
-mark_as_advanced(WITH_CYCLES_DEBUG_NAN)
+mark_as_advanced(WITH_CYCLES_DEBUG)
 mark_as_advanced(WITH_CYCLES_NATIVE_ONLY)
 
 option(WITH_CYCLES_DEVICE_CUDA              "Enable Cycles CUDA compute support" ON)
-option(WITH_CYCLES_DEVICE_OPTIX             "Enable Cycles OptiX support" ON)
-option(WITH_CYCLES_DEVICE_HIP               "Enable Cycles HIP support" OFF)
-mark_as_advanced(WITH_CYCLES_DEVICE_HIP)
+option(WITH_CYCLES_DEVICE_OPTIX             "Enable Cycles OptiX support" OFF)
+option(WITH_CYCLES_DEVICE_OPENCL            "Enable Cycles OpenCL compute support" ON)
+option(WITH_CYCLES_NETWORK              "Enable Cycles compute over network support (EXPERIMENTAL and unfinished)" OFF)
 mark_as_advanced(WITH_CYCLES_DEVICE_CUDA)
+mark_as_advanced(WITH_CYCLES_DEVICE_OPENCL)
+mark_as_advanced(WITH_CYCLES_NETWORK)
 
 option(WITH_CUDA_DYNLOAD "Dynamically load CUDA libraries at runtime" ON)
 mark_as_advanced(WITH_CUDA_DYNLOAD)
 
-# Draw Manager
-option(WITH_DRAW_DEBUG "Add extra debug capabilities to Draw Manager" OFF)
-mark_as_advanced(WITH_DRAW_DEBUG)
-
 # LLVM
 option(WITH_LLVM                    "Use LLVM" OFF)
 if(APPLE)
@@ -610,6 +604,12 @@ if(WIN32)
   option(WITH_WINDOWS_FIND_MODULES "Use find_package to locate libraries" OFF)
   mark_as_advanced(WITH_WINDOWS_FIND_MODULES)
 
+  option(WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS "Organize the visual studio projects according to source folder structure." ON)
+  mark_as_advanced(WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS)
+
+  option(WINDOWS_USE_VISUAL_STUDIO_SOURCE_FOLDERS "Organize the source files in filters matching the source folders." ON)
+  mark_as_advanced(WINDOWS_USE_VISUAL_STUDIO_SOURCE_FOLDERS)
+
   option(WINDOWS_PYTHON_DEBUG "Include the files needed for debugging python scripts with visual studio 2017+." OFF)
   mark_as_advanced(WINDOWS_PYTHON_DEBUG)
 
@@ -627,18 +627,6 @@ if(WIN32)
 
 endif()
 
-if(WIN32 OR XCODE)
-  option(IDE_GROUP_SOURCES_IN_FOLDERS "Organize the source files in filters matching the source folders." ON)
-  mark_as_advanced(IDE_GROUP_SOURCES_IN_FOLDERS)
-
-  option(IDE_GROUP_PROJECTS_IN_FOLDERS "Organize the projects according to source folder structure." ON)
-  mark_as_advanced(IDE_GROUP_PROJECTS_IN_FOLDERS)
-
-  if (IDE_GROUP_PROJECTS_IN_FOLDERS)
-    set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-  endif()
-endif()
-
 if(UNIX)
   # See WITH_WINDOWS_SCCACHE for Windows.
   option(WITH_COMPILER_CCACHE "Use ccache to improve rebuild times (Works with Ninja, Makefiles and Xcode)" OFF)
@@ -823,11 +811,6 @@ if(NOT WITH_CUDA_DYNLOAD)
   endif()
 endif()
 
-if(WITH_CYCLES_DEVICE_HIP)
-  # Currently HIP must be dynamically loaded, this may change in future toolkits
-  set(WITH_HIP_DYNLOAD ON)
-endif()
-
 #-----------------------------------------------------------------------------
 # Check check if submodules are cloned
 
@@ -1601,9 +1584,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
   ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter)
 
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
-  # Using C++20 features while having C++17 as the project language isn't allowed by MSVC.
-  ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_CXX20_DESIGNATOR -Wc++20-designator)
-
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare)
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_UNKNOWN_PRAGMAS     -Wno-unknown-pragmas)
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_CHAR_SUBSCRIPTS     -Wno-char-subscripts)
@@ -1857,9 +1837,6 @@ elseif(WITH_CYCLES_STANDALONE)
   if(WITH_CUDA_DYNLOAD)
     add_subdirectory(extern/cuew)
   endif()
-  if(WITH_HIP_DYNLOAD)
-    add_subdirectory(extern/hipew)
-  endif()
   if(NOT WITH_SYSTEM_GLEW)
     add_subdirectory(extern/glew)
   endif()

GNUmakefile

@@ -63,7 +63,7 @@ Package Targets
 
    * package_debian:    Build a debian package.
    * package_pacman:    Build an arch linux pacman package.
-   * package_archive:   Build an archive package.
+   * package_archive:	Build an archive package.
 
 Testing Targets
    Not associated with building Blender.
@@ -167,7 +167,7 @@ endef
 
 # This makefile is not meant for Windows
 ifeq ($(OS),Windows_NT)
-	$(error On Windows, use "cmd //c make.bat" instead of "make")
+    $(error On Windows, use "cmd //c make.bat" instead of "make")
 endif
 
 # System Vars
@@ -379,7 +379,7 @@ deps: .FORCE
 
 	@cmake -H"$(DEPS_SOURCE_DIR)" \
 	       -B"$(DEPS_BUILD_DIR)" \
-	       -DHARVEST_TARGET=$(DEPS_INSTALL_DIR)
+		   -DHARVEST_TARGET=$(DEPS_INSTALL_DIR)
 
 	@echo
 	@echo Building dependencies ...
@@ -456,8 +456,7 @@ project_eclipse: .FORCE
 check_cppcheck: .FORCE
 	$(CMAKE_CONFIG)
 	cd "$(BUILD_DIR)" ; \
-	$(PYTHON) \
-	    "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py" 2> \
+	$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py" 2> \
 	    "$(BLENDER_DIR)/check_cppcheck.txt"
 	@echo "written: check_cppcheck.txt"
 
@@ -519,9 +518,8 @@ source_archive: .FORCE
 	python3 ./build_files/utils/make_source_archive.py
 
 source_archive_complete: .FORCE
-	cmake \
-	    -S "$(BLENDER_DIR)/build_files/build_environment" -B"$(BUILD_DIR)/source_archive" \
-	    -DCMAKE_BUILD_TYPE_INIT:STRING=$(BUILD_TYPE) -DPACKAGE_USE_UPSTREAM_SOURCES=OFF
+	cmake -S "$(BLENDER_DIR)/build_files/build_environment" -B"$(BUILD_DIR)/source_archive" \
+		-DCMAKE_BUILD_TYPE_INIT:STRING=$(BUILD_TYPE) -DPACKAGE_USE_UPSTREAM_SOURCES=OFF
 # This assumes CMake is still using a default `PACKAGE_DIR` variable:
 	python3 ./build_files/utils/make_source_archive.py --include-packages "$(BUILD_DIR)/source_archive/packages"
 
@@ -529,11 +527,9 @@ source_archive_complete: .FORCE
 INKSCAPE_BIN?="inkscape"
 icons: .FORCE
 	BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \
-	    "$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
-	INKSCAPE_BIN=$(INKSCAPE_BIN) \
-	    "$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
-	INKSCAPE_BIN=$(INKSCAPE_BIN) \
-	    "$(BLENDER_DIR)/release/datafiles/alert_icons_update.py"
+		"$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
+	BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \
+		"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
 
 icons_geom: .FORCE
 	BLENDER_BIN=$(BLENDER_BIN) \
@@ -547,7 +543,7 @@ update_code: .FORCE
 
 format: .FORCE
 	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)
+		$(PYTHON) source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
 
 
 # -----------------------------------------------------------------------------
@@ -557,9 +553,8 @@ format: .FORCE
 # Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
 doc_py: .FORCE
 	ASAN_OPTIONS=halt_on_error=0:${ASAN_OPTIONS} \
-	$(BLENDER_BIN) \
-	    --background -noaudio --factory-startup \
-	    --python doc/python_api/sphinx_doc_gen.py
+	$(BLENDER_BIN) --background -noaudio --factory-startup \
+		--python doc/python_api/sphinx_doc_gen.py
 	sphinx-build -b html -j $(NPROCS) doc/python_api/sphinx-in doc/python_api/sphinx-out
 	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/index.html'"
 
@@ -568,9 +563,8 @@ doc_doxy: .FORCE
 	@echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
 
 doc_dna: .FORCE
-	$(BLENDER_BIN) \
-	    --background -noaudio --factory-startup \
-	    --python doc/blender_file_format/BlendFileDnaExporter_25.py
+	$(BLENDER_BIN) --background -noaudio --factory-startup \
+		--python doc/blender_file_format/BlendFileDnaExporter_25.py
 	@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
 
 doc_man: .FORCE

build_files/build_environment/CMakeLists.txt

@@ -82,11 +82,7 @@ if(UNIX)
 endif()
 include(cmake/openimageio.cmake)
 include(cmake/tiff.cmake)
-if(WIN32)
-  include(cmake/flexbison.cmake)
-elseif(UNIX AND NOT APPLE)
-  include(cmake/flex.cmake)
-endif()
+include(cmake/flexbison.cmake)
 include(cmake/osl.cmake)
 include(cmake/tbb.cmake)
 include(cmake/openvdb.cmake)

build_files/build_environment/cmake/download.cmake

@@ -93,4 +93,3 @@ download_source(GMP)
 download_source(POTRACE)
 download_source(HARU)
 download_source(ZSTD)
-download_source(FLEX)

build_files/build_environment/cmake/ffmpeg.cmake

@@ -30,7 +30,6 @@ if(WIN32)
     --enable-w32threads
     --disable-pthreads
     --enable-libopenjpeg
-    --disable-mediafoundation
   )
   if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
     set(FFMPEG_EXTRA_FLAGS

build_files/build_environment/cmake/flex.cmake

@@ -1,28 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-ExternalProject_Add(external_flex
-  URL file://${PACKAGE_DIR}/${FLEX_FILE}
-  URL_HASH ${FLEX_HASH_TYPE}=${FLEX_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/flex
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flex/src/external_flex/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/flex
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flex/src/external_flex/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flex/src/external_flex/ && make install
-  INSTALL_DIR ${LIBDIR}/flex
-)

build_files/build_environment/cmake/harvest.cmake

@@ -106,7 +106,6 @@ harvest(llvm/include llvm/include "*")
 harvest(llvm/bin llvm/bin "llvm-config")
 harvest(llvm/lib llvm/lib "libLLVM*.a")
 harvest(llvm/lib llvm/lib "libclang*.a")
-harvest(llvm/lib/clang llvm/lib/clang "*.h")
 if(APPLE)
   harvest(openmp/lib openmp/lib "*")
   harvest(openmp/include openmp/include "*.h")

build_files/build_environment/cmake/ispc.cmake

@@ -35,7 +35,6 @@ elseif(APPLE)
   else()
     set(ISPC_EXTRA_ARGS_APPLE
       -DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison
-      -DFLEX_EXECUTABLE=/usr/local/opt/flex/bin/flex
       -DARM_ENABLED=Off
     )
   endif()
@@ -44,7 +43,6 @@ elseif(UNIX)
     -DCMAKE_C_COMPILER=${LIBDIR}/llvm/bin/clang
     -DCMAKE_CXX_COMPILER=${LIBDIR}/llvm/bin/clang++
     -DARM_ENABLED=Off
-    -DFLEX_EXECUTABLE=${LIBDIR}/flex/bin/flex
   )
 endif()
 
@@ -84,9 +82,4 @@ if(WIN32)
     external_ispc
     external_flexbison
   )
-elseif(UNIX AND NOT APPLE)
-  add_dependencies(
-    external_ispc
-    external_flex
-  )
 endif()

build_files/build_environment/cmake/llvm.cmake

@@ -66,11 +66,7 @@ ExternalProject_Add(ll
 
 if(MSVC)
   if(BUILD_MODE STREQUAL Release)
-    set(LLVM_HARVEST_COMMAND
-      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib ${HARVEST_TARGET}/llvm/lib &&
-      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/include ${HARVEST_TARGET}/llvm/include &&
-      ${CMAKE_COMMAND} -E copy ${LIBDIR}/llvm/bin/clang-format.exe ${HARVEST_TARGET}/llvm/bin/clang-format.exe
-    )
+    set(LLVM_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/ ${HARVEST_TARGET}/llvm/ )
   else()
     set(LLVM_HARVEST_COMMAND
       ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&

build_files/build_environment/cmake/openimagedenoise.cmake

@@ -45,6 +45,7 @@ ExternalProject_Add(external_openimagedenoise
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OIDN_HASH_TYPE}=${OIDN_HASH}
   PREFIX ${BUILD_DIR}/openimagedenoise
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimagedenoise/src/external_openimagedenoise < ${PATCH_DIR}/oidn.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimagedenoise ${DEFAULT_CMAKE_FLAGS} ${OIDN_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/openimagedenoise
 )

build_files/build_environment/cmake/openmp.cmake

@@ -16,20 +16,15 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-if(APPLE)
-  set(OPENMP_PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openmp/src/external_openmp < ${PATCH_DIR}/openmp.diff)
-else()
-  set(OPENMP_PATCH_COMMAND)
-endif()
 
 ExternalProject_Add(external_openmp
   URL file://${PACKAGE_DIR}/${OPENMP_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENMP_HASH_TYPE}=${OPENMP_HASH}
   PREFIX ${BUILD_DIR}/openmp
-  PATCH_COMMAND ${OPENMP_PATCH_COMMAND}
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openmp/src/external_openmp < ${PATCH_DIR}/openmp.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmp ${DEFAULT_CMAKE_FLAGS}
-  INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @rpath/libomp.dylib runtime/src/libomp.dylib && make install
+  INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @executable_path/../Resources/lib/libomp.dylib runtime/src/libomp.dylib && make install
   INSTALL_DIR ${LIBDIR}/openmp
 )
 

build_files/build_environment/cmake/osl.cmake

@@ -20,10 +20,12 @@ 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)
+  SET(OSL_PLATFORM_FLAGS -DLINKSTATIC=ON)
 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}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
+  SET(OSL_PLATFORM_FLAGS)
 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")
@@ -49,13 +51,12 @@ set(OSL_EXTRA_ARGS
   -DOpenImageIO_ROOT=${LIBDIR}/openimageio/
   -DOSL_BUILD_TESTS=OFF
   -DOSL_BUILD_MATERIALX=OFF
-  -DPNG_ROOT=${LIBDIR}/png
   -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
   ${OSL_FLEX_BISON}
   -DCMAKE_CXX_STANDARD_LIBRARIES=${OSL_CMAKE_CXX_STANDARD_LIBRARIES}
   -DBUILD_SHARED_LIBS=OFF
-  -DLINKSTATIC=ON
+  ${OSL_PLATFORM_FLAGS}
   -DOSL_BUILD_PLUGINS=OFF
   -DSTOP_ON_WARNING=OFF
   -DUSE_LLVM_BITCODE=OFF
@@ -68,9 +69,13 @@ set(OSL_EXTRA_ARGS
   ${OSL_SIMD_FLAGS}
   -Dpugixml_ROOT=${LIBDIR}/pugixml
   -DUSE_PYTHON=OFF
-  -DCMAKE_CXX_STANDARD=14
 )
 
+# Apple arm64 uses LLVM 11, LLVM 10+ requires C++14
+if (APPLE AND "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
+  list(APPEND OSL_EXTRA_ARGS -DCMAKE_CXX_STANDARD=14)
+endif()
+
 ExternalProject_Add(external_osl
   URL file://${PACKAGE_DIR}/${OSL_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
@@ -88,20 +93,10 @@ add_dependencies(
   ll
   external_openexr
   external_zlib
+  external_flexbison
   external_openimageio
   external_pugixml
 )
-if(WIN32)
-  add_dependencies(
-    external_osl
-    external_flexbison
-  )
-elseif(UNIX AND NOT APPLE)
-  add_dependencies(
-    external_osl
-    external_flex
-  )
-endif()
 
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)

build_files/build_environment/cmake/png.cmake

@@ -23,7 +23,7 @@ set(PNG_EXTRA_ARGS
 )
 
 if(BLENDER_PLATFORM_ARM)
-  set(PNG_EXTRA_ARGS ${PNG_EXTRA_ARGS} -DPNG_HARDWARE_OPTIMIZATIONS=ON -DPNG_ARM_NEON=on -DCMAKE_SYSTEM_PROCESSOR="aarch64")
+  set(PNG_EXTRA_ARGS ${PNG_EXTRA_ARGS} -DPNG_HARDWARE_OPTIMIZATIONS=ON -DPNG_ARM_NEON=ON -DCMAKE_SYSTEM_PROCESSOR="aarch64")
 endif()
 
 ExternalProject_Add(external_png

build_files/build_environment/cmake/versions.cmake

@@ -152,28 +152,35 @@ set(OPENCOLORIO_HASH 1a2e3478b6cd9a1549f24e1b2205e3f0)
 set(OPENCOLORIO_HASH_TYPE MD5)
 set(OPENCOLORIO_FILE OpenColorIO-${OPENCOLORIO_VERSION}.tar.gz)
 
-set(LLVM_VERSION 12.0.0)
-set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz)
-set(LLVM_HASH 5a4fab4d7fc84aefffb118ac2c8a4fc0)
-set(LLVM_HASH_TYPE MD5)
-set(LLVM_FILE llvm-project-${LLVM_VERSION}.src.tar.xz)
+if(BLENDER_PLATFORM_ARM)
+  # Newer version required by ISPC with arm support.
+  set(LLVM_VERSION 11.0.1)
+  set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz)
+  set(LLVM_HASH e700af40ab83463e4e9ab0ba3708312e)
+  set(LLVM_HASH_TYPE MD5)
+  set(LLVM_FILE llvm-project-${LLVM_VERSION}.src.tar.xz)
 
-if(APPLE)
-  # Cloth physics test is crashing due to this bug:
-  # https://bugs.llvm.org/show_bug.cgi?id=50579
   set(OPENMP_VERSION 9.0.1)
+  set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${OPENMP_VERSION}/openmp-${OPENMP_VERSION}.src.tar.xz)
   set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf)
+  set(OPENMP_HASH_TYPE MD5)
+  set(OPENMP_FILE openmp-${OPENMP_VERSION}.src.tar.xz)
 else()
-  set(OPENMP_VERSION ${LLVM_VERSION})
-  set(OPENMP_HASH ac48ce3e4582ccb82f81ab59eb3fc9dc)
-endif()
-set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${OPENMP_VERSION}/openmp-${OPENMP_VERSION}.src.tar.xz)
-set(OPENMP_HASH_TYPE MD5)
-set(OPENMP_FILE openmp-${OPENMP_VERSION}.src.tar.xz)
+  set(LLVM_VERSION 9.0.1)
+  set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.tar.xz)
+  set(LLVM_HASH b4268e733dfe352960140dc07ef2efcb)
+  set(LLVM_HASH_TYPE MD5)
+  set(LLVM_FILE llvm-project-${LLVM_VERSION}.tar.xz)
 
-set(OPENIMAGEIO_VERSION 2.2.15.1)
+  set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz)
+  set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf)
+  set(OPENMP_HASH_TYPE MD5)
+  set(OPENMP_FILE openmp-${LLVM_VERSION}.src.tar.xz)
+endif()
+
+set(OPENIMAGEIO_VERSION 2.1.15.0)
 set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.tar.gz)
-set(OPENIMAGEIO_HASH 3db5c5f0b3dc91597c75e5df09eb9072)
+set(OPENIMAGEIO_HASH f03aa5e3ac4795af04771ee4146e9832)
 set(OPENIMAGEIO_HASH_TYPE MD5)
 set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_VERSION}.tar.gz)
 
@@ -183,9 +190,9 @@ set(TIFF_HASH 2165e7aba557463acc0664e71a3ed424)
 set(TIFF_HASH_TYPE MD5)
 set(TIFF_FILE tiff-${TIFF_VERSION}.tar.gz)
 
-set(OSL_VERSION 1.11.14.1)
+set(OSL_VERSION 1.11.10.0)
 set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz)
-set(OSL_HASH 1abd7ce40481771a9fa937f19595d2f2)
+set(OSL_HASH dfdc23597aeef083832cbada62211756)
 set(OSL_HASH_TYPE MD5)
 set(OSL_FILE OpenShadingLanguage-${OSL_VERSION}.tar.gz)
 
@@ -363,18 +370,12 @@ set(PUGIXML_HASH 0c208b0664c7fb822bf1b49ad035e8fd)
 set(PUGIXML_HASH_TYPE MD5)
 set(PUGIXML_FILE pugixml-${PUGIXML_VERSION}.tar.gz)
 
-set(FLEXBISON_VERSION 2.5.24)
+set(FLEXBISON_VERSION 2.5.5)
 set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison/win_flex_bison-${FLEXBISON_VERSION}.zip)
-set(FLEXBISON_HASH 6b549d43e34ece0e8ed05af92daa31c4)
+set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)
 set(FLEXBISON_HASH_TYPE MD5)
 set(FLEXBISON_FILE win_flex_bison-${FLEXBISON_VERSION}.zip)
 
-set(FLEX_VERSION 2.6.4)
-set(FLEX_URI https://github.com/westes/flex/releases/download/v${FLEX_VERSION}/flex-${FLEX_VERSION}.tar.gz)
-set(FLEX_HASH 2882e3179748cc9f9c23ec593d6adc8d)
-set(FLEX_HASH_TYPE MD5)
-set(FLEX_FILE flex-${FLEX_VERSION}.tar.gz)
-
 # Libraries to keep Python modules static on Linux.
 
 # NOTE: bzip.org domain does no longer belong to BZip 2 project, so we download
@@ -431,9 +432,9 @@ set(USD_HASH 1dd1e2092d085ed393c1f7c450a4155a)
 set(USD_HASH_TYPE MD5)
 set(USD_FILE usd-v${USD_VERSION}.tar.gz)
 
-set(OIDN_VERSION 1.4.1)
+set(OIDN_VERSION 1.4.0)
 set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz)
-set(OIDN_HASH df4007b0ab93b1c41cdf223b075d01c0)
+set(OIDN_HASH 421824019becc5b664a22a2b98332bc5)
 set(OIDN_HASH_TYPE MD5)
 set(OIDN_FILE oidn-${OIDN_VERSION}.src.tar.gz)
 
@@ -443,10 +444,10 @@ set(LIBGLU_HASH 151aef599b8259efe9acd599c96ea2a3)
 set(LIBGLU_HASH_TYPE MD5)
 set(LIBGLU_FILE glu-${LIBGLU_VERSION}.tar.xz)
 
-set(MESA_VERSION 21.1.5)
+set(MESA_VERSION 20.3.4)
 set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa/mesa-${MESA_VERSION}.tar.xz)
-set(MESA_HASH 022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d)
-set(MESA_HASH_TYPE SHA256)
+set(MESA_HASH 556338446aef8ae947a789b3e0b5e056)
+set(MESA_HASH_TYPE MD5)
 set(MESA_FILE mesa-${MESA_VERSION}.tar.xz)
 
 set(NASM_VERSION 2.15.02)
@@ -467,11 +468,19 @@ 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.16.0)
-set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz)
-set(ISPC_HASH 2e3abedbc0ea9aaec17d6562c632454d)
-set(ISPC_HASH_TYPE MD5)
-set(ISPC_FILE ispc-${ISPC_VERSION}.tar.gz)
+if(BLENDER_PLATFORM_ARM)
+  # Unreleased version with macOS arm support.
+  set(ISPC_URI https://github.com/ispc/ispc/archive/f5949c055eb9eeb93696978a3da4bfb3a6a30b35.zip)
+  set(ISPC_HASH d382fea18d01dbd0cd05d9e1ede36d7d)
+  set(ISPC_HASH_TYPE MD5)
+  set(ISPC_FILE f5949c055eb9eeb93696978a3da4bfb3a6a30b35.zip)
+else()
+  set(ISPC_VERSION v1.14.1)
+  set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz)
+  set(ISPC_HASH 968fbc8dfd16a60ba4e32d2e0e03ea7a)
+  set(ISPC_HASH_TYPE MD5)
+  set(ISPC_FILE ispc-${ISPC_VERSION}.tar.gz)
+endif()
 
 set(GMP_VERSION 6.2.0)
 set(GMP_URI https://gmplib.org/download/gmp/gmp-${GMP_VERSION}.tar.xz)

build_files/build_environment/install_deps.sh

@@ -474,25 +474,25 @@ OPENEXR_FORCE_REBUILD=false
 OPENEXR_SKIP=false
 _with_built_openexr=false
 
-OIIO_VERSION="2.2.15.1"
-OIIO_VERSION_SHORT="2.2"
+OIIO_VERSION="2.1.15.0"
+OIIO_VERSION_SHORT="2.1"
 OIIO_VERSION_MIN="2.1.12"
-OIIO_VERSION_MAX="2.3.0"
+OIIO_VERSION_MAX="2.2.10"
 OIIO_FORCE_BUILD=false
 OIIO_FORCE_REBUILD=false
 OIIO_SKIP=false
 
-LLVM_VERSION="12.0.0"
-LLVM_VERSION_SHORT="12.0"
-LLVM_VERSION_MIN="11.0"
-LLVM_VERSION_MAX="13.0"
+LLVM_VERSION="9.0.1"
+LLVM_VERSION_SHORT="9.0"
+LLVM_VERSION_MIN="6.0"
+LLVM_VERSION_MAX="12.0"
 LLVM_VERSION_FOUND=""
 LLVM_FORCE_BUILD=false
 LLVM_FORCE_REBUILD=false
 LLVM_SKIP=false
 
 # OSL needs to be compiled for now!
-OSL_VERSION="1.11.14.1"
+OSL_VERSION="1.11.10.0"
 OSL_VERSION_SHORT="1.11"
 OSL_VERSION_MIN="1.11"
 OSL_VERSION_MAX="2.0"
@@ -553,7 +553,7 @@ EMBREE_FORCE_BUILD=false
 EMBREE_FORCE_REBUILD=false
 EMBREE_SKIP=false
 
-OIDN_VERSION="1.4.1"
+OIDN_VERSION="1.4.0"
 OIDN_VERSION_SHORT="1.4"
 OIDN_VERSION_MIN="1.4.0"
 OIDN_VERSION_MAX="1.5"
@@ -561,7 +561,7 @@ OIDN_FORCE_BUILD=false
 OIDN_FORCE_REBUILD=false
 OIDN_SKIP=false
 
-ISPC_VERSION="1.16.0"
+ISPC_VERSION="1.14.1"
 
 FFMPEG_VERSION="4.4"
 FFMPEG_VERSION_SHORT="4.4"
@@ -1019,7 +1019,7 @@ PRINT ""
 PYTHON_SOURCE=( "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tgz" )
 
 _boost_version_nodots=`echo "$BOOST_VERSION" | sed -r 's/\./_/g'`
-BOOST_SOURCE=( "https://boostorg.jfrog.io/artifactory/main/release/$BOOST_VERSION/source/boost_$_boost_version_nodots.tar.bz2" )
+BOOST_SOURCE=( "https://dl.bintray.com/boostorg/release/$BOOST_VERSION/source/boost_$_boost_version_nodots.tar.bz2" )
 BOOST_BUILD_MODULES="--with-system --with-filesystem --with-thread --with-regex --with-locale --with-date_time --with-wave --with-iostreams --with-python --with-program_options --with-serialization --with-atomic"
 
 TBB_SOURCE=( "https://github.com/oneapi-src/oneTBB/archive/$TBB_VERSION$TBB_VERSION_UPDATE.tar.gz" )
@@ -1129,7 +1129,7 @@ Those libraries should be available as packages in all recent distributions (opt
     * libjpeg, libpng, libtiff, [openjpeg2], [libopenal].
     * libx11, libxcursor, libxi, libxrandr, libxinerama (and other libx... as needed).
     * libwayland-client0, libwayland-cursor0, libwayland-egl1, libxkbcommon0, libdbus-1-3, libegl1 (Wayland)
-    * libsqlite3, libzstd, libbz2, libssl, libfftw3, libxml2, libtinyxml, yasm, libyaml-cpp, flex.
+    * libsqlite3, libbz2, libssl, libfftw3, libxml2, libtinyxml, yasm, libyaml-cpp.
     * libsdl2, libglew, libpugixml, libpotrace, [libgmp], [libglewmx], fontconfig, [libharu/libhpdf].\""
 
 DEPS_SPECIFIC_INFO="\"BUILDABLE DEPENDENCIES:
@@ -1447,7 +1447,9 @@ compile_Python() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "Python--$PYTHON_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -1463,9 +1465,6 @@ compile_Python() {
     INFO "If you want to force rebuild of this lib, use the --force-python option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "python-$PYTHON_VERSION_SHORT"
 
   # Extra step: install required modules with pip.
@@ -1559,7 +1558,9 @@ compile_Boost() {
          --prefix=$_inst --disable-icu boost.locale.icu=off install
     ./b2 --clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "Boost-$BOOST_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -1573,9 +1574,7 @@ compile_Boost() {
     INFO "If you want to force rebuild of this lib, use the --force-boost option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
+  # Just always run it, much simpler this way!
   run_ldconfig "boost"
 }
 
@@ -1688,7 +1687,9 @@ compile_TBB() {
 
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "TBB-$TBB_VERSION$TBB_VERSION_UPDATE failed to compile, exiting"
       exit 1
     fi
@@ -1702,9 +1703,6 @@ compile_TBB() {
     INFO "If you want to force rebuild of this lib, use the --force-tbb option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "tbb"
 }
 
@@ -1824,7 +1822,9 @@ compile_OCIO() {
 
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenColorIO-$OCIO_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -1838,9 +1838,6 @@ compile_OCIO() {
     INFO "If you want to force rebuild of this lib, use the --force-ocio option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "ocio"
 }
 
@@ -1956,7 +1953,9 @@ compile_OPENEXR() {
 
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenEXR-$OPENEXR_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -1972,9 +1971,7 @@ compile_OPENEXR() {
 
   _with_built_openexr=true
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
+  # Just always run it, much simpler this way!
   run_ldconfig "openexr"
 }
 
@@ -2115,7 +2112,9 @@ compile_OIIO() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenImageIO-$OIIO_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2129,9 +2128,7 @@ compile_OIIO() {
     INFO "If you want to force rebuild of this lib, use the --force-oiio option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
+  # Just always run it, much simpler this way!
   run_ldconfig "oiio"
 }
 
@@ -2240,7 +2237,9 @@ compile_LLVM() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "LLVM-$LLVM_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2253,10 +2252,6 @@ compile_LLVM() {
     INFO "Own LLVM-$LLVM_VERSION (CLANG included) is up to date, nothing to do!"
     INFO "If you want to force rebuild of this lib, use the --force-llvm option."
   fi
-
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
 }
 
 # ----------------------------------------------------------------------------
@@ -2321,7 +2316,6 @@ compile_OSL() {
         tar -C $SRC --transform "s,(.*/?)OpenShadingLanguage-[^/]*(.*),\1OpenShadingLanguage-$OSL_VERSION\2,x" \
             -xf $_src.tar.gz
       fi
-      patch -d $_src -p1 < $SCRIPT_DIR/patches/osl.diff
     fi
 
     cd $_src
@@ -2344,6 +2338,7 @@ compile_OSL() {
 
     cmake_d="-D CMAKE_BUILD_TYPE=Release"
     cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
+    cmake_d="$cmake_d -D BUILD_TESTING=OFF"
     cmake_d="$cmake_d -D STOP_ON_WARNING=OFF"
     cmake_d="$cmake_d -D OSL_BUILD_PLUGINS=OFF"
     cmake_d="$cmake_d -D OSL_BUILD_TESTS=OFF"
@@ -2351,10 +2346,7 @@ compile_OSL() {
     cmake_d="$cmake_d -D USE_PARTIO=OFF"
     cmake_d="$cmake_d -D OSL_BUILD_MATERIALX=OFF"
     cmake_d="$cmake_d -D USE_QT=OFF"
-    cmake_d="$cmake_d -D USE_Qt5=OFF"
     cmake_d="$cmake_d -D USE_PYTHON=OFF"
-    cmake_d="$cmake_d -D USE_PARTIO=OFF"
-    cmake_d="$cmake_d -D INSTALL_DOCS=OFF"
 
     if [ $(uname -m) != "aarch64" ]; then
       cmake_d="$cmake_d -D USE_SIMD=sse2"
@@ -2376,7 +2368,10 @@ compile_OSL() {
     fi
 
     if [ -d $INST/oiio ]; then
-      cmake_d="$cmake_d -D OpenImageIO_ROOT=$INST/oiio"
+      cmake_d="$cmake_d -D OPENIMAGEIO_ROOT_DIR=$INST/oiio"
+      # HACK! SIC!!!!
+      # Quiet incredible, but if root dir is given, path to lib is found, but not path to include...
+      cmake_d="$cmake_d -D OPENIMAGEIO_INCLUDE_DIR=$INST/oiio/include"
     fi
 
     if [ ! -z $LLVM_VERSION_FOUND ]; then
@@ -2395,7 +2390,9 @@ compile_OSL() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenShadingLanguage-$OSL_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2409,9 +2406,6 @@ compile_OSL() {
     INFO "If you want to force rebuild of this lib, use the --force-osl option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "osl"
 }
 
@@ -2512,7 +2506,9 @@ compile_OSD() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenSubdiv-$OSD_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2526,9 +2522,6 @@ compile_OSD() {
     INFO "If you want to force rebuild of this lib, use the --force-osd option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "osd"
 }
 
@@ -2618,7 +2611,9 @@ compile_BLOSC() {
 
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "Blosc-$OPENVDB_BLOSC_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2631,9 +2626,6 @@ compile_BLOSC() {
 
   magic_compile_set blosc-$OPENVDB_BLOSC_VERSION $blosc_magic
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "blosc"
 }
 
@@ -2724,7 +2716,9 @@ install_NanoVDB() {
     #~ mkdir -p $_inst
     #~ cp -r $_src/include $_inst/include
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "NanoVDB-v$OPENVDB_VERSION failed to install, exiting"
       exit 1
     fi
@@ -2736,10 +2730,6 @@ install_NanoVDB() {
   else
     INFO "Own NanoVDB-v$OPENVDB_VERSION is up to date, nothing to do!"
   fi
-
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
 }
 
 
@@ -2859,7 +2849,9 @@ compile_OPENVDB() {
     make -j$THREADS install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenVDB-$OPENVDB_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2873,9 +2865,6 @@ compile_OPENVDB() {
     INFO "If you want to force rebuild of this lib, use the --force-openvdb option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "openvdb"
 
   if [ "$WITH_NANOVDB" = true ]; then
@@ -2973,7 +2962,9 @@ compile_ALEMBIC() {
     make -j$THREADS install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "Alembic-$ALEMBIC_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2987,9 +2978,6 @@ compile_ALEMBIC() {
     INFO "If you want to force rebuild of this lib, use the --force-alembic option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "alembic"
 }
 
@@ -3074,7 +3062,9 @@ compile_USD() {
     make -j$THREADS install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "USD-$USD_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -3088,9 +3078,6 @@ compile_USD() {
     INFO "If you want to force rebuild of this lib, use the --force-usd option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "usd"
 }
 
@@ -3184,7 +3171,9 @@ compile_OpenCOLLADA() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenCOLLADA-$OPENCOLLADA_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -3197,10 +3186,6 @@ compile_OpenCOLLADA() {
     INFO "Own OpenCOLLADA-$OPENCOLLADA_VERSION is up to date, nothing to do!"
     INFO "If you want to force rebuild of this lib, use the --force-opencollada option."
   fi
-
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
 }
 
 # ----------------------------------------------------------------------------
@@ -3301,7 +3286,9 @@ compile_Embree() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "Embree-$EMBREE_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -3314,10 +3301,6 @@ compile_Embree() {
     INFO "Own Embree-$EMBREE_VERSION is up to date, nothing to do!"
     INFO "If you want to force rebuild of this lib, use the --force-embree option."
   fi
-
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
 }
 
 # ----------------------------------------------------------------------------
@@ -3380,7 +3363,9 @@ install_ISPC() {
     mkdir -p $_inst
     cp -r $_src/bin $_inst/bin
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "ISPC-v$ISPC_VERSION failed to install, exiting"
       exit 1
     fi
@@ -3393,10 +3378,6 @@ install_ISPC() {
     INFO "Own ISPC-v$ISPC_VERSION is up to date, nothing to do!"
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
-
   _ispc_path_bin=$_inst/bin
   run_ldconfig "ispc"
 }
@@ -3496,7 +3477,9 @@ compile_OIDN() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenImageDenoise-$OIDN_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -3510,9 +3493,6 @@ compile_OIDN() {
     INFO "If you want to force rebuild of this lib, use the --force-oidn option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "oidn"
 }
 
@@ -3629,7 +3609,9 @@ compile_FFmpeg() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "FFmpeg-$FFMPEG_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -3642,10 +3624,6 @@ compile_FFmpeg() {
     INFO "Own ffmpeg-$FFMPEG_VERSION is up to date, nothing to do!"
     INFO "If you want to force rebuild of this lib, use the --force-ffmpeg option."
   fi
-
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
 }
 
 # ----------------------------------------------------------------------------
@@ -3744,7 +3722,9 @@ compile_XR_OpenXR_SDK() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "XR-OpenXR-SDK-$XR_OPENXR_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -3758,9 +3738,6 @@ compile_XR_OpenXR_SDK() {
     INFO "If you want to force rebuild of this lib, use the --force-xr-openxr option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "xr-openxr-sdk"
 }
 
@@ -3867,7 +3844,7 @@ install_DEB() {
              libbz2-dev libncurses5-dev libssl-dev liblzma-dev libreadline-dev \
              libopenal-dev libglew-dev yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV \
              libsdl2-dev libfftw3-dev patch bzip2 libxml2-dev libtinyxml-dev libjemalloc-dev \
-             libgmp-dev libpugixml-dev libpotrace-dev libhpdf-dev libzstd-dev"
+             libgmp-dev libpugixml-dev libpotrace-dev libhpdf-dev"
              # libglewmx-dev  (broken in deb testing currently...)
 
   VORBIS_USE=true
@@ -4135,8 +4112,6 @@ install_DEB() {
 
 
   PRINT ""
-  # Debian OIIO includes again libopencv, without even properly dealing with this dependency...
-  OIIO_FORCE_BUILD=true
   if [ "$OIIO_SKIP" = true ]; then
     WARNING "Skipping OpenImageIO installation, as requested..."
   elif [ "$OIIO_FORCE_BUILD" = true ]; then
@@ -4539,7 +4514,7 @@ install_RPM() {
              wget ncurses-devel readline-devel $OPENJPEG_DEV openal-soft-devel \
              glew-devel yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV patch \
              libxml2-devel yaml-cpp-devel tinyxml-devel jemalloc-devel \
-             gmp-devel pugixml-devel potrace-devel libharu-devel libzstd-devel"
+             gmp-devel pugixml-devel potrace-devel libharu-devel"
 
   OPENJPEG_USE=true
   VORBIS_USE=true
@@ -5117,11 +5092,10 @@ install_ARCH() {
     BASE_DEVEL=`pacman -Sgq base-devel | sed -e 's/^gcc$/gcc-multilib/g' | paste -s -d' '`
   fi
 
-  _packages="$BASE_DEVEL git cmake fontconfig flex \
+  _packages="$BASE_DEVEL git cmake fontconfig \
              libxi libxcursor libxrandr libxinerama glew libpng libtiff wget openal \
              $OPENJPEG_DEV $VORBIS_DEV $OGG_DEV $THEORA_DEV yasm sdl2 fftw \
-             libxml2 yaml-cpp tinyxml python-requests jemalloc gmp potrace pugixml libharu \
-             zstd"
+             libxml2 yaml-cpp tinyxml python-requests jemalloc gmp potrace pugixml libharu"
 
   OPENJPEG_USE=true
   VORBIS_USE=true

build_files/build_environment/patches/ffmpeg.diff

@@ -70,18 +70,16 @@
  }
 --- a/libavcodec/rl.c
 +++ b/libavcodec/rl.c
-@@ -71,17 +71,19 @@
+@@ -71,7 +71,7 @@ av_cold void ff_rl_init(RLTable *rl,
  av_cold void ff_rl_init_vlc(RLTable *rl, unsigned static_size)
  {
      int i, q;
 -    VLC_TYPE table[1500][2] = {{0}};
 +    VLC_TYPE (*table)[2] = av_calloc(sizeof(VLC_TYPE), 1500 * 2);
      VLC vlc = { .table = table, .table_allocated = static_size };
--    av_assert0(static_size <= FF_ARRAY_ELEMS(table));
-+    av_assert0(static_size < 1500);
+     av_assert0(static_size <= FF_ARRAY_ELEMS(table));
      init_vlc(&vlc, 9, rl->n + 1, &rl->table_vlc[0][1], 4, 2, &rl->table_vlc[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC);
- 
-     for (q = 0; q < 32; q++) {
+@@ -80,8 +80,10 @@ av_cold void ff_rl_init_vlc(RLTable *rl, unsigned static_size)
          int qmul = q * 2;
          int qadd = (q - 1) | 1;
  
@@ -93,7 +91,7 @@
  
          if (q == 0) {
              qmul = 1;
-@@ -113,4 +115,5 @@
+@@ -113,4 +115,5 @@ av_cold void ff_rl_init_vlc(RLTable *rl, unsigned static_size)
              rl->rl_vlc[q][i].run   = run;
          }
      }

build_files/build_environment/patches/oidn.diff

@@ -0,0 +1,10 @@
+--- external_openimagedenoise/cmake/oidn_ispc.cmake	2021-02-15 17:29:34.000000000 +0100
++++ external_openimagedenoise/cmake/oidn_ispc.cmake2	2021-02-15 17:29:28.000000000 +0100
+@@ -98,7 +98,7 @@
+   elseif(OIDN_ARCH STREQUAL "ARM64")
+     set(ISPC_ARCHITECTURE "aarch64")
+     if(APPLE)
+-      set(ISPC_TARGET_OS "--target-os=ios")
++      set(ISPC_TARGET_OS "--target-os=macos")
+     endif()
+   endif()

build_files/build_environment/patches/openimageio.diff

@@ -34,3 +34,24 @@ diff -Naur orig/src/include/OpenImageIO/platform.h external_openimageio/src/incl
  #    include <windows.h>
  #endif
  
+diff -Naur orig/src/libutil/ustring.cpp external_openimageio/src/libutil/ustring.cpp
+--- orig/src/libutil/ustring.cpp	2020-05-11 05:43:52.000000000 +0200
++++ external_openimageio/src/libutil/ustring.cpp	2020-11-26 12:06:08.000000000 +0100
+@@ -337,6 +337,8 @@
+     // the std::string to make it point to our chars!  In such a case, the
+     // destructor will be careful not to allow a deallocation.
+ 
++    // Disable internal std::string for Apple silicon based Macs
++#if !(defined(__APPLE__) && defined(__arm64__))
+ #if defined(__GNUC__) && !defined(_LIBCPP_VERSION)                             \
+     && defined(_GLIBCXX_USE_CXX11_ABI) && _GLIBCXX_USE_CXX11_ABI
+     // NEW gcc ABI
+@@ -382,7 +384,7 @@
+         return;
+     }
+ #endif
+-
++#endif
+     // Remaining cases - just assign the internal string.  This may result
+     // in double allocation for the chars.  If you care about that, do
+     // something special for your platform, much like we did for gcc and

build_files/build_environment/patches/osl.diff

@@ -1,3 +1,18 @@
+diff -Naur OpenShadingLanguage-Release-1.9.9/src/cmake/flexbison.cmake.rej external_osl/src/cmake/flexbison.cmake.rej
+--- OpenShadingLanguage-Release-1.9.9/src/cmake/flexbison.cmake.rej	1969-12-31 17:00:00 -0700
++++ external_osl/src/cmake/flexbison.cmake.rej	2018-08-24 17:42:11 -0600
+@@ -0,0 +1,11 @@
++--- src/cmake/flexbison.cmake	2018-05-01 16:39:02 -0600
+++++ src/cmake/flexbison.cmake	2018-08-24 10:24:03 -0600
++@@ -77,7 +77,7 @@
++           DEPENDS ${${compiler_headers}}
++           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
++         ADD_CUSTOM_COMMAND ( OUTPUT ${flexoutputcxx} 
++-          COMMAND ${FLEX_EXECUTABLE} -o ${flexoutputcxx} "${CMAKE_CURRENT_SOURCE_DIR}/${flexsrc}"
+++          COMMAND ${FLEX_EXECUTABLE} ${FLEX_EXTRA_OPTIONS} -o ${flexoutputcxx} "${CMAKE_CURRENT_SOURCE_DIR}/${flexsrc}"
++           MAIN_DEPENDENCY ${flexsrc}
++           DEPENDS ${${compiler_headers}}
++           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
 diff -Naur OpenShadingLanguage-Release-1.9.9/src/include/OSL/llvm_util.h external_osl/src/include/OSL/llvm_util.h
 --- OpenShadingLanguage-Release-1.9.9/src/include/OSL/llvm_util.h	2018-05-01 16:39:02 -0600
 +++ external_osl/src/include/OSL/llvm_util.h	2018-08-25 14:05:00 -0600
@@ -48,50 +63,19 @@ 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
-@@ -80,6 +80,7 @@
-
-
- checked_find_package (ZLIB REQUIRED)  # Needed by several packages
-+checked_find_package (PNG REQUIRED)  # Needed since OIIO needs it
-
- # IlmBase & OpenEXR
- checked_find_package (OpenEXR REQUIRED
-diff -Naur external_osl_orig/src/liboslcomp/oslcomp.cpp external_osl/src/liboslcomp/oslcomp.cpp
---- external_osl_orig/src/liboslcomp/oslcomp.cpp        2021-06-01 13:44:18 -0600
-+++ external_osl/src/liboslcomp/oslcomp.cpp     2021-06-28 09:11:06 -0600
-@@ -21,6 +21,13 @@
- #if !defined(__STDC_CONSTANT_MACROS)
- #    define __STDC_CONSTANT_MACROS 1
+diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
+index 445f6400..3d468de2 100644
+--- a/src/liboslexec/llvm_util.cpp
++++ b/src/liboslexec/llvm_util.cpp
+@@ -3430,8 +3430,9 @@ LLVM_Util::call_function (llvm::Value *func, cspan<llvm::Value *> args)
+ #endif
+     //llvm_gen_debug_printf (std::string("start ") + std::string(name));
+ #if OSL_LLVM_VERSION >= 110
+-    OSL_DASSERT(llvm::isa<llvm::Function>(func));
+-    llvm::Value *r = builder().CreateCall(llvm::cast<llvm::Function>(func), llvm::ArrayRef<llvm::Value *>(args.data(), args.size()));
++    llvm::Value* r = builder().CreateCall(
++        llvm::cast<llvm::FunctionType>(func->getType()->getPointerElementType()), func,
++        llvm::ArrayRef<llvm::Value*>(args.data(), args.size()));
+ #else
+     llvm::Value *r = builder().CreateCall (func, llvm::ArrayRef<llvm::Value *>(args.data(), args.size()));
  #endif
-+
-+// clang uses CALLBACK in its templates which causes issues if it is already defined
-+#ifdef _WIN32 && defined(CALLBACK)
-+#    undef CALLBACK
-+#endif
-+
-+//
- #include <clang/Basic/TargetInfo.h>
- #include <clang/Frontend/CompilerInstance.h>
- #include <clang/Frontend/TextDiagnosticPrinter.h>

build_files/cmake/Modules/FindOptiX.cmake

@@ -33,23 +33,11 @@ FIND_PATH(OPTIX_INCLUDE_DIR
     include
 )
 
-IF(EXISTS "${OPTIX_INCLUDE_DIR}/optix.h")
-  FILE(STRINGS "${OPTIX_INCLUDE_DIR}/optix.h" _optix_version REGEX "^#define OPTIX_VERSION[ \t].*$")
-  STRING(REGEX MATCHALL "[0-9]+" _optix_version ${_optix_version})
-
-  MATH(EXPR _optix_version_major "${_optix_version} / 10000")
-  MATH(EXPR _optix_version_minor "(${_optix_version} % 10000) / 100")
-  MATH(EXPR _optix_version_patch "${_optix_version} % 100")
-
-  SET(OPTIX_VERSION "${_optix_version_major}.${_optix_version_minor}.${_optix_version_patch}")
-ENDIF()
-
 # handle the QUIETLY and REQUIRED arguments and set OPTIX_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OptiX
-    REQUIRED_VARS OPTIX_INCLUDE_DIR
-    VERSION_VAR OPTIX_VERSION)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OptiX DEFAULT_MSG
+    OPTIX_INCLUDE_DIR)
 
 IF(OPTIX_FOUND)
   SET(OPTIX_INCLUDE_DIRS ${OPTIX_INCLUDE_DIR})
@@ -57,7 +45,6 @@ ENDIF()
 
 MARK_AS_ADVANCED(
   OPTIX_INCLUDE_DIR
-  OPTIX_VERSION
 )
 
 UNSET(_optix_SEARCH_DIRS)

build_files/cmake/Modules/FindZstd.cmake

@@ -1,66 +0,0 @@
-# - Find Zstd library
-# Find the native Zstd includes and library
-# This module defines
-#  ZSTD_INCLUDE_DIRS, where to find zstd.h, Set when
-#                     ZSTD_INCLUDE_DIR is found.
-#  ZSTD_LIBRARIES, libraries to link against to use Zstd.
-#  ZSTD_ROOT_DIR, The base directory to search for Zstd.
-#                 This can also be an environment variable.
-#  ZSTD_FOUND, If false, do not try to use Zstd.
-#
-# also defined, but not for general use are
-#  ZSTD_LIBRARY, where to find the Zstd library.
-
-#=============================================================================
-# Copyright 2019 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If ZSTD_ROOT_DIR was defined in the environment, use it.
-IF(NOT ZSTD_ROOT_DIR AND NOT $ENV{ZSTD_ROOT_DIR} STREQUAL "")
-  SET(ZSTD_ROOT_DIR $ENV{ZSTD_ROOT_DIR})
-ENDIF()
-
-SET(_zstd_SEARCH_DIRS
-  ${ZSTD_ROOT_DIR}
-)
-
-FIND_PATH(ZSTD_INCLUDE_DIR
-  NAMES
-    zstd.h
-  HINTS
-    ${_zstd_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(ZSTD_LIBRARY
-  NAMES
-    zstd
-  HINTS
-    ${_zstd_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set ZSTD_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Zstd DEFAULT_MSG
-    ZSTD_LIBRARY ZSTD_INCLUDE_DIR)
-
-IF(ZSTD_FOUND)
-  SET(ZSTD_LIBRARIES ${ZSTD_LIBRARY})
-  SET(ZSTD_INCLUDE_DIRS ${ZSTD_INCLUDE_DIR})
-ENDIF()
-
-MARK_AS_ADVANCED(
-  ZSTD_INCLUDE_DIR
-  ZSTD_LIBRARY
-)

build_files/cmake/config/blender_developer.cmake

@@ -7,6 +7,7 @@
 set(WITH_ASSERT_ABORT                 ON  CACHE BOOL "" FORCE)
 set(WITH_BUILDINFO                    OFF CACHE BOOL "" FORCE)
 set(WITH_COMPILER_ASAN                ON  CACHE BOOL "" FORCE)
+set(WITH_CYCLES_DEBUG                 ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_NATIVE_ONLY           ON  CACHE BOOL "" FORCE)
 set(WITH_DOC_MANPAGE                  OFF CACHE BOOL "" FORCE)
 set(WITH_GTESTS                       ON  CACHE BOOL "" FORCE)

build_files/cmake/macros.cmake

@@ -208,7 +208,7 @@ function(blender_source_group
   )
 
   # if enabled, use the sources directories as filters.
-  if(IDE_GROUP_SOURCES_IN_FOLDERS)
+  if(WINDOWS_USE_VISUAL_STUDIO_SOURCE_FOLDERS)
     foreach(_SRC ${sources})
       # remove ../'s
       get_filename_component(_SRC_DIR ${_SRC} REALPATH)
@@ -240,8 +240,8 @@ function(blender_source_group
     endforeach()
   endif()
 
-  # if enabled, set the FOLDER property for the projects
-  if(IDE_GROUP_PROJECTS_IN_FOLDERS)
+  # if enabled, set the FOLDER property for visual studio projects
+  if(WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS)
     get_filename_component(FolderDir ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
     string(REPLACE ${CMAKE_SOURCE_DIR} "" FolderDir ${FolderDir})
     set_target_properties(${name} PROPERTIES FOLDER ${FolderDir})

build_files/cmake/platform/platform_apple.cmake

@@ -404,16 +404,32 @@ endif()
 
 # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
 if(WITH_OPENMP)
-  if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+  if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "7.0")
     # Use OpenMP from our precompiled libraries.
     message(STATUS "Using ${LIBDIR}/openmp for OpenMP")
     set(OPENMP_CUSTOM ON)
     set(OPENMP_FOUND ON)
     set(OpenMP_C_FLAGS "-Xclang -fopenmp -I'${LIBDIR}/openmp/include'")
     set(OpenMP_CXX_FLAGS "-Xclang -fopenmp -I'${LIBDIR}/openmp/include'")
-    set(OpenMP_LIBRARY_DIR "${LIBDIR}/openmp/lib/")
-    set(OpenMP_LINKER_FLAGS "-L'${OpenMP_LIBRARY_DIR}' -lomp")
-    set(OpenMP_LIBRARY "${OpenMP_LIBRARY_DIR}/libomp.dylib")
+    set(OpenMP_LINKER_FLAGS "-L'${LIBDIR}/openmp/lib' -lomp")
+
+    # Copy libomp.dylib to allow executables like datatoc and tests to work.
+    # `@executable_path/../Resources/lib/` `LC_ID_DYLIB` is added by the deps builder.
+    # For single config generator datatoc, tests etc.
+    execute_process(
+      COMMAND mkdir -p ${CMAKE_BINARY_DIR}/Resources/lib
+      COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libomp.dylib
+    )
+    # For multi-config generator datatoc, etc.
+    execute_process(
+      COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/Resources/lib
+      COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/bin/Resources/lib/libomp.dylib
+    )
+    # For multi-config generator tests.
+    execute_process(
+      COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/tests/Resources/lib
+      COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/bin/tests/Resources/lib/libomp.dylib
+    )
   endif()
 endif()
 
@@ -441,9 +457,6 @@ if(WITH_HARU)
   endif()
 endif()
 
-set(ZSTD_ROOT_DIR ${LIBDIR}/zstd)
-find_package(Zstd REQUIRED)
-
 if(EXISTS ${LIBDIR})
   without_system_libs_end()
 endif()
@@ -467,8 +480,10 @@ else()
   set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic")
 endif()
 
-# Clang has too low template depth of 128 for libmv.
-string(APPEND CMAKE_CXX_FLAGS " -ftemplate-depth=1024")
+if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
+  # Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv
+  string(APPEND CMAKE_CXX_FLAGS " -ftemplate-depth=1024")
+endif()
 
 # Avoid conflicts with Luxrender, and other plug-ins that may use the same
 # libraries as Blender with a different version or build options.
@@ -498,15 +513,3 @@ if(WITH_COMPILER_CCACHE)
     endif()
   endif()
 endif()
-
-# For binaries that are built but not installed (also not distributed) (datatoc,
-# makesdna, tests, etc.), we add an rpath to the OpenMP library dir through
-# CMAKE_BUILD_RPATH. This avoids having to make many copies of the dylib next to each binary.
-#
-# For the installed Python module and installed Blender executable, CMAKE_INSTALL_RPATH
-# is modified to find the dylib in an adjacent folder. Install step puts the libraries there.
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
-list(APPEND CMAKE_BUILD_RPATH "${OpenMP_LIBRARY_DIR}")
-
-set(CMAKE_SKIP_INSTALL_RPATH FALSE)
-list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../Resources/${BLENDER_VERSION}/lib")

build_files/cmake/platform/platform_unix.cmake

@@ -99,7 +99,6 @@ endif()
 find_package_wrapper(JPEG REQUIRED)
 find_package_wrapper(PNG REQUIRED)
 find_package_wrapper(ZLIB REQUIRED)
-find_package_wrapper(Zstd REQUIRED)
 find_package_wrapper(Freetype REQUIRED)
 
 if(WITH_PYTHON)

build_files/cmake/platform/platform_win32.cmake

@@ -57,6 +57,8 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
   endif()
 endif()
 
+set_property(GLOBAL PROPERTY USE_FOLDERS ${WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS})
+
 if(NOT WITH_PYTHON_MODULE)
   set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT blender)
 endif()
@@ -151,8 +153,8 @@ if(MSVC_CLANG) # Clangs version of cl doesn't support all flags
   string(APPEND CMAKE_CXX_FLAGS " ${CXX_WARN_FLAGS} /nologo /J /Gd /EHsc -Wno-unused-command-line-argument -Wno-microsoft-enum-forward-reference ")
   set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /nologo /J /Gd -Wno-unused-command-line-argument -Wno-microsoft-enum-forward-reference")
 else()
-  string(APPEND CMAKE_CXX_FLAGS " /nologo /J /Gd /MP /EHsc /bigobj /Zc:inline")
-  set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /nologo /J /Gd /MP /bigobj /Zc:inline")
+  string(APPEND CMAKE_CXX_FLAGS " /nologo /J /Gd /MP /EHsc /bigobj")
+  set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /nologo /J /Gd /MP /bigobj")
 endif()
 
 # X64 ASAN is available and usable on MSVC 16.9 preview 4 and up)
@@ -215,8 +217,8 @@ else()
 endif()
 
 if(WITH_WINDOWS_PDB)
-  set(PDB_INFO_OVERRIDE_FLAGS "${SYMBOL_FORMAT_RELEASE}")
-  set(PDB_INFO_OVERRIDE_LINKER_FLAGS "/DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO")
+	set(PDB_INFO_OVERRIDE_FLAGS "${SYMBOL_FORMAT_RELEASE}")
+	set(PDB_INFO_OVERRIDE_LINKER_FLAGS "/DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO")
 endif()
 
 string(APPEND CMAKE_CXX_FLAGS_DEBUG " /MDd ${SYMBOL_FORMAT}")
@@ -259,7 +261,7 @@ if(NOT DEFINED LIBDIR)
   else()
     message(FATAL_ERROR "32 bit compiler detected, blender no longer provides pre-build libraries for 32 bit windows, please set the LIBDIR cmake variable to your own library folder")
   endif()
-  if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.30.30423)
+  if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.29.30130)
     message(STATUS "Visual Studio 2022 detected.")
     set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc15)
   elseif(MSVC_VERSION GREATER 1919)
@@ -873,6 +875,3 @@ if(WITH_HARU)
     set(WITH_HARU OFF)
   endif()
 endif()
-
-set(ZSTD_INCLUDE_DIRS ${LIBDIR}/zstd/include)
-set(ZSTD_LIBRARIES ${LIBDIR}/zstd/lib/zstd_static.lib)

build_files/config/README.md

@@ -1,10 +1,8 @@
 Pipeline Config
 ===============
 
-The `yaml` configuration file is used by buildbot build pipeline `update-code` step.
+This configuration file is used by buildbot new pipeline for the `update-code` step.
 
-The file allows to set branches or specific commits for both git submodules and svn artifacts. Can also define various build package versions for use by build workers. Especially useful in experimental and release branches. 
+It will soon be used by the ../utils/make_update.py script.
 
-NOTE:
-* The configuration file is ```NOT``` used by the `../utils/make_update.py` script.
-* That will implemented in the future.
+Both buildbot and developers will eventually use the same configuration file.

build_files/config/pipeline_config.json

@@ -0,0 +1,87 @@
+{
+    "update-code":
+    {
+        "git" :
+        {
+            "submodules":
+            [
+                { "path": "release/scripts/addons", "branch": "master", "commit_id": "HEAD" },
+                { "path": "release/scripts/addons_contrib", "branch": "master", "commit_id": "HEAD" },
+                { "path": "release/datafiles/locale", "branch": "master", "commit_id": "HEAD" },
+                { "path": "source/tools", "branch": "master", "commit_id": "HEAD" }
+            ]
+        },
+        "svn":
+        {
+            "tests": { "path": "lib/tests", "branch": "trunk", "commit_id": "HEAD" },
+            "libraries":
+            {
+                "darwin-x86_64": { "path": "lib/darwin", "branch": "trunk", "commit_id": "HEAD" },
+                "darwin-arm64": { "path": "lib/darwin_arm64", "branch": "trunk", "commit_id": "HEAD" },
+                "linux-x86_64": { "path": "lib/linux_centos7_x86_64", "branch": "trunk", "commit_id": "HEAD" },
+                "windows-amd64": { "path": "lib/win64_vc15", "branch": "trunk", "commit_id": "HEAD" }
+            }
+        }
+    },
+    "buildbot":
+    {
+        "gcc":
+        {
+            "version": "9.0"
+        },
+        "sdks":
+        {
+            "optix":
+            {
+                "version": "7.1.0"
+            },
+            "cuda10":
+            {
+                "version": "10.1"
+            },
+            "cuda11":
+            {
+                "version": "11.3"
+            }
+        },
+        "cmake":
+        {
+            "default":
+            {
+                "version": "any",
+                "overrides":
+                {
+
+                }
+            },
+            "darwin-x86_64":
+            {
+                "overrides":
+                {
+
+                }
+            },
+            "darwin-arm64":
+            {
+                "overrides":
+                {
+
+                }
+            },
+            "linux-x86_64":
+            {
+                "overrides":
+                {
+
+                }
+            },
+            "windows-amd64":
+            {
+                "overrides":
+                {
+
+                }
+            }
+        }
+    }
+}

build_files/config/pipeline_config.yaml

@@ -1,70 +0,0 @@
-#
-# Used by Buildbot build pipeline make_update.py script only for now
-# We intended to update the make_update.py in the branches to use this file eventually
-#
-update-code:
-    git:
-        submodules:
-        -   branch: master
-            commit_id: HEAD
-            path: release/scripts/addons
-        -   branch: master
-            commit_id: HEAD
-            path: release/scripts/addons_contrib
-        -   branch: master
-            commit_id: HEAD
-            path: release/datafiles/locale
-        -   branch: master
-            commit_id: HEAD
-            path: source/tools
-    svn:
-        libraries:
-            darwin-arm64:
-                branch: trunk
-                commit_id: HEAD
-                path: lib/darwin_arm64
-            darwin-x86_64:
-                branch: trunk
-                commit_id: HEAD
-                path: lib/darwin
-            linux-x86_64:
-                branch: trunk
-                commit_id: HEAD
-                path: lib/linux_centos7_x86_64
-            windows-amd64:
-                branch: trunk
-                commit_id: HEAD
-                path: lib/win64_vc15
-        tests:
-            branch: trunk
-            commit_id: HEAD
-            path: lib/tests
-        benchmarks:
-            branch: trunk
-            commit_id: HEAD
-            path: lib/benchmarks
-
-#
-# Buildbot only configs
-#
-buildbot:
-    gcc:
-        version: '9.0.0'
-    cuda10:
-        version: '10.1.243'
-    cuda11:
-        version: '11.4.1'
-    optix:
-        version: '7.3.0'
-    cmake:
-        default:
-            version: any
-            overrides: {}
-        darwin-arm64:
-            overrides: {}
-        darwin-x86_64:
-            overrides: {}
-        linux-x86_64:
-            overrides: {}
-        windows-amd64:
-            overrides: {}

build_files/utils/make_update.py

@@ -31,7 +31,6 @@ def parse_arguments():
     parser.add_argument("--no-submodules", action="store_true")
     parser.add_argument("--use-tests", action="store_true")
     parser.add_argument("--svn-command", default="svn")
-    parser.add_argument("--svn-branch", default=None)
     parser.add_argument("--git-command", default="git")
     parser.add_argument("--use-centos-libraries", action="store_true")
     return parser.parse_args()
@@ -47,7 +46,7 @@ def svn_update(args, release_version):
     svn_non_interactive = [args.svn_command, '--non-interactive']
 
     lib_dirpath = os.path.join(get_blender_git_root(), '..', 'lib')
-    svn_url = make_utils.svn_libraries_base_url(release_version, args.svn_branch)
+    svn_url = make_utils.svn_libraries_base_url(release_version)
 
     # Checkout precompiled libraries
     if sys.platform == 'darwin':
@@ -171,28 +170,26 @@ def submodules_update(args, release_version, branch):
         sys.stderr.write("git not found, can't update code\n")
         sys.exit(1)
 
-    # Update submodules to appropriate given branch,
-    # falling back to master if none is given and/or found in a sub-repository.
-    branch_fallback = "master"
-    if not branch:
-        branch = branch_fallback
+    # Update submodules to latest master or appropriate release branch.
+    if not release_version:
+        branch = "master"
 
     submodules = [
-        ("release/scripts/addons", branch, branch_fallback),
-        ("release/scripts/addons_contrib", branch, branch_fallback),
-        ("release/datafiles/locale", branch, branch_fallback),
-        ("source/tools", branch, branch_fallback),
+        ("release/scripts/addons", branch),
+        ("release/scripts/addons_contrib", branch),
+        ("release/datafiles/locale", branch),
+        ("source/tools", branch),
     ]
 
     # Initialize submodules only if needed.
-    for submodule_path, submodule_branch, submodule_branch_fallback in submodules:
+    for submodule_path, submodule_branch in submodules:
         if not os.path.exists(os.path.join(submodule_path, ".git")):
             call([args.git_command, "submodule", "update", "--init", "--recursive"])
             break
 
     # Checkout appropriate branch and pull changes.
     skip_msg = ""
-    for submodule_path, submodule_branch, submodule_branch_fallback in submodules:
+    for submodule_path, submodule_branch in submodules:
         cwd = os.getcwd()
         try:
             os.chdir(submodule_path)
@@ -200,20 +197,10 @@ def submodules_update(args, release_version, branch):
             if msg:
                 skip_msg += submodule_path + " skipped: " + msg + "\n"
             else:
-                # Find a matching branch that exists.
-                call([args.git_command, "fetch", "origin"])
-                if make_utils.git_branch_exists(args.git_command, submodule_branch):
-                    pass
-                elif make_utils.git_branch_exists(args.git_command, submodule_branch_fallback):
-                    submodule_branch = submodule_branch_fallback
-                else:
-                    submodule_branch = None
-
-                # Switch to branch and pull.
-                if submodule_branch:
-                    if make_utils.git_branch(args.git_command) != submodule_branch:
-                        call([args.git_command, "checkout", submodule_branch])
-                    call([args.git_command, "pull", "--rebase", "origin", submodule_branch])
+                if make_utils.git_branch(args.git_command) != submodule_branch:
+                    call([args.git_command, "fetch", "origin"])
+                    call([args.git_command, "checkout", submodule_branch])
+                call([args.git_command, "pull", "--rebase", "origin", submodule_branch])
         finally:
             os.chdir(cwd)
 
@@ -227,10 +214,6 @@ if __name__ == "__main__":
 
     # Test if we are building a specific release version.
     branch = make_utils.git_branch(args.git_command)
-    if branch == 'HEAD':
-        sys.stderr.write('Blender git repository is in detached HEAD state, must be in a branch\n')
-        sys.exit(1)
-
     tag = make_utils.git_tag(args.git_command)
     release_version = make_utils.git_branch_release_version(branch, tag)
 

build_files/utils/make_utils.py

@@ -8,19 +8,14 @@ import subprocess
 import sys
 
 
-def call(cmd, exit_on_error=True, silent=False):
-    if not silent:
-        print(" ".join(cmd))
+def call(cmd, exit_on_error=True):
+    print(" ".join(cmd))
 
     # Flush to ensure correct order output on Windows.
     sys.stdout.flush()
     sys.stderr.flush()
 
-    if silent:
-        retcode = subprocess.call(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-    else:
-        retcode = subprocess.call(cmd)
-
+    retcode = subprocess.call(cmd)
     if exit_on_error and retcode != 0:
         sys.exit(retcode)
     return retcode
@@ -43,11 +38,6 @@ def check_output(cmd, exit_on_error=True):
     return output.strip()
 
 
-def git_branch_exists(git_command, branch):
-    return call([git_command, "rev-parse", "--verify", branch], exit_on_error=False, silent=True) == 0 or \
-           call([git_command, "rev-parse", "--verify", "remotes/origin/" + branch], exit_on_error=False, silent=True) == 0
-
-
 def git_branch(git_command):
     # Get current branch name.
     try:
@@ -80,11 +70,9 @@ def git_branch_release_version(branch, tag):
     return release_version
 
 
-def svn_libraries_base_url(release_version, branch=None):
+def svn_libraries_base_url(release_version):
     if release_version:
         svn_branch = "tags/blender-" + release_version + "-release"
-    elif branch:
-        svn_branch = "branches/" + branch
     else:
         svn_branch = "trunk"
     return "https://svn.blender.org/svnroot/bf-blender/" + svn_branch + "/lib/"

build_files/windows/doc_py.cmd

@@ -1,34 +0,0 @@
-set SOURCEDIR=%BLENDER_DIR%/doc/python_api/sphinx-in
-set BUILDDIR=%BLENDER_DIR%/doc/python_api/sphinx-out
-if "%BF_LANG%" == "" set BF_LANG=en
-set SPHINXOPTS=-j auto -D language=%BF_LANG%
-
-call "%~dp0\find_sphinx.cmd"
-
-if EXIST "%SPHINX_BIN%" (
-    goto detect_sphinx_done
-)
-
-echo unable to locate sphinx-build, run "set sphinx_BIN=full_path_to_sphinx-build.exe"
-exit /b 1
-
-:detect_sphinx_done
-
-call "%~dp0\find_blender.cmd"
-
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-echo unable to locate blender, run "set BLENDER_BIN=full_path_to_blender.exe"
-exit /b 1
-
-:detect_blender_done
-
-%BLENDER_BIN% ^
-	--background -noaudio --factory-startup ^
-	--python %BLENDER_DIR%/doc/python_api/sphinx_doc_gen.py
-
-"%SPHINX_BIN%" -b html %SPHINXOPTS% %O% %SOURCEDIR% %BUILDDIR%
-
-:EOF

build_files/windows/find_blender.cmd

@@ -1,28 +0,0 @@
-REM First see if there is an environment variable set
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-REM Check the build folder next, if ninja was used there will be no
-REM debug/release folder
-set BLENDER_BIN=%BUILD_DIR%\bin\blender.exe
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-REM Check the release folder next
-set BLENDER_BIN=%BUILD_DIR%\bin\release\blender.exe
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-REM Check the debug folder next
-set BLENDER_BIN=%BUILD_DIR%\bin\debug\blender.exe
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-REM at this point, we don't know where blender is, clear the variable
-set BLENDER_BIN=
-
-:detect_blender_done

build_files/windows/find_inkscape.cmd

@@ -1,21 +0,0 @@
-REM First see if there is an environment variable set
-if EXIST "%INKSCAPE_BIN%" (
-    goto detect_inkscape_done
-)
-
-REM Then see if inkscape is available in the path
-for %%X in (inkscape.exe) do (set INKSCAPE_BIN=%%~$PATH:X)
-if EXIST "%INKSCAPE_BIN%" (
-    goto detect_inkscape_done
-)
-
-REM Finally see if it is perhaps installed at the default location
-set INKSCAPE_BIN=%ProgramFiles%\Inkscape\bin\inkscape.exe
-if EXIST "%INKSCAPE_BIN%" (
-    goto detect_inkscape_done
-)
-
-REM If still not found clear the variable
-set INKSCAPE_BIN=
-
-:detect_inkscape_done

build_files/windows/find_sphinx.cmd

@@ -1,23 +0,0 @@
-REM First see if there is an environment variable set
-if EXIST "%SPHINX_BIN%" (
-    goto detect_sphinx_done
-)
-
-REM Then see if inkscape is available in the path
-for %%X in (sphinx-build.exe) do (set SPHINX_BIN=%%~$PATH:X)
-if EXIST "%SPHINX_BIN%" (
-    goto detect_sphinx_done
-)
-
-echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
-echo.installed, then set the SPHINX_BIN environment variable to point
-echo.to the full path of the 'sphinx-build' executable. Alternatively you
-echo.may add the Sphinx directory to PATH.
-echo.
-echo.If you don't have Sphinx installed, grab it from
-echo.http://sphinx-doc.org/
-
-REM If still not found clear the variable
-set SPHINX_BIN=
-
-:detect_sphinx_done

build_files/windows/icons.cmd

@@ -1,42 +0,0 @@
-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
-)
-
-echo python not found at %PYTHON%
-exit /b 1
-
-:detect_python_done
-echo found python (%PYTHON%)
-
-call "%~dp0\find_inkscape.cmd"
-
-if EXIST "%INKSCAPE_BIN%" (
-    goto detect_inkscape_done
-)
-
-echo unable to locate inkscape, run "set inkscape_BIN=full_path_to_inkscape.exe"
-exit /b 1
-
-:detect_inkscape_done
-
-call "%~dp0\find_blender.cmd"
-
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-echo unable to locate blender, run "set BLENDER_BIN=full_path_to_blender.exe"
-exit /b 1
-
-:detect_blender_done
-
-%PYTHON% -B %BLENDER_DIR%\release\datafiles\blender_icons_update.py
-%PYTHON% -B %BLENDER_DIR%\release\datafiles\prvicons_update.py
-%PYTHON% -B %BLENDER_DIR%\release\datafiles\alert_icons_update.py
-
-:EOF

build_files/windows/icons_geom.cmd

@@ -1,29 +0,0 @@
-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
-)
-
-echo python not found at %PYTHON%
-exit /b 1
-
-:detect_python_done
-echo found python (%PYTHON%)
-
-call "%~dp0\find_blender.cmd"
-
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-echo unable to locate blender, run "set BLENDER_BIN=full_path_to_blender.exe"
-exit /b 1
-
-:detect_blender_done
-
-%PYTHON% -B %BLENDER_DIR%\release\datafiles\blender_icons_geom_update.py 
-
-:EOF

build_files/windows/parse_arguments.cmd

@@ -107,15 +107,6 @@ if NOT "%1" == "" (
 		set FORMAT=1
 		set FORMAT_ARGS=%2 %3 %4 %5 %6 %7 %8 %9
 		goto EOF
-	) else if "%1" == "icons" (
-		set ICONS=1
-		goto EOF
-	) else if "%1" == "icons_geom" (
-		set ICONS_GEOM=1
-		goto EOF
-	) else if "%1" == "doc_py" (
-		set DOC_PY=1
-		goto EOF
 	) else (
 		echo Command "%1" unknown, aborting!
 		goto ERR

build_files/windows/reset_variables.cmd

@@ -31,6 +31,3 @@ set PYDEBUG_CMAKE_ARGS=
 set FORMAT=
 set TEST=
 set BUILD_WITH_SCCACHE=
-set ICONS=
-set ICONS_GEOM=
-set DOC_PY=

build_files/windows/show_help.cmd

@@ -31,10 +31,6 @@ echo - 2019 ^(build with visual studio 2019^)
 echo - 2019pre ^(build with visual studio 2019 pre-release^)
 echo - 2019b ^(build with visual studio 2019 Build Tools^)
 
-echo.
-echo Documentation Targets ^(Not associated with building^)
-echo - doc_py ^(Generate sphinx python api docs^)
-
 echo.
 echo Experimental options
 echo - with_opengl_tests ^(enable both the render and draw opengl test suites^)

doc/blender_file_format/BlendFileReader.py

@@ -123,7 +123,7 @@ def Align(handle):
 class BlendFile:
     '''
     Reads a blendfile and store the header, all the fileblocks, and catalogue
-    structs found in the DNA fileblock
+    structs foound in the DNA fileblock
 
     - BlendFile.Header  (BlendFileHeader instance)
     - BlendFile.Blocks  (list of BlendFileBlock instances)

doc/python_api/examples/aud.py

@@ -14,7 +14,7 @@ sound = aud.Sound('music.ogg')
 # play the audio, this return a handle to control play/pause
 handle = device.play(sound)
 # if the audio is not too big and will be used often you can buffer it
-sound_buffered = aud.Sound.cache(sound)
+sound_buffered = aud.Sound.buffer(sound)
 handle_buffered = device.play(sound_buffered)
 
 # stop the sounds (otherwise they play until their ends)

doc/python_api/examples/gpu.9.py

@@ -31,8 +31,7 @@ def draw():
         context.space_data,
         context.region,
         view_matrix,
-        projection_matrix,
-        True)
+        projection_matrix)
 
     gpu.state.depth_mask_set(False)
     draw_texture_2d(offscreen.texture_color, (10, 10), WIDTH, HEIGHT)

doc/python_api/requirements.txt

@@ -1,13 +1,13 @@
-sphinx==4.1.1
+sphinx==3.5.4
 
 # Sphinx dependencies that are important
-Jinja2==3.0.1
-Pygments==2.10.0
-docutils==0.17.1
+Jinja2==2.11.3
+Pygments==2.9.0
+docutils==0.16
 snowballstemmer==2.1.0
 babel==2.9.1
-requests==2.26.0
+requests==2.25.1
 
 # Only needed to match the theme used for the official documentation.
 # Without this theme, the default theme will be used.
-sphinx_rtd_theme==1.0.0
+sphinx_rtd_theme==0.5.2

doc/python_api/sphinx_doc_gen.py

@@ -254,8 +254,6 @@ else:
         "gpu.shader",
         "gpu.state",
         "gpu.texture",
-        "gpu.platform",
-        "gpu.capabilities",
         "gpu_extras",
         "idprop.types",
         "mathutils",
@@ -1039,21 +1037,17 @@ context_type_map = {
     # context_member: (RNA type, is_collection)
     "active_annotation_layer": ("GPencilLayer", False),
     "active_bone": ("EditBone", False),
-    "active_file": ("FileSelectEntry", False),
     "active_gpencil_frame": ("GreasePencilLayer", True),
     "active_gpencil_layer": ("GPencilLayer", True),
     "active_node": ("Node", False),
     "active_object": ("Object", False),
     "active_operator": ("Operator", False),
     "active_pose_bone": ("PoseBone", False),
-    "active_sequence_strip": ("Sequence", False),
     "active_editable_fcurve": ("FCurve", False),
-    "active_nla_strip": ("NlaStrip", False),
-    "active_nla_track": ("NlaTrack", False),
     "annotation_data": ("GreasePencil", False),
     "annotation_data_owner": ("ID", False),
     "armature": ("Armature", False),
-    "asset_library_ref": ("AssetLibraryReference", False),
+    "asset_library": ("AssetLibraryReference", False),
     "bone": ("Bone", False),
     "brush": ("Brush", False),
     "camera": ("Camera", False),
@@ -1078,7 +1072,6 @@ context_type_map = {
     "gpencil_data": ("GreasePencil", False),
     "gpencil_data_owner": ("ID", False),
     "hair": ("Hair", False),
-    "id": ("ID", False),
     "image_paint_object": ("Object", False),
     "lattice": ("Lattice", False),
     "light": ("Light", False),
@@ -1107,7 +1100,6 @@ context_type_map = {
     "selected_editable_keyframes": ("Keyframe", True),
     "selected_editable_objects": ("Object", True),
     "selected_editable_sequences": ("Sequence", True),
-    "selected_files": ("FileSelectEntry", True),
     "selected_nla_strips": ("NlaStrip", True),
     "selected_nodes": ("Node", True),
     "selected_objects": ("Object", True),
@@ -1204,7 +1196,6 @@ def pycontext2sphinx(basepath):
         "text_context_dir",
         "clip_context_dir",
         "sequencer_context_dir",
-        "file_context_dir",
     )
 
     unique = set()
@@ -2002,15 +1993,13 @@ def write_rst_importable_modules(basepath):
         "blf": "Font Drawing",
         "imbuf": "Image Buffer",
         "imbuf.types": "Image Buffer Types",
-        "gpu": "GPU Module",
+        "gpu": "GPU Shader Module",
         "gpu.types": "GPU Types",
         "gpu.matrix": "GPU Matrix Utilities",
         "gpu.select": "GPU Select Utilities",
         "gpu.shader": "GPU Shader Utilities",
         "gpu.state": "GPU State Utilities",
         "gpu.texture": "GPU Texture Utilities",
-        "gpu.platform": "GPU Platform Utilities",
-        "gpu.capabilities": "GPU Capabilities Utilities",
         "bmesh": "BMesh Module",
         "bmesh.ops": "BMesh Operators",
         "bmesh.types": "BMesh Types",

extern/CMakeLists.txt

@@ -67,12 +67,9 @@ endif()
 
 if(WITH_CYCLES OR WITH_COMPOSITOR OR WITH_OPENSUBDIV)
   add_subdirectory(clew)
-  if((WITH_CYCLES_DEVICE_CUDA OR WITH_CYCLES_DEVICE_OPTIX) AND WITH_CUDA_DYNLOAD)
+  if(WITH_CUDA_DYNLOAD)
     add_subdirectory(cuew)
   endif()
-  if(WITH_CYCLES_DEVICE_HIP AND WITH_HIP_DYNLOAD)
-    add_subdirectory(hipew)
-  endif()
 endif()
 
 if(WITH_GHOST_X11 AND WITH_GHOST_XDND)
@@ -114,5 +111,5 @@ if(WITH_MOD_FLUID)
 endif()
 
 if (WITH_COMPOSITOR)
-  add_subdirectory(smaa_areatex)
+	add_subdirectory(smaa_areatex)
 endif()

extern/audaspace/CMakeLists.txt

@@ -129,7 +129,6 @@ set(SRC
 	src/util/Barrier.cpp
 	src/util/Buffer.cpp
 	src/util/BufferReader.cpp
-	src/util/RingBuffer.cpp
 	src/util/StreamBuffer.cpp
 	src/util/ThreadPool.cpp
 )
@@ -153,7 +152,6 @@ set(PUBLIC_HDR
 	include/devices/ThreadedDevice.h
 	include/Exception.h
 	include/file/File.h
-	include/file/FileInfo.h
 	include/file/FileManager.h
 	include/file/FileWriter.h
 	include/file/IFileInput.h
@@ -246,7 +244,6 @@ set(PUBLIC_HDR
 	include/util/BufferReader.h
 	include/util/ILockable.h
 	include/util/Math3D.h
-	include/util/RingBuffer.h
 	include/util/StreamBuffer.h
 	include/util/ThreadPool.h
 )
@@ -963,10 +960,7 @@ endif()
 if(BUILD_DEMOS)
 	include_directories(${INCLUDE})
 
-	set(DEMOS audainfo audaplay audaconvert audaremap signalgen randsounds dynamicmusic playbackmanager)
-
-	add_executable(audainfo demos/audainfo.cpp)
-	target_link_libraries(audainfo audaspace)
+	set(DEMOS audaplay audaconvert audaremap signalgen randsounds dynamicmusic playbackmanager)
 
 	add_executable(audaplay demos/audaplay.cpp)
 	target_link_libraries(audaplay audaspace)

extern/audaspace/bindings/C/AUD_PlaybackManager.h

@@ -39,7 +39,7 @@ extern AUD_API void AUD_PlaybackManager_free(AUD_PlaybackManager* manager);
 * Plays a sound through the playback manager, adding it into a category.
 * \param manager The PlaybackManager object.
 * \param sound The sound to be played.
-* \param catKey The key of the category into which the sound will be added. If it doesn't exist a new one will be created.
+* \param catKey The key of the category into which the sound will be added. If it doesn't exist a new one will be creatd.
 */
 extern AUD_API void AUD_PlaybackManager_play(AUD_PlaybackManager* manager, AUD_Sound* sound, unsigned int catKey);
 

extern/audaspace/bindings/C/AUD_Sound.cpp

@@ -94,40 +94,6 @@ AUD_API int AUD_Sound_getLength(AUD_Sound* sound)
 	return (*sound)->createReader()->getLength();
 }
 
-AUD_API int AUD_Sound_getFileStreams(AUD_Sound* sound, AUD_StreamInfo **stream_infos)
-{
-	assert(sound);
-
-	std::shared_ptr<File> file = std::dynamic_pointer_cast<File>(*sound);
-
-	if(file)
-	{
-		try
-		{
-			auto streams = file->queryStreams();
-
-			size_t size = sizeof(AUD_StreamInfo) * streams.size();
-
-			if(!size)
-			{
-				*stream_infos = nullptr;
-				return 0;
-			}
-
-			*stream_infos = reinterpret_cast<AUD_StreamInfo*>(std::malloc(size));
-			std::memcpy(*stream_infos, streams.data(), size);
-
-			return streams.size();
-		}
-		catch(Exception&)
-		{
-		}
-	}
-
-	*stream_infos = nullptr;
-	return 0;
-}
-
 AUD_API sample_t* AUD_Sound_data(AUD_Sound* sound, int* length, AUD_Specs* specs)
 {
 	assert(sound);
@@ -286,12 +252,6 @@ AUD_API AUD_Sound* AUD_Sound_bufferFile(unsigned char* buffer, int size)
 	return new AUD_Sound(new File(buffer, size));
 }
 
-AUD_API AUD_Sound* AUD_Sound_bufferFileStream(unsigned char* buffer, int size, int stream)
-{
-	assert(buffer);
-	return new AUD_Sound(new File(buffer, size, stream));
-}
-
 AUD_API AUD_Sound* AUD_Sound_cache(AUD_Sound* sound)
 {
 	assert(sound);
@@ -312,12 +272,6 @@ AUD_API AUD_Sound* AUD_Sound_file(const char* filename)
 	return new AUD_Sound(new File(filename));
 }
 
-AUD_API AUD_Sound* AUD_Sound_fileStream(const char* filename, int stream)
-{
-	assert(filename);
-	return new AUD_Sound(new File(filename, stream));
-}
-
 AUD_API AUD_Sound* AUD_Sound_sawtooth(float frequency, AUD_SampleRate rate)
 {
 	return new AUD_Sound(new Sawtooth(frequency, rate));

extern/audaspace/bindings/C/AUD_Sound.h

@@ -36,15 +36,7 @@ extern AUD_API AUD_Specs AUD_Sound_getSpecs(AUD_Sound* sound);
  * \return The length of the sound in samples.
  * \note This function creates a reader from the sound and deletes it again.
  */
-extern AUD_API int AUD_Sound_getLength(AUD_Sound* sound);
-
-/**
- * Retrieves the stream infos of a sound file.
- * \param sound The sound to retrieve from which must be a file sound.
- * \param infos A pointer to a AUD_StreamInfo array that will be allocated and must afterwards be freed by the caller.
- * \return The number of items in the infos array.
- */
-extern AUD_API int AUD_Sound_getFileStreams(AUD_Sound* sound, AUD_StreamInfo** stream_infos);
+extern AUD_API int AUD_getLength(AUD_Sound* sound);
 
 /**
  * Reads a sound's samples into memory.
@@ -97,15 +89,6 @@ extern AUD_API AUD_Sound* AUD_Sound_buffer(sample_t* data, int length, AUD_Specs
  */
 extern AUD_API AUD_Sound* AUD_Sound_bufferFile(unsigned char* buffer, int size);
 
-/**
- * Loads a sound file from a memory buffer.
- * \param buffer The buffer which contains the sound file.
- * \param size The size of the buffer.
- * \param stream The index of the audio stream within the file if it contains multiple audio streams.
- * \return A handle of the sound file.
- */
-extern AUD_API AUD_Sound* AUD_Sound_bufferFileStream(unsigned char* buffer, int size, int stream);
-
 /**
  * Caches a sound into a memory buffer.
  * \param sound The sound to cache.
@@ -120,14 +103,6 @@ extern AUD_API AUD_Sound* AUD_Sound_cache(AUD_Sound* sound);
  */
 extern AUD_API AUD_Sound* AUD_Sound_file(const char* filename);
 
-/**
- * Loads a sound file.
- * \param filename The filename of the sound file.
- * \param stream The index of the audio stream within the file if it contains multiple audio streams.
- * \return A handle of the sound file.
- */
-extern AUD_API AUD_Sound* AUD_Sound_fileStream(const char* filename, int stream);
-
 /**
  * Creates a sawtooth sound.
  * \param frequency The frequency of the generated sawtooth sound.

extern/audaspace/bindings/C/AUD_Special.cpp

@@ -107,7 +107,7 @@ AUD_API AUD_SoundInfo AUD_getInfo(AUD_Sound* sound)
 AUD_API float* AUD_readSoundBuffer(const char* filename, float low, float high,
 						   float attack, float release, float threshold,
 						   int accumulate, int additive, int square,
-						   float sthreshold, double samplerate, int* length, int stream)
+						   float sthreshold, double samplerate, int* length)
 {
 	Buffer buffer;
 	DeviceSpecs specs;
@@ -115,7 +115,7 @@ AUD_API float* AUD_readSoundBuffer(const char* filename, float low, float high,
 	specs.rate = (SampleRate)samplerate;
 	std::shared_ptr<ISound> sound;
 
-	std::shared_ptr<ISound> file = std::shared_ptr<ISound>(new File(filename, stream));
+	std::shared_ptr<ISound> file = std::shared_ptr<ISound>(new File(filename));
 
 	int position = 0;
 
@@ -245,7 +245,7 @@ AUD_API int AUD_readSound(AUD_Sound* sound, float* buffer, int length, int sampl
 
 		buffer[i * 3] = min;
 		buffer[i * 3 + 1] = max;
-		buffer[i * 3 + 2] = std::sqrt(power / len);
+		buffer[i * 3 + 2] = sqrt(power) / len;
 
 		if(overallmax < max)
 			overallmax = max;

extern/audaspace/bindings/C/AUD_Special.h

@@ -37,7 +37,7 @@ extern AUD_API float* AUD_readSoundBuffer(const char* filename, float low, float
 								  float attack, float release, float threshold,
 								  int accumulate, int additive, int square,
 								  float sthreshold, double samplerate,
-								  int* length, int stream);
+								  int* length);
 
 /**
  * Pauses a playing sound after a specific amount of time.

extern/audaspace/bindings/C/AUD_Types.h

@@ -177,16 +177,3 @@ typedef struct
 	AUD_Specs specs;
 	float length;
 } AUD_SoundInfo;
-
-/// Specification of a sound source.
-typedef struct
-{
-	/// Start time in seconds.
-	double start;
-
-	/// Duration in seconds. May be estimated or 0 if unknown.
-	double duration;
-
-	/// Audio data parameters.
-	AUD_DeviceSpecs specs;
-} AUD_StreamInfo;

extern/audaspace/bindings/python/PySound.cpp

@@ -89,11 +89,10 @@ Sound_new(PyTypeObject* type, PyObject* args, PyObject* kwds)
 	self = (Sound*)type->tp_alloc(type, 0);
 	if(self != nullptr)
 	{
-		static const char* kwlist[] = {"filename", "stream", nullptr};
+		static const char* kwlist[] = {"filename", nullptr};
 		const char* filename = nullptr;
-		int stream = 0;
 
-		if(!PyArg_ParseTupleAndKeywords(args, kwds, "s|i:Sound", const_cast<char**>(kwlist), &filename, &stream))
+		if(!PyArg_ParseTupleAndKeywords(args, kwds, "s:Sound", const_cast<char**>(kwlist), &filename))
 		{
 			Py_DECREF(self);
 			return nullptr;
@@ -101,7 +100,7 @@ Sound_new(PyTypeObject* type, PyObject* args, PyObject* kwds)
 
 		try
 		{
-			self->sound = new std::shared_ptr<ISound>(new File(filename, stream));
+			self->sound = new std::shared_ptr<ISound>(new File(filename));
 		}
 		catch(Exception& e)
 		{
@@ -408,9 +407,8 @@ static PyObject *
 Sound_file(PyTypeObject* type, PyObject* args)
 {
 	const char* filename = nullptr;
-	int stream = 0;
 
-	if(!PyArg_ParseTuple(args, "s|i:file", &filename, &stream))
+	if(!PyArg_ParseTuple(args, "s:file", &filename))
 		return nullptr;
 
 	Sound* self;
@@ -420,7 +418,7 @@ Sound_file(PyTypeObject* type, PyObject* args)
 	{
 		try
 		{
-			self->sound = new std::shared_ptr<ISound>(new File(filename, stream));
+			self->sound = new std::shared_ptr<ISound>(new File(filename));
 		}
 		catch(Exception& e)
 		{

extern/audaspace/bindings/python/setup.py.in

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 
 import sys
 import os

extern/audaspace/include/file/File.h

@@ -23,11 +23,9 @@
  */
 
 #include "ISound.h"
-#include "FileInfo.h"
 
 #include <string>
 #include <memory>
-#include <vector>
 
 AUD_NAMESPACE_BEGIN
 
@@ -50,14 +48,6 @@ private:
 	 */
 	std::shared_ptr<Buffer> m_buffer;
 
-	/**
-	 * The index of the stream within the file if it contains multiple.
-	 * The first audio stream in the file has index 0 and the index increments by one
-	 * for every other audio stream in the file. Other types of streams in the file
-	 * do not count.
-	 */
-	int m_stream;
-
 	// delete copy constructor and operator=
 	File(const File&) = delete;
 	File& operator=(const File&) = delete;
@@ -67,25 +57,16 @@ public:
 	 * Creates a new sound.
 	 * The file is read from the file system using the given path.
 	 * \param filename The sound file path.
-	 * \param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 */
-	File(std::string filename, int stream = 0);
+	File(std::string filename);
 
 	/**
 	 * Creates a new sound.
 	 * The file is read from memory using the supplied buffer.
 	 * \param buffer The buffer to read from.
 	 * \param size The size of the buffer.
-	 * \param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 */
-	File(const data_t* buffer, int size, int stream = 0);
-
-	/**
-	 * Queries the streams of the file.
-	 * \return A vector with as many streams as there are in the file.
-	 * \exception Exception Thrown if the file specified cannot be read.
-	 */
-	std::vector<StreamInfo> queryStreams();
+	File(const data_t* buffer, int size);
 
 	virtual std::shared_ptr<IReader> createReader();
 };

extern/audaspace/include/file/FileInfo.h

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright 2009-2016 Jörg Müller
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-#pragma once
-
-/**
- * @file FileInfo.h
- * @ingroup file
- * The FileInfo data structures.
- */
-
-#include "respec/Specification.h"
-
-AUD_NAMESPACE_BEGIN
-
-/// Specification of a sound source.
-struct StreamInfo
-{
-	/// Start time in seconds.
-	double start;
-
-	/// Duration in seconds. May be estimated or 0 if unknown.
-	double duration;
-
-	/// Audio data parameters.
-	DeviceSpecs specs;
-};
-
-AUD_NAMESPACE_END

extern/audaspace/include/file/FileManager.h

@@ -22,14 +22,12 @@
  * The FileManager class.
  */
 
-#include "FileInfo.h"
 #include "respec/Specification.h"
 #include "IWriter.h"
 
 #include <list>
 #include <memory>
 #include <string>
-#include <vector>
 
 AUD_NAMESPACE_BEGIN
 
@@ -68,36 +66,18 @@ public:
 	/**
 	 * Creates a file reader for the given filename if a registed IFileInput is able to read it.
 	 * @param filename The path to the file.
-	 * @param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 * @return The reader created.
 	 * @exception Exception If no file input can read the file an exception is thrown.
 	 */
-	static std::shared_ptr<IReader> createReader(std::string filename, int stream = 0);
+	static std::shared_ptr<IReader> createReader(std::string filename);
 
 	/**
 	 * Creates a file reader for the given buffer if a registed IFileInput is able to read it.
 	 * @param buffer The buffer to read the file from.
-	 * @param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 * @return The reader created.
 	 * @exception Exception If no file input can read the file an exception is thrown.
 	 */
-	static std::shared_ptr<IReader> createReader(std::shared_ptr<Buffer> buffer, int stream = 0);
-
-	/**
-	 * Queries the streams of a sound file.
-	 * \param filename Path to the file to be read.
-	 * \return A vector with as many streams as there are in the file.
-	 * \exception Exception Thrown if the file specified cannot be read.
-	 */
-	static std::vector<StreamInfo> queryStreams(std::string filename);
-
-	/**
-	 * Queries the streams of a sound file.
-	 * \param buffer The in-memory file buffer.
-	 * \return A vector with as many streams as there are in the file.
-	 * \exception Exception Thrown if the file specified cannot be read.
-	 */
-	static std::vector<StreamInfo> queryStreams(std::shared_ptr<Buffer> buffer);
+	static std::shared_ptr<IReader> createReader(std::shared_ptr<Buffer> buffer);
 
 	/**
 	 * Creates a file writer that writes a sound to the given file path.

extern/audaspace/include/file/IFileInput.h

@@ -23,11 +23,9 @@
  */
 
 #include "Audaspace.h"
-#include "FileInfo.h"
 
 #include <memory>
 #include <string>
-#include <vector>
 
 AUD_NAMESPACE_BEGIN
 
@@ -50,36 +48,18 @@ public:
 	/**
 	 * Creates a reader for a file to be read.
 	 * \param filename Path to the file to be read.
-	 * \param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 * \return The reader that reads the file.
 	 * \exception Exception Thrown if the file specified cannot be read.
 	 */
-	virtual std::shared_ptr<IReader> createReader(std::string filename, int stream = 0)=0;
+	virtual std::shared_ptr<IReader> createReader(std::string filename)=0;
 
 	/**
 	 * Creates a reader for a file to be read from memory.
 	 * \param buffer The in-memory file buffer.
-	 * \param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 * \return The reader that reads the file.
 	 * \exception Exception Thrown if the file specified cannot be read.
 	 */
-	virtual std::shared_ptr<IReader> createReader(std::shared_ptr<Buffer> buffer, int stream = 0)=0;
-
-	/**
-	 * Queries the streams of a sound file.
-	 * \param filename Path to the file to be read.
-	 * \return A vector with as many streams as there are in the file.
-	 * \exception Exception Thrown if the file specified cannot be read.
-	 */
-	virtual std::vector<StreamInfo> queryStreams(std::string filename)=0;
-
-	/**
-	 * Queries the streams of a sound file.
-	 * \param buffer The in-memory file buffer.
-	 * \return A vector with as many streams as there are in the file.
-	 * \exception Exception Thrown if the file specified cannot be read.
-	 */
-	virtual std::vector<StreamInfo> queryStreams(std::shared_ptr<Buffer> buffer)=0;
+	virtual std::shared_ptr<IReader> createReader(std::shared_ptr<Buffer> buffer)=0;
 };
 
 AUD_NAMESPACE_END

extern/audaspace/include/util/RingBuffer.h

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright 2009-2021 Jörg Müller
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-#pragma once
-
-/**
- * @file RingBuffer.h
- * @ingroup util
- * The RingBuffer class.
- */
-
-#include "Audaspace.h"
-#include "Buffer.h"
-
-#include <cstddef>
-
-AUD_NAMESPACE_BEGIN
-
-/**
- * This class is a simple ring buffer in RAM which is 32 Byte aligned and provides
- * functionality for concurrent reading and writting without locks.
- */
-class AUD_API RingBuffer
-{
-private:
-	/// The buffer storing the actual data.
-	Buffer m_buffer;
-
-	/// The reading pointer.
-	volatile size_t m_read;
-
-	/// The writing pointer.
-	volatile size_t m_write;
-
-	// delete copy constructor and operator=
-	RingBuffer(const RingBuffer&) = delete;
-	RingBuffer& operator=(const RingBuffer&) = delete;
-
-public:
-	/**
-	 * Creates a new ring buffer.
-	 * \param size The size of the buffer in bytes.
-	 */
-	RingBuffer(int size = 0);
-
-	/**
-	 * Returns the pointer to the ring buffer in memory.
-	 */
-	sample_t* getBuffer() const;
-
-	/**
-	 * Returns the size of the ring buffer in bytes.
-	 */
-	int getSize() const;
-
-	size_t getReadSize() const;
-
-	size_t getWriteSize() const;
-
-	size_t read(data_t* target, size_t size);
-
-	size_t write(data_t* source, size_t size);
-
-	/**
-	 * Resets the ring buffer to a state where nothing has been written or read.
-	 */
-	void reset();
-
-	/**
-	 * Resizes the ring buffer.
-	 * \param size The new size of the ring buffer, measured in bytes.
-	 */
-	void resize(int size);
-
-	/**
-	 * Makes sure the ring buffer has a minimum size.
-	 * If size is >= current size, nothing will happen.
-	 * Otherwise the ring buffer is resized with keep as parameter.
-	 * \param size The new minimum size of the ring buffer, measured in bytes.
-	 */
-	void assureSize(int size);
-};
-
-AUD_NAMESPACE_END

extern/audaspace/plugins/ffmpeg/FFMPEG.cpp

@@ -35,24 +35,14 @@ void FFMPEG::registerPlugin()
 	FileManager::registerOutput(plugin);
 }
 
-std::shared_ptr<IReader> FFMPEG::createReader(std::string filename, int stream)
+std::shared_ptr<IReader> FFMPEG::createReader(std::string filename)
 {
-	return std::shared_ptr<IReader>(new FFMPEGReader(filename, stream));
+	return std::shared_ptr<IReader>(new FFMPEGReader(filename));
 }
 
-std::shared_ptr<IReader> FFMPEG::createReader(std::shared_ptr<Buffer> buffer, int stream)
+std::shared_ptr<IReader> FFMPEG::createReader(std::shared_ptr<Buffer> buffer)
 {
-	return std::shared_ptr<IReader>(new FFMPEGReader(buffer, stream));
-}
-
-std::vector<StreamInfo> FFMPEG::queryStreams(std::string filename)
-{
-	return FFMPEGReader(filename).queryStreams();
-}
-
-std::vector<StreamInfo> FFMPEG::queryStreams(std::shared_ptr<Buffer> buffer)
-{
-	return FFMPEGReader(buffer).queryStreams();
+	return std::shared_ptr<IReader>(new FFMPEGReader(buffer));
 }
 
 std::shared_ptr<IWriter> FFMPEG::createWriter(std::string filename, DeviceSpecs specs, Container format, Codec codec, unsigned int bitrate)

extern/audaspace/plugins/ffmpeg/FFMPEG.h

@@ -52,10 +52,8 @@ public:
 	 */
 	static void registerPlugin();
 
-	virtual std::shared_ptr<IReader> createReader(std::string filename, int stream = 0);
-	virtual std::shared_ptr<IReader> createReader(std::shared_ptr<Buffer> buffer, int stream = 0);
-	virtual std::vector<StreamInfo> queryStreams(std::string filename);
-	virtual std::vector<StreamInfo> queryStreams(std::shared_ptr<Buffer> buffer);
+	virtual std::shared_ptr<IReader> createReader(std::string filename);
+	virtual std::shared_ptr<IReader> createReader(std::shared_ptr<Buffer> buffer);
 	virtual std::shared_ptr<IWriter> createWriter(std::string filename, DeviceSpecs specs, Container format, Codec codec, unsigned int bitrate);
 };
 

extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp

@@ -31,25 +31,6 @@ AUD_NAMESPACE_BEGIN
 #define FFMPEG_OLD_CODE
 #endif
 
-SampleFormat FFMPEGReader::convertSampleFormat(AVSampleFormat format)
-{
-	switch(av_get_packed_sample_fmt(format))
-	{
-	case AV_SAMPLE_FMT_U8:
-		return FORMAT_U8;
-	case AV_SAMPLE_FMT_S16:
-		return FORMAT_S16;
-	case AV_SAMPLE_FMT_S32:
-		return FORMAT_S32;
-	case AV_SAMPLE_FMT_FLT:
-		return FORMAT_FLOAT32;
-	case AV_SAMPLE_FMT_DBL:
-		return FORMAT_FLOAT64;
-	default:
-		AUD_THROW(FileException, "FFMPEG sample format unknown.");
-	}
-}
-
 int FFMPEGReader::decode(AVPacket& packet, Buffer& buffer)
 {
 	int buf_size = buffer.getSize();
@@ -142,7 +123,7 @@ int FFMPEGReader::decode(AVPacket& packet, Buffer& buffer)
 	return buf_pos;
 }
 
-void FFMPEGReader::init(int stream)
+void FFMPEGReader::init()
 {
 	m_position = 0;
 	m_pkgbuf_left = 0;
@@ -162,13 +143,8 @@ void FFMPEGReader::init(int stream)
 #endif
 			&& (m_stream < 0))
 		{
-			if(stream == 0)
-			{
-				m_stream=i;
-				break;
-			}
-			else
-				stream--;
+			m_stream=i;
+			break;
 		}
 	}
 
@@ -239,7 +215,7 @@ void FFMPEGReader::init(int stream)
 	m_specs.rate = (SampleRate) m_codecCtx->sample_rate;
 }
 
-FFMPEGReader::FFMPEGReader(std::string filename, int stream) :
+FFMPEGReader::FFMPEGReader(std::string filename) :
 	m_pkgbuf(),
 	m_formatCtx(nullptr),
 	m_codecCtx(nullptr),
@@ -253,7 +229,7 @@ FFMPEGReader::FFMPEGReader(std::string filename, int stream) :
 
 	try
 	{
-		init(stream);
+		init();
 	}
 	catch(Exception&)
 	{
@@ -262,7 +238,7 @@ FFMPEGReader::FFMPEGReader(std::string filename, int stream) :
 	}
 }
 
-FFMPEGReader::FFMPEGReader(std::shared_ptr<Buffer> buffer, int stream) :
+FFMPEGReader::FFMPEGReader(std::shared_ptr<Buffer> buffer) :
 		m_pkgbuf(),
 		m_codecCtx(nullptr),
 		m_frame(nullptr),
@@ -289,7 +265,7 @@ FFMPEGReader::FFMPEGReader(std::shared_ptr<Buffer> buffer, int stream) :
 
 	try
 	{
-		init(stream);
+		init();
 	}
 	catch(Exception&)
 	{
@@ -312,51 +288,6 @@ FFMPEGReader::~FFMPEGReader()
 	avformat_close_input(&m_formatCtx);
 }
 
-std::vector<StreamInfo> FFMPEGReader::queryStreams()
-{
-	std::vector<StreamInfo> result;
-
-	for(unsigned int i = 0; i < m_formatCtx->nb_streams; i++)
-	{
-#ifdef FFMPEG_OLD_CODE
-		if(m_formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
-#else
-		if(m_formatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
-#endif
-		{
-			StreamInfo info;
-
-			double time_base = av_q2d(m_formatCtx->streams[i]->time_base);
-
-			if(m_formatCtx->streams[i]->start_time != AV_NOPTS_VALUE)
-				info.start = m_formatCtx->streams[i]->start_time * time_base;
-			else
-				info.start = 0;
-
-			if(m_formatCtx->streams[i]->duration != AV_NOPTS_VALUE)
-				info.duration = m_formatCtx->streams[i]->duration * time_base;
-			else if(m_formatCtx->duration != AV_NOPTS_VALUE)
-				info.duration = double(m_formatCtx->duration) / AV_TIME_BASE - info.start;
-			else
-				info.duration = 0;
-
-#ifdef FFMPEG_OLD_CODE
-			info.specs.channels = Channels(m_formatCtx->streams[i]->codec->channels);
-			info.specs.rate = m_formatCtx->streams[i]->codec->sample_rate;
-			info.specs.format = convertSampleFormat(m_formatCtx->streams[i]->codec->sample_fmt);
-#else
-			info.specs.channels = Channels(m_formatCtx->streams[i]->codecpar->channels);
-			info.specs.rate = m_formatCtx->streams[i]->codecpar->sample_rate;
-			info.specs.format = convertSampleFormat(AVSampleFormat(m_formatCtx->streams[i]->codecpar->format));
-#endif
-
-			result.emplace_back(info);
-		}
-	}
-
-	return result;
-}
-
 int FFMPEGReader::read_packet(void* opaque, uint8_t* buf, int buf_size)
 {
 	FFMPEGReader* reader = reinterpret_cast<FFMPEGReader*>(opaque);
@@ -407,16 +338,22 @@ void FFMPEGReader::seek(int position)
 {
 	if(position >= 0)
 	{
-		double pts_time_base = av_q2d(m_formatCtx->streams[m_stream]->time_base);
+		uint64_t st_time = m_formatCtx->start_time;
+		uint64_t seek_pos = ((uint64_t)position) * ((uint64_t)AV_TIME_BASE) / ((uint64_t)m_specs.rate);
 
-		uint64_t st_time = m_formatCtx->streams[m_stream]->start_time;
-		uint64_t seek_pos = (uint64_t)(position / (pts_time_base * m_specs.rate));
-
-		if(st_time != AV_NOPTS_VALUE)
+		if(st_time != AV_NOPTS_VALUE) {
 			seek_pos += st_time;
+		}
+
+		double pts_time_base = 
+			av_q2d(m_formatCtx->streams[m_stream]->time_base);
+		uint64_t pts_st_time =
+			((st_time != AV_NOPTS_VALUE) ? st_time : 0)
+			/ pts_time_base / (uint64_t) AV_TIME_BASE;
 
 		// a value < 0 tells us that seeking failed
-		if(av_seek_frame(m_formatCtx, m_stream, seek_pos, AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_ANY) >= 0)
+		if(av_seek_frame(m_formatCtx, -1, seek_pos,
+				 AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_ANY) >= 0)
 		{
 			avcodec_flush_buffers(m_codecCtx);
 			m_position = position;
@@ -437,7 +374,7 @@ void FFMPEGReader::seek(int position)
 					if(packet.pts != AV_NOPTS_VALUE)
 					{
 						// calculate real position, and read to frame!
-						m_position = (packet.pts - (st_time != AV_NOPTS_VALUE ? st_time : 0)) * pts_time_base * m_specs.rate;
+						m_position = (packet.pts - pts_st_time) * pts_time_base * m_specs.rate;
 
 						if(m_position < position)
 						{
@@ -467,25 +404,9 @@ void FFMPEGReader::seek(int position)
 
 int FFMPEGReader::getLength() const
 {
-	auto stream = m_formatCtx->streams[m_stream];
-
-	double time_base = av_q2d(stream->time_base);
-	double duration;
-
-	if(stream->duration != AV_NOPTS_VALUE)
-		duration = stream->duration * time_base;
-	else if(m_formatCtx->duration != AV_NOPTS_VALUE)
-	{
-		duration = float(m_formatCtx->duration) / AV_TIME_BASE;
-
-		if(stream->start_time != AV_NOPTS_VALUE)
-			duration -= stream->start_time * time_base;
-	}
-	else
-		duration = -1;
-
 	// return approximated remaning size
-	return (int)(duration * m_codecCtx->sample_rate) - m_position;
+	return (int)((m_formatCtx->duration * m_codecCtx->sample_rate)
+				 / AV_TIME_BASE)-m_position;
 }
 
 int FFMPEGReader::getPosition() const

extern/audaspace/plugins/ffmpeg/FFMPEGReader.h

@@ -29,11 +29,9 @@
 #include "respec/ConverterFunctions.h"
 #include "IReader.h"
 #include "util/Buffer.h"
-#include "file/FileInfo.h"
 
 #include <string>
 #include <memory>
-#include <vector>
 
 struct AVCodecContext;
 extern "C" {
@@ -121,13 +119,6 @@ private:
 	 */
 	bool m_tointerleave;
 
-	/**
-	 * Converts an ffmpeg sample format to an audaspace one.
-	 * \param format The AVSampleFormat sample format.
-	 * \return The sample format as SampleFormat.
-	 */
-	AUD_LOCAL static SampleFormat convertSampleFormat(AVSampleFormat format);
-
 	/**
 	 * Decodes a packet into the given buffer.
 	 * \param packet The AVPacket to decode.
@@ -138,9 +129,8 @@ private:
 
 	/**
 	 * Initializes the object.
-	 * \param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 */
-	AUD_LOCAL void init(int stream);
+	AUD_LOCAL void init();
 
 	// delete copy constructor and operator=
 	FFMPEGReader(const FFMPEGReader&) = delete;
@@ -150,33 +140,24 @@ public:
 	/**
 	 * Creates a new reader.
 	 * \param filename The path to the file to be read.
-	 * \param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 * \exception Exception Thrown if the file specified does not exist or
 	 *            cannot be read with ffmpeg.
 	 */
-	FFMPEGReader(std::string filename, int stream = 0);
+	FFMPEGReader(std::string filename);
 
 	/**
 	 * Creates a new reader.
 	 * \param buffer The buffer to read from.
-	 * \param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 * \exception Exception Thrown if the buffer specified cannot be read
 	 *                          with ffmpeg.
 	 */
-	FFMPEGReader(std::shared_ptr<Buffer> buffer, int stream = 0);
+	FFMPEGReader(std::shared_ptr<Buffer> buffer);
 
 	/**
 	 * Destroys the reader and closes the file.
 	 */
 	virtual ~FFMPEGReader();
 
-	/**
-	 * Queries the streams of a sound file.
-	 * \return A vector with as many streams as there are in the file.
-	 * \exception Exception Thrown if the file specified cannot be read.
-	 */
-	virtual std::vector<StreamInfo> queryStreams();
-
 	/**
 	 * Reads data to a memory buffer.
 	 * This function is used for avio only.

extern/audaspace/plugins/libsndfile/SndFile.cpp

@@ -32,26 +32,16 @@ void SndFile::registerPlugin()
 	FileManager::registerOutput(plugin);
 }
 
-std::shared_ptr<IReader> SndFile::createReader(std::string filename, int stream)
+std::shared_ptr<IReader> SndFile::createReader(std::string filename)
 {
 	return std::shared_ptr<IReader>(new SndFileReader(filename));
 }
 
-std::shared_ptr<IReader> SndFile::createReader(std::shared_ptr<Buffer> buffer, int stream)
+std::shared_ptr<IReader> SndFile::createReader(std::shared_ptr<Buffer> buffer)
 {
 	return std::shared_ptr<IReader>(new SndFileReader(buffer));
 }
 
-std::vector<StreamInfo> SndFile::queryStreams(std::string filename)
-{
-	return SndFileReader(filename).queryStreams();
-}
-
-std::vector<StreamInfo> SndFile::queryStreams(std::shared_ptr<Buffer> buffer)
-{
-	return SndFileReader(buffer).queryStreams();
-}
-
 std::shared_ptr<IWriter> SndFile::createWriter(std::string filename, DeviceSpecs specs, Container format, Codec codec, unsigned int bitrate)
 {
 	return std::shared_ptr<IWriter>(new SndFileWriter(filename, specs, format, codec, bitrate));

extern/audaspace/plugins/libsndfile/SndFile.h

@@ -52,10 +52,8 @@ public:
 	 */
 	static void registerPlugin();
 
-	virtual std::shared_ptr<IReader> createReader(std::string filename, int stream = 0);
-	virtual std::shared_ptr<IReader> createReader(std::shared_ptr<Buffer> buffer, int stream = 0);
-	virtual std::vector<StreamInfo> queryStreams(std::string filename);
-	virtual std::vector<StreamInfo> queryStreams(std::shared_ptr<Buffer> buffer);
+	virtual std::shared_ptr<IReader> createReader(std::string filename);
+	virtual std::shared_ptr<IReader> createReader(std::shared_ptr<Buffer> buffer);
 	virtual std::shared_ptr<IWriter> createWriter(std::string filename, DeviceSpecs specs, Container format, Codec codec, unsigned int bitrate);
 };
 

extern/audaspace/plugins/libsndfile/SndFileReader.cpp

@@ -118,21 +118,6 @@ SndFileReader::~SndFileReader()
 	sf_close(m_sndfile);
 }
 
-std::vector<StreamInfo> SndFileReader::queryStreams()
-{
-	std::vector<StreamInfo> result;
-
-	StreamInfo info;
-	info.start = 0;
-	info.duration = double(getLength()) / m_specs.rate;
-	info.specs.specs = m_specs;
-	info.specs.format = FORMAT_FLOAT32;
-
-	result.emplace_back(info);
-
-	return result;
-}
-
 bool SndFileReader::isSeekable() const
 {
 	return m_seekable;

extern/audaspace/plugins/libsndfile/SndFileReader.h

@@ -28,12 +28,9 @@
  * The SndFileReader class.
  */
 
-#include "file/FileInfo.h"
-
 #include <string>
 #include <sndfile.h>
 #include <memory>
-#include <vector>
 
 AUD_NAMESPACE_BEGIN
 
@@ -99,7 +96,6 @@ public:
 	/**
 	 * Creates a new reader.
 	 * \param filename The path to the file to be read.
-	 * \param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 * \exception Exception Thrown if the file specified does not exist or
 	 *            cannot be read with libsndfile.
 	 */
@@ -108,7 +104,6 @@ public:
 	/**
 	 * Creates a new reader.
 	 * \param buffer The buffer to read from.
-	 * \param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 * \exception Exception Thrown if the buffer specified cannot be read
 	 *                          with libsndfile.
 	 */
@@ -119,13 +114,6 @@ public:
 	 */
 	virtual ~SndFileReader();
 
-	/**
-	 * Queries the streams of a sound file.
-	 * \return A vector with as many streams as there are in the file.
-	 * \exception Exception Thrown if the file specified cannot be read.
-	 */
-	virtual std::vector<StreamInfo> queryStreams();
-
 	virtual bool isSeekable() const;
 	virtual void seek(int position);
 	virtual int getLength() const;

extern/audaspace/plugins/pulseaudio/PulseAudioDevice.cpp

@@ -23,121 +23,89 @@
 
 AUD_NAMESPACE_BEGIN
 
-PulseAudioDevice::PulseAudioSynchronizer::PulseAudioSynchronizer(PulseAudioDevice *device) :
-	m_device(device)
-{
-}
-
-double PulseAudioDevice::PulseAudioSynchronizer::getPosition(std::shared_ptr<IHandle> handle)
-{
-	pa_usec_t latency;
-	int negative;
-	AUD_pa_stream_get_latency(m_device->m_stream, &latency, &negative);
-
-	double delay = m_device->m_ring_buffer.getReadSize() / (AUD_SAMPLE_SIZE(m_device->m_specs) * m_device->m_specs.rate) + latency * 1.0e-6;
-
-	return handle->getPosition() - delay;
-}
-
-void PulseAudioDevice::updateRingBuffer()
-{
-	unsigned int samplesize = AUD_SAMPLE_SIZE(m_specs);
-
-	std::unique_lock<std::mutex> lock(m_mixingLock);
-
-	Buffer buffer;
-
-	while(m_valid)
-	{
-		size_t size = m_ring_buffer.getWriteSize();
-
-		size_t sample_count = size / samplesize;
-
-		if(sample_count > 0)
-		{
-			size = sample_count * samplesize;
-
-			buffer.assureSize(size);
-
-			mix(reinterpret_cast<data_t*>(buffer.getBuffer()), sample_count);
-
-			m_ring_buffer.write(reinterpret_cast<data_t*>(buffer.getBuffer()), size);
-		}
-
-		m_mixingCondition.wait(lock);
-	}
-}
-
 void PulseAudioDevice::PulseAudio_state_callback(pa_context *context, void *data)
 {
 	PulseAudioDevice* device = (PulseAudioDevice*)data;
 
-	device->m_state = AUD_pa_context_get_state(context);
+	std::lock_guard<ILockable> lock(*device);
 
-	AUD_pa_threaded_mainloop_signal(device->m_mainloop, 0);
+	device->m_state = AUD_pa_context_get_state(context);
 }
 
-void PulseAudioDevice::PulseAudio_request(pa_stream *stream, size_t total_bytes, void *data)
+void PulseAudioDevice::PulseAudio_request(pa_stream *stream, size_t num_bytes, void *data)
 {
 	PulseAudioDevice* device = (PulseAudioDevice*)data;
 
-	data_t* buffer;
+	void* buffer;
 
-	size_t sample_size = AUD_DEVICE_SAMPLE_SIZE(device->m_specs);
+	AUD_pa_stream_begin_write(stream, &buffer, &num_bytes);
 
-	while(total_bytes > 0)
+	device->mix((data_t*)buffer, num_bytes / AUD_DEVICE_SAMPLE_SIZE(device->m_specs));
+
+	AUD_pa_stream_write(stream, buffer, num_bytes, nullptr, 0, PA_SEEK_RELATIVE);
+}
+
+void PulseAudioDevice::PulseAudio_underflow(pa_stream *stream, void *data)
+{
+	PulseAudioDevice* device = (PulseAudioDevice*)data;
+
+	DeviceSpecs specs = device->getSpecs();
+
+	if(++device->m_underflows > 4 && device->m_buffersize < AUD_DEVICE_SAMPLE_SIZE(specs) * specs.rate * 2)
 	{
-		size_t num_bytes = total_bytes;
+		device->m_buffersize <<= 1;
+		device->m_underflows = 0;
 
-		AUD_pa_stream_begin_write(stream, reinterpret_cast<void**>(&buffer), &num_bytes);
+		pa_buffer_attr buffer_attr;
 
-		size_t readsamples = device->m_ring_buffer.getReadSize();
+		buffer_attr.fragsize = -1U;
+		buffer_attr.maxlength = -1U;
+		buffer_attr.minreq = -1U;
+		buffer_attr.prebuf = -1U;
+		buffer_attr.tlength = device->m_buffersize;
 
-		readsamples = std::min(readsamples, size_t(num_bytes)) / sample_size;
-
-		device->m_ring_buffer.read(buffer, readsamples * sample_size);
-
-		if(readsamples * sample_size < num_bytes)
-			std::memset(buffer + readsamples * sample_size, 0, num_bytes - readsamples * sample_size);
-
-		if(device->m_mixingLock.try_lock())
-		{
-			device->m_mixingCondition.notify_all();
-			device->m_mixingLock.unlock();
-		}
-
-		AUD_pa_stream_write(stream, reinterpret_cast<void*>(buffer), num_bytes, nullptr, 0, PA_SEEK_RELATIVE);
-
-		total_bytes -= num_bytes;
+		AUD_pa_stream_set_buffer_attr(stream, &buffer_attr, nullptr, nullptr);
 	}
 }
 
-void PulseAudioDevice::playing(bool playing)
+void PulseAudioDevice::runMixingThread()
 {
-	m_playback = playing;
+	for(;;)
+	{
+		{
+			std::lock_guard<ILockable> lock(*this);
 
-	AUD_pa_threaded_mainloop_lock(m_mainloop);
-	AUD_pa_stream_cork(m_stream, playing ? 0 : 1, nullptr, nullptr);
-	AUD_pa_threaded_mainloop_unlock(m_mainloop);
+			if(shouldStop())
+			{
+				AUD_pa_stream_cork(m_stream, 1, nullptr, nullptr);
+				AUD_pa_stream_flush(m_stream, nullptr, nullptr);
+				doStop();
+				return;
+			}
+		}
+
+		if(AUD_pa_stream_is_corked(m_stream))
+			AUD_pa_stream_cork(m_stream, 0, nullptr, nullptr);
+
+		// similar to AUD_pa_mainloop_iterate(m_mainloop, false, nullptr); except with a longer timeout
+		AUD_pa_mainloop_prepare(m_mainloop, 1 << 14);
+		AUD_pa_mainloop_poll(m_mainloop);
+		AUD_pa_mainloop_dispatch(m_mainloop);
+	}
 }
 
 PulseAudioDevice::PulseAudioDevice(std::string name, DeviceSpecs specs, int buffersize) :
-	m_synchronizer(this),
-	m_playback(false),
 	m_state(PA_CONTEXT_UNCONNECTED),
-	m_valid(true),
+	m_buffersize(buffersize),
 	m_underflows(0)
 {
-	m_mainloop = AUD_pa_threaded_mainloop_new();
+	m_mainloop = AUD_pa_mainloop_new();
 
-	AUD_pa_threaded_mainloop_lock(m_mainloop);
-
-	m_context = AUD_pa_context_new(AUD_pa_threaded_mainloop_get_api(m_mainloop), name.c_str());
+	m_context = AUD_pa_context_new(AUD_pa_mainloop_get_api(m_mainloop), name.c_str());
 
 	if(!m_context)
 	{
-		AUD_pa_threaded_mainloop_unlock(m_mainloop);
-		AUD_pa_threaded_mainloop_free(m_mainloop);
+		AUD_pa_mainloop_free(m_mainloop);
 
 		AUD_THROW(DeviceException, "Could not connect to PulseAudio.");
 	}
@@ -146,26 +114,21 @@ PulseAudioDevice::PulseAudioDevice(std::string name, DeviceSpecs specs, int buff
 
 	AUD_pa_context_connect(m_context, nullptr, PA_CONTEXT_NOFLAGS, nullptr);
 
-	AUD_pa_threaded_mainloop_start(m_mainloop);
-
 	while(m_state != PA_CONTEXT_READY)
 	{
 		switch(m_state)
 		{
 		case PA_CONTEXT_FAILED:
 		case PA_CONTEXT_TERMINATED:
-			AUD_pa_threaded_mainloop_unlock(m_mainloop);
-			AUD_pa_threaded_mainloop_stop(m_mainloop);
-
 			AUD_pa_context_disconnect(m_context);
 			AUD_pa_context_unref(m_context);
 
-			AUD_pa_threaded_mainloop_free(m_mainloop);
+			AUD_pa_mainloop_free(m_mainloop);
 
 			AUD_THROW(DeviceException, "Could not connect to PulseAudio.");
 			break;
 		default:
-			AUD_pa_threaded_mainloop_wait(m_mainloop);
+			AUD_pa_mainloop_iterate(m_mainloop, true, nullptr);
 			break;
 		}
 	}
@@ -213,21 +176,16 @@ PulseAudioDevice::PulseAudioDevice(std::string name, DeviceSpecs specs, int buff
 
 	if(!m_stream)
 	{
-		AUD_pa_threaded_mainloop_unlock(m_mainloop);
-		AUD_pa_threaded_mainloop_stop(m_mainloop);
-
 		AUD_pa_context_disconnect(m_context);
 		AUD_pa_context_unref(m_context);
 
-		AUD_pa_threaded_mainloop_free(m_mainloop);
+		AUD_pa_mainloop_free(m_mainloop);
 
 		AUD_THROW(DeviceException, "Could not create PulseAudio stream.");
 	}
 
 	AUD_pa_stream_set_write_callback(m_stream, PulseAudio_request, this);
-
-	buffersize *= AUD_DEVICE_SAMPLE_SIZE(m_specs);
-	m_buffersize = buffersize;
+	AUD_pa_stream_set_underflow_callback(m_stream, PulseAudio_underflow, this);
 
 	pa_buffer_attr buffer_attr;
 
@@ -237,53 +195,31 @@ PulseAudioDevice::PulseAudioDevice(std::string name, DeviceSpecs specs, int buff
 	buffer_attr.prebuf = -1U;
 	buffer_attr.tlength = buffersize;
 
-	m_ring_buffer.resize(buffersize);
-
-	if(AUD_pa_stream_connect_playback(m_stream, nullptr, &buffer_attr, static_cast<pa_stream_flags_t>(PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_ADJUST_LATENCY | PA_STREAM_AUTO_TIMING_UPDATE), nullptr, nullptr) < 0)
+	if(AUD_pa_stream_connect_playback(m_stream, nullptr, &buffer_attr, static_cast<pa_stream_flags_t>(PA_STREAM_START_CORKED | PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_ADJUST_LATENCY | PA_STREAM_AUTO_TIMING_UPDATE), nullptr, nullptr) < 0)
 	{
-		AUD_pa_threaded_mainloop_unlock(m_mainloop);
-		AUD_pa_threaded_mainloop_stop(m_mainloop);
-
 		AUD_pa_context_disconnect(m_context);
 		AUD_pa_context_unref(m_context);
 
-		AUD_pa_threaded_mainloop_free(m_mainloop);
+		AUD_pa_mainloop_free(m_mainloop);
 
 		AUD_THROW(DeviceException, "Could not connect PulseAudio stream.");
 	}
 
-	AUD_pa_threaded_mainloop_unlock(m_mainloop);
-
 	create();
-
-	m_mixingThread = std::thread(&PulseAudioDevice::updateRingBuffer, this);
 }
 
 PulseAudioDevice::~PulseAudioDevice()
 {
-	m_valid = false;
-
-	m_mixingLock.lock();
-	m_mixingCondition.notify_all();
-	m_mixingLock.unlock();
-
-	m_mixingThread.join();
-
-	AUD_pa_threaded_mainloop_stop(m_mainloop);
+	stopMixingThread();
 
 	AUD_pa_context_disconnect(m_context);
 	AUD_pa_context_unref(m_context);
 
-	AUD_pa_threaded_mainloop_free(m_mainloop);
+	AUD_pa_mainloop_free(m_mainloop);
 
 	destroy();
 }
 
-ISynchronizer *PulseAudioDevice::getSynchronizer()
-{
-	return &m_synchronizer;
-}
-
 class PulseAudioDeviceFactory : public IDeviceFactory
 {
 private:

extern/audaspace/plugins/pulseaudio/PulseAudioDevice.h

@@ -26,11 +26,7 @@
  * The PulseAudioDevice class.
  */
 
-#include "devices/SoftwareDevice.h"
-#include "util/RingBuffer.h"
-
-#include <condition_variable>
-#include <thread>
+#include "devices/ThreadedDevice.h"
 
 #include <pulse/pulseaudio.h>
 
@@ -39,65 +35,17 @@ AUD_NAMESPACE_BEGIN
 /**
  * This device plays back through PulseAudio, the simple direct media layer.
  */
-class AUD_PLUGIN_API PulseAudioDevice : public SoftwareDevice
+class AUD_PLUGIN_API PulseAudioDevice : public ThreadedDevice
 {
 private:
-	class PulseAudioSynchronizer : public DefaultSynchronizer
-	{
-		PulseAudioDevice* m_device;
-
-	public:
-		PulseAudioSynchronizer(PulseAudioDevice* device);
-
-		virtual double getPosition(std::shared_ptr<IHandle> handle);
-	};
-
-	/// Synchronizer.
-	PulseAudioSynchronizer m_synchronizer;
-
-	/**
-	 * Whether there is currently playback.
-	 */
-	volatile bool m_playback;
-
-	pa_threaded_mainloop* m_mainloop;
+	pa_mainloop* m_mainloop;
 	pa_context* m_context;
 	pa_stream* m_stream;
 	pa_context_state_t m_state;
 
-	/**
-	 * The mixing ring buffer.
-	 */
-	RingBuffer m_ring_buffer;
-
-	/**
-	 * Whether the device is valid.
-	 */
-	bool m_valid;
-
 	int m_buffersize;
 	uint32_t m_underflows;
 
-	/**
-	 * The mixing thread.
-	 */
-	std::thread m_mixingThread;
-
-	/**
-	 * Mutex for mixing.
-	 */
-	std::mutex m_mixingLock;
-
-	/**
-	 * Condition for mixing.
-	 */
-	std::condition_variable m_mixingCondition;
-
-	/**
-	 * Updates the ring buffer.
-	 */
-	AUD_LOCAL void updateRingBuffer();
-
 	/**
 	 * Reports the state of the PulseAudio server connection.
 	 * \param context The PulseAudio context.
@@ -111,15 +59,25 @@ private:
 	 * \param num_bytes The length in bytes to be supplied.
 	 * \param data The PulseAudio device.
 	 */
-	AUD_LOCAL static void PulseAudio_request(pa_stream* stream, size_t total_bytes, void* data);
+	AUD_LOCAL static void PulseAudio_request(pa_stream* stream, size_t num_bytes, void* data);
+
+	/**
+	 * Reports an underflow from the PulseAudio server.
+	 * Automatically adjusts the latency if this happens too often.
+	 * @param stream The PulseAudio stream.
+	 * \param data The PulseAudio device.
+	 */
+	AUD_LOCAL static void PulseAudio_underflow(pa_stream* stream, void* data);
+
+	/**
+	 * Streaming thread main function.
+	 */
+	AUD_LOCAL void runMixingThread();
 
 	// delete copy constructor and operator=
 	PulseAudioDevice(const PulseAudioDevice&) = delete;
 	PulseAudioDevice& operator=(const PulseAudioDevice&) = delete;
 
-protected:
-	virtual void playing(bool playing);
-
 public:
 	/**
 	 * Opens the PulseAudio audio device for playback.
@@ -135,8 +93,6 @@ public:
 	 */
 	virtual ~PulseAudioDevice();
 
-	virtual ISynchronizer* getSynchronizer();
-
 	/**
 	 * Registers this plugin.
 	 */

extern/audaspace/plugins/pulseaudio/PulseAudioSymbols.h

@@ -25,7 +25,6 @@ PULSEAUDIO_SYMBOL(pa_stream_begin_write);
 PULSEAUDIO_SYMBOL(pa_stream_connect_playback);
 PULSEAUDIO_SYMBOL(pa_stream_cork);
 PULSEAUDIO_SYMBOL(pa_stream_flush);
-PULSEAUDIO_SYMBOL(pa_stream_get_latency);
 PULSEAUDIO_SYMBOL(pa_stream_is_corked);
 PULSEAUDIO_SYMBOL(pa_stream_new);
 PULSEAUDIO_SYMBOL(pa_stream_set_buffer_attr);
@@ -40,13 +39,3 @@ PULSEAUDIO_SYMBOL(pa_mainloop_iterate);
 PULSEAUDIO_SYMBOL(pa_mainloop_prepare);
 PULSEAUDIO_SYMBOL(pa_mainloop_poll);
 PULSEAUDIO_SYMBOL(pa_mainloop_dispatch);
-
-PULSEAUDIO_SYMBOL(pa_threaded_mainloop_free);
-PULSEAUDIO_SYMBOL(pa_threaded_mainloop_get_api);
-PULSEAUDIO_SYMBOL(pa_threaded_mainloop_lock);
-PULSEAUDIO_SYMBOL(pa_threaded_mainloop_new);
-PULSEAUDIO_SYMBOL(pa_threaded_mainloop_signal);
-PULSEAUDIO_SYMBOL(pa_threaded_mainloop_start);
-PULSEAUDIO_SYMBOL(pa_threaded_mainloop_stop);
-PULSEAUDIO_SYMBOL(pa_threaded_mainloop_unlock);
-PULSEAUDIO_SYMBOL(pa_threaded_mainloop_wait);

extern/audaspace/src/file/File.cpp

@@ -23,31 +23,23 @@
 
 AUD_NAMESPACE_BEGIN
 
-File::File(std::string filename, int stream) :
-	m_filename(filename), m_stream(stream)
+File::File(std::string filename) :
+	m_filename(filename)
 {
 }
 
-File::File(const data_t* buffer, int size, int stream) :
-	m_buffer(new Buffer(size)), m_stream(stream)
+File::File(const data_t* buffer, int size) :
+	m_buffer(new Buffer(size))
 {
 	std::memcpy(m_buffer->getBuffer(), buffer, size);
 }
 
-std::vector<StreamInfo> File::queryStreams()
-{
-	if(m_buffer.get())
-		return FileManager::queryStreams(m_buffer);
-	else
-		return FileManager::queryStreams(m_filename);
-}
-
 std::shared_ptr<IReader> File::createReader()
 {
 	if(m_buffer.get())
-		return FileManager::createReader(m_buffer, m_stream);
+		return FileManager::createReader(m_buffer);
 	else
-		return FileManager::createReader(m_filename, m_stream);
+		return FileManager::createReader(m_filename);
 }
 
 AUD_NAMESPACE_END

extern/audaspace/src/file/FileManager.cpp

@@ -43,13 +43,13 @@ void FileManager::registerOutput(std::shared_ptr<aud::IFileOutput> output)
 	outputs().push_back(output);
 }
 
-std::shared_ptr<IReader> FileManager::createReader(std::string filename, int stream)
+std::shared_ptr<IReader> FileManager::createReader(std::string filename)
 {
 	for(std::shared_ptr<IFileInput> input : inputs())
 	{
 		try
 		{
-			return input->createReader(filename, stream);
+			return input->createReader(filename);
 		}
 		catch(Exception&) {}
 	}
@@ -57,41 +57,13 @@ std::shared_ptr<IReader> FileManager::createReader(std::string filename, int str
 	AUD_THROW(FileException, "The file couldn't be read with any installed file reader.");
 }
 
-std::shared_ptr<IReader> FileManager::createReader(std::shared_ptr<Buffer> buffer, int stream)
+std::shared_ptr<IReader> FileManager::createReader(std::shared_ptr<Buffer> buffer)
 {
 	for(std::shared_ptr<IFileInput> input : inputs())
 	{
 		try
 		{
-			return input->createReader(buffer, stream);
-		}
-		catch(Exception&) {}
-	}
-
-	AUD_THROW(FileException, "The file couldn't be read with any installed file reader.");
-}
-
-std::vector<StreamInfo> FileManager::queryStreams(std::string filename)
-{
-	for(std::shared_ptr<IFileInput> input : inputs())
-	{
-		try
-		{
-			return input->queryStreams(filename);
-		}
-		catch(Exception&) {}
-	}
-
-	AUD_THROW(FileException, "The file couldn't be read with any installed file reader.");
-}
-
-std::vector<StreamInfo> FileManager::queryStreams(std::shared_ptr<Buffer> buffer)
-{
-	for(std::shared_ptr<IFileInput> input : inputs())
-	{
-		try
-		{
-			return input->queryStreams(buffer);
+			return input->createReader(buffer);
 		}
 		catch(Exception&) {}
 	}

extern/audaspace/src/util/RingBuffer.cpp

@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright 2009-2021 Jörg Müller
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-#include "util/RingBuffer.h"
-
-#include <algorithm>
-#include <cstring>
-#include <cstdlib>
-
-#define ALIGNMENT 32
-#define ALIGN(a) (a + ALIGNMENT - ((long long)a & (ALIGNMENT-1)))
-
-AUD_NAMESPACE_BEGIN
-
-RingBuffer::RingBuffer(int size) :
-	m_buffer(size),
-	m_read(0),
-	m_write(0)
-{
-}
-
-sample_t* RingBuffer::getBuffer() const
-{
-	return m_buffer.getBuffer();
-}
-
-int RingBuffer::getSize() const
-{
-	return m_buffer.getSize();
-}
-
-size_t RingBuffer::getReadSize() const
-{
-	size_t read = m_read;
-	size_t write = m_write;
-
-	if(read > write)
-		return write + getSize() - read;
-	else
-		return write - read;
-}
-
-size_t RingBuffer::getWriteSize() const
-{
-	size_t read = m_read;
-	size_t write = m_write;
-
-	if(read > write)
-		return read - write - 1;
-	else
-		return read + getSize() - write - 1;
-}
-
-size_t RingBuffer::read(data_t* target, size_t size)
-{
-	size = std::min(size, getReadSize());
-
-	data_t* buffer = reinterpret_cast<data_t*>(m_buffer.getBuffer());
-
-	if(m_read + size > m_buffer.getSize())
-	{
-		size_t read_first = m_buffer.getSize() - m_read;
-		size_t read_second = size - read_first;
-
-		std::memcpy(target, buffer + m_read, read_first);
-		std::memcpy(target + read_first, buffer, read_second);
-
-		m_read = read_second;
-	}
-	else
-	{
-		std::memcpy(target, buffer + m_read, size);
-
-		m_read += size;
-	}
-
-	return size;
-}
-
-size_t RingBuffer::write(data_t* source, size_t size)
-{
-	size = std::min(size, getWriteSize());
-
-	data_t* buffer = reinterpret_cast<data_t*>(m_buffer.getBuffer());
-
-	if(m_write + size > m_buffer.getSize())
-	{
-		size_t write_first = m_buffer.getSize() - m_write;
-		size_t write_second = size - write_first;
-
-		std::memcpy(buffer + m_write, source, write_first);
-		std::memcpy(buffer, source + write_first, write_second);
-
-		m_write = write_second;
-	}
-	else
-	{
-		std::memcpy(buffer + m_write, source, size);
-
-		m_write += size;
-	}
-
-	return size;
-}
-
-void RingBuffer::reset()
-{
-	m_read = 0;
-	m_write = 0;
-}
-
-void RingBuffer::resize(int size)
-{
-	m_buffer.resize(size);
-	reset();
-}
-
-void RingBuffer::assureSize(int size)
-{
-	m_buffer.assureSize(size);
-	reset();
-}
-
-AUD_NAMESPACE_END

extern/cuew/include/cuew.h

@@ -645,8 +645,7 @@ typedef enum CUdevice_P2PAttribute_enum {
   CU_DEVICE_P2P_ATTRIBUTE_PERFORMANCE_RANK = 0x01,
   CU_DEVICE_P2P_ATTRIBUTE_ACCESS_SUPPORTED = 0x02,
   CU_DEVICE_P2P_ATTRIBUTE_NATIVE_ATOMIC_SUPPORTED = 0x03,
-  CU_DEVICE_P2P_ATTRIBUTE_ACCESS_ACCESS_SUPPORTED = 0x04,
-  CU_DEVICE_P2P_ATTRIBUTE_CUDA_ARRAY_ACCESS_SUPPORTED = 0x04,
+  CU_DEVICE_P2P_ATTRIBUTE_ARRAY_ACCESS_ACCESS_SUPPORTED = 0x04,
 } CUdevice_P2PAttribute;
 
 typedef void (CUDA_CB *CUstreamCallback)(CUstream hStream, CUresult status, void* userData);

extern/hipew/CMakeLists.txt

@@ -1,39 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2021, Blender Foundation
-# All rights reserved.
-# ***** END GPL LICENSE BLOCK *****
-
-set(INC
-  .
-  include
-)
-
-set(INC_SYS
-
-)
-
-set(SRC
-  src/hipew.c
-
-  include/hipew.h
-)
-
-set(LIB
-)
-
-blender_add_lib(extern_hipew "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/hipew/src/hipew.c

@@ -1,533 +0,0 @@
-/*
- * Copyright 2011-2021 Blender Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-#ifdef _MSC_VER
-#  if _MSC_VER < 1900
-#    define snprintf _snprintf
-#  endif
-#  define popen _popen
-#  define pclose _pclose
-#  define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include <hipew.h>
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/stat.h>
-
-#ifdef _WIN32
-#  define WIN32_LEAN_AND_MEAN
-#  define VC_EXTRALEAN
-#  include <windows.h>
-
-/* Utility macros. */
-
-typedef HMODULE DynamicLibrary;
-
-#  define dynamic_library_open(path)         LoadLibraryA(path)
-#  define dynamic_library_close(lib)         FreeLibrary(lib)
-#  define dynamic_library_find(lib, symbol)  GetProcAddress(lib, symbol)
-#else
-#  include <dlfcn.h>
-
-typedef void* DynamicLibrary;
-
-#  define dynamic_library_open(path)         dlopen(path, RTLD_NOW)
-#  define dynamic_library_close(lib)         dlclose(lib)
-#  define dynamic_library_find(lib, symbol)  dlsym(lib, symbol)
-#endif
-
-#define _LIBRARY_FIND_CHECKED(lib, name) \
-        name = (t##name *)dynamic_library_find(lib, #name); \
-        assert(name);
-
-#define _LIBRARY_FIND(lib, name) \
-        name = (t##name *)dynamic_library_find(lib, #name);
-
-#define HIP_LIBRARY_FIND_CHECKED(name) \
-        _LIBRARY_FIND_CHECKED(hip_lib, name)
-#define HIP_LIBRARY_FIND(name) _LIBRARY_FIND(hip_lib, name)
-
-
-static DynamicLibrary hip_lib;
-
-/* Function definitions. */
-thipGetErrorName *hipGetErrorName;
-thipInit *hipInit;
-thipDriverGetVersion *hipDriverGetVersion;
-thipGetDevice *hipGetDevice;
-thipGetDeviceCount *hipGetDeviceCount;
-thipDeviceGetName *hipDeviceGetName;
-thipDeviceGetAttribute *hipDeviceGetAttribute;
-thipDeviceComputeCapability *hipDeviceComputeCapability;
-thipDevicePrimaryCtxRetain *hipDevicePrimaryCtxRetain;
-thipDevicePrimaryCtxRelease *hipDevicePrimaryCtxRelease;
-thipDevicePrimaryCtxSetFlags *hipDevicePrimaryCtxSetFlags;
-thipDevicePrimaryCtxGetState *hipDevicePrimaryCtxGetState;
-thipDevicePrimaryCtxReset *hipDevicePrimaryCtxReset;
-thipCtxCreate *hipCtxCreate;
-thipCtxDestroy *hipCtxDestroy;
-thipCtxPushCurrent *hipCtxPushCurrent;
-thipCtxPopCurrent *hipCtxPopCurrent;
-thipCtxSetCurrent *hipCtxSetCurrent;
-thipCtxGetCurrent *hipCtxGetCurrent;
-thipCtxGetDevice *hipCtxGetDevice;
-thipCtxGetFlags *hipCtxGetFlags;
-thipCtxSynchronize *hipCtxSynchronize;
-thipDeviceSynchronize *hipDeviceSynchronize;
-thipCtxGetCacheConfig *hipCtxGetCacheConfig;
-thipCtxSetCacheConfig *hipCtxSetCacheConfig;
-thipCtxGetSharedMemConfig *hipCtxGetSharedMemConfig;
-thipCtxSetSharedMemConfig *hipCtxSetSharedMemConfig;
-thipCtxGetApiVersion *hipCtxGetApiVersion;
-thipModuleLoad *hipModuleLoad;
-thipModuleLoadData *hipModuleLoadData;
-thipModuleLoadDataEx *hipModuleLoadDataEx;
-thipModuleUnload *hipModuleUnload;
-thipModuleGetFunction *hipModuleGetFunction;
-thipModuleGetGlobal *hipModuleGetGlobal;
-thipModuleGetTexRef *hipModuleGetTexRef;
-thipMemGetInfo *hipMemGetInfo;
-thipMalloc *hipMalloc;
-thipMemAllocPitch *hipMemAllocPitch;
-thipFree *hipFree;
-thipMemGetAddressRange *hipMemGetAddressRange;
-thipHostMalloc *hipHostMalloc;
-thipHostFree *hipHostFree;
-thipHostGetDevicePointer *hipHostGetDevicePointer;
-thipHostGetFlags *hipHostGetFlags;
-thipMallocManaged *hipMallocManaged;
-thipDeviceGetByPCIBusId *hipDeviceGetByPCIBusId;
-thipDeviceGetPCIBusId *hipDeviceGetPCIBusId;
-thipMemcpyPeer *hipMemcpyPeer;
-thipMemcpyHtoD *hipMemcpyHtoD;
-thipMemcpyDtoH *hipMemcpyDtoH;
-thipMemcpyDtoD *hipMemcpyDtoD;
-thipDrvMemcpy2DUnaligned *hipDrvMemcpy2DUnaligned;
-thipMemcpyParam2D *hipMemcpyParam2D;
-thipDrvMemcpy3D *hipDrvMemcpy3D;
-thipMemcpyHtoDAsync *hipMemcpyHtoDAsync;
-thipMemcpyDtoHAsync *hipMemcpyDtoHAsync;
-thipMemcpyParam2DAsync *hipMemcpyParam2DAsync;
-thipDrvMemcpy3DAsync *hipDrvMemcpy3DAsync;
-thipMemsetD8 *hipMemsetD8;
-thipMemsetD16 *hipMemsetD16;
-thipMemsetD32 *hipMemsetD32;
-thipMemsetD8Async *hipMemsetD8Async;
-thipMemsetD16Async *hipMemsetD16Async;
-thipMemsetD32Async *hipMemsetD32Async;
-thipArrayCreate *hipArrayCreate;
-thipArrayDestroy *hipArrayDestroy;
-thipArray3DCreate *hipArray3DCreate;
-thipStreamCreateWithFlags *hipStreamCreateWithFlags;
-thipStreamCreateWithPriority *hipStreamCreateWithPriority;
-thipStreamGetPriority *hipStreamGetPriority;
-thipStreamGetFlags *hipStreamGetFlags;
-thipStreamWaitEvent *hipStreamWaitEvent;
-thipStreamAddCallback *hipStreamAddCallback;
-thipStreamQuery *hipStreamQuery;
-thipStreamSynchronize *hipStreamSynchronize;
-thipStreamDestroy *hipStreamDestroy;
-thipEventCreateWithFlags *hipEventCreateWithFlags;
-thipEventRecord *hipEventRecord;
-thipEventQuery *hipEventQuery;
-thipEventSynchronize *hipEventSynchronize;
-thipEventDestroy *hipEventDestroy;
-thipEventElapsedTime *hipEventElapsedTime;
-thipFuncGetAttribute *hipFuncGetAttribute;
-thipFuncSetCacheConfig *hipFuncSetCacheConfig;
-thipModuleLaunchKernel *hipModuleLaunchKernel;
-thipDrvOccupancyMaxActiveBlocksPerMultiprocessor *hipDrvOccupancyMaxActiveBlocksPerMultiprocessor;
-thipDrvOccupancyMaxActiveBlocksPerMultiprocessorWithFlags *hipDrvOccupancyMaxActiveBlocksPerMultiprocessorWithFlags;
-thipModuleOccupancyMaxPotentialBlockSize *hipModuleOccupancyMaxPotentialBlockSize;
-thipTexRefSetArray *hipTexRefSetArray;
-thipTexRefSetAddress *hipTexRefSetAddress;
-thipTexRefSetAddress2D *hipTexRefSetAddress2D;
-thipTexRefSetFormat *hipTexRefSetFormat;
-thipTexRefSetAddressMode *hipTexRefSetAddressMode;
-thipTexRefSetFilterMode *hipTexRefSetFilterMode;
-thipTexRefSetFlags *hipTexRefSetFlags;
-thipTexRefGetAddress *hipTexRefGetAddress;
-thipTexRefGetArray *hipTexRefGetArray;
-thipTexRefGetAddressMode *hipTexRefGetAddressMode;
-thipTexObjectCreate *hipTexObjectCreate;
-thipTexObjectDestroy *hipTexObjectDestroy;
-thipDeviceCanAccessPeer *hipDeviceCanAccessPeer;
-
-thipCtxEnablePeerAccess *hipCtxEnablePeerAccess;
-thipCtxDisablePeerAccess *hipCtxDisablePeerAccess;
-thipDeviceGetP2PAttribute *hipDeviceGetP2PAttribute;
-thipGraphicsUnregisterResource *hipGraphicsUnregisterResource;
-thipGraphicsMapResources *hipGraphicsMapResources;
-thipGraphicsUnmapResources *hipGraphicsUnmapResources;
-thipGraphicsResourceGetMappedPointer *hipGraphicsResourceGetMappedPointer;
-
-thipGraphicsGLRegisterBuffer *hipGraphicsGLRegisterBuffer;
-thipGLGetDevices *hipGLGetDevices;
-
-
-
-static DynamicLibrary dynamic_library_open_find(const char **paths) {
-  int i = 0;
-  while (paths[i] != NULL) {
-      DynamicLibrary lib = dynamic_library_open(paths[i]);
-      if (lib != NULL) {
-        return lib;
-      }
-      ++i;
-  }
-  return NULL;
-}
-
-/* Implementation function. */
-static void hipewHipExit(void) {
-  if (hip_lib != NULL) {
-    /*  Ignore errors. */
-    dynamic_library_close(hip_lib);
-    hip_lib = NULL;
-  }
-}
-
-static int hipewHipInit(void) {
-  /* Library paths. */
-#ifdef _WIN32
-  /* Expected in c:/windows/system or similar, no path needed. */
-  const char *hip_paths[] = {"amdhip64.dll", NULL};
-#elif defined(__APPLE__)
-  /* Default installation path. */
-  const char *hip_paths[] = {"", NULL};
-#else
-  const char *hip_paths[] = {"/opt/rocm/hip/lib/libamdhip64.so", NULL};
-#endif
-  static int initialized = 0;
-  static int result = 0;
-  int error, driver_version;
-
-  if (initialized) {
-    return result;
-  }
-
-  initialized = 1;
-
-  error = atexit(hipewHipExit);
-  if (error) {
-    result = HIPEW_ERROR_ATEXIT_FAILED;
-    return result;
-  }
-
-  /* Load library. */
-  hip_lib = dynamic_library_open_find(hip_paths);
-
-  if (hip_lib == NULL) {
-    result = HIPEW_ERROR_OPEN_FAILED;
-    return result;
-  }
-
-  /* Fetch all function pointers. */
-  HIP_LIBRARY_FIND_CHECKED(hipGetErrorName);
-  HIP_LIBRARY_FIND_CHECKED(hipInit);
-  HIP_LIBRARY_FIND_CHECKED(hipDriverGetVersion);
-  HIP_LIBRARY_FIND_CHECKED(hipGetDevice);
-  HIP_LIBRARY_FIND_CHECKED(hipGetDeviceCount);
-  HIP_LIBRARY_FIND_CHECKED(hipDeviceGetName);
-  HIP_LIBRARY_FIND_CHECKED(hipDeviceGetAttribute);
-  HIP_LIBRARY_FIND_CHECKED(hipDeviceComputeCapability);
-  HIP_LIBRARY_FIND_CHECKED(hipDevicePrimaryCtxRetain);
-  HIP_LIBRARY_FIND_CHECKED(hipDevicePrimaryCtxRelease);
-  HIP_LIBRARY_FIND_CHECKED(hipDevicePrimaryCtxSetFlags);
-  HIP_LIBRARY_FIND_CHECKED(hipDevicePrimaryCtxGetState);
-  HIP_LIBRARY_FIND_CHECKED(hipDevicePrimaryCtxReset);
-  HIP_LIBRARY_FIND_CHECKED(hipCtxCreate);
-  HIP_LIBRARY_FIND_CHECKED(hipCtxDestroy);
-  HIP_LIBRARY_FIND_CHECKED(hipCtxPushCurrent);
-  HIP_LIBRARY_FIND_CHECKED(hipCtxPopCurrent);
-  HIP_LIBRARY_FIND_CHECKED(hipCtxSetCurrent);
-  HIP_LIBRARY_FIND_CHECKED(hipCtxGetCurrent);
-  HIP_LIBRARY_FIND_CHECKED(hipCtxGetDevice);
-  HIP_LIBRARY_FIND_CHECKED(hipCtxGetFlags);
-  HIP_LIBRARY_FIND_CHECKED(hipCtxSynchronize);
-  HIP_LIBRARY_FIND_CHECKED(hipDeviceSynchronize);
-  HIP_LIBRARY_FIND_CHECKED(hipCtxGetCacheConfig);
-  HIP_LIBRARY_FIND_CHECKED(hipCtxSetCacheConfig);
-  HIP_LIBRARY_FIND_CHECKED(hipCtxGetSharedMemConfig);
-  HIP_LIBRARY_FIND_CHECKED(hipCtxSetSharedMemConfig);
-  HIP_LIBRARY_FIND_CHECKED(hipCtxGetApiVersion);
-  HIP_LIBRARY_FIND_CHECKED(hipModuleLoad);
-  HIP_LIBRARY_FIND_CHECKED(hipModuleLoadData);
-  HIP_LIBRARY_FIND_CHECKED(hipModuleLoadDataEx);
-  HIP_LIBRARY_FIND_CHECKED(hipModuleUnload);
-  HIP_LIBRARY_FIND_CHECKED(hipModuleGetFunction);
-  HIP_LIBRARY_FIND_CHECKED(hipModuleGetGlobal);
-  HIP_LIBRARY_FIND_CHECKED(hipModuleGetTexRef);
-  HIP_LIBRARY_FIND_CHECKED(hipMemGetInfo);
-  HIP_LIBRARY_FIND_CHECKED(hipMalloc);
-  HIP_LIBRARY_FIND_CHECKED(hipMemAllocPitch);
-  HIP_LIBRARY_FIND_CHECKED(hipFree);
-  HIP_LIBRARY_FIND_CHECKED(hipMemGetAddressRange);
-  HIP_LIBRARY_FIND_CHECKED(hipHostMalloc);
-  HIP_LIBRARY_FIND_CHECKED(hipHostFree);
-  HIP_LIBRARY_FIND_CHECKED(hipHostGetDevicePointer);
-  HIP_LIBRARY_FIND_CHECKED(hipHostGetFlags);
-  HIP_LIBRARY_FIND_CHECKED(hipMallocManaged);
-  HIP_LIBRARY_FIND_CHECKED(hipDeviceGetByPCIBusId);
-  HIP_LIBRARY_FIND_CHECKED(hipDeviceGetPCIBusId);
-  HIP_LIBRARY_FIND_CHECKED(hipMemcpyPeer);
-  HIP_LIBRARY_FIND_CHECKED(hipMemcpyHtoD);
-  HIP_LIBRARY_FIND_CHECKED(hipMemcpyDtoH);
-  HIP_LIBRARY_FIND_CHECKED(hipMemcpyDtoD);
-  HIP_LIBRARY_FIND_CHECKED(hipMemcpyParam2D);
-  HIP_LIBRARY_FIND_CHECKED(hipDrvMemcpy3D);
-  HIP_LIBRARY_FIND_CHECKED(hipMemcpyHtoDAsync);
-  HIP_LIBRARY_FIND_CHECKED(hipMemcpyDtoHAsync);
-  HIP_LIBRARY_FIND_CHECKED(hipDrvMemcpy2DUnaligned);
-  HIP_LIBRARY_FIND_CHECKED(hipMemcpyParam2DAsync);
-  HIP_LIBRARY_FIND_CHECKED(hipDrvMemcpy3DAsync);
-  HIP_LIBRARY_FIND_CHECKED(hipMemsetD8);
-  HIP_LIBRARY_FIND_CHECKED(hipMemsetD16);
-  HIP_LIBRARY_FIND_CHECKED(hipMemsetD32);
-  HIP_LIBRARY_FIND_CHECKED(hipMemsetD8Async);
-  HIP_LIBRARY_FIND_CHECKED(hipMemsetD16Async);
-  HIP_LIBRARY_FIND_CHECKED(hipMemsetD32Async);
-  HIP_LIBRARY_FIND_CHECKED(hipArrayCreate);
-  HIP_LIBRARY_FIND_CHECKED(hipArrayDestroy);
-  HIP_LIBRARY_FIND_CHECKED(hipArray3DCreate);
-  HIP_LIBRARY_FIND_CHECKED(hipStreamCreateWithFlags);
-  HIP_LIBRARY_FIND_CHECKED(hipStreamCreateWithPriority);
-  HIP_LIBRARY_FIND_CHECKED(hipStreamGetPriority);
-  HIP_LIBRARY_FIND_CHECKED(hipStreamGetFlags);
-  HIP_LIBRARY_FIND_CHECKED(hipStreamWaitEvent);
-  HIP_LIBRARY_FIND_CHECKED(hipStreamAddCallback);
-  HIP_LIBRARY_FIND_CHECKED(hipStreamQuery);
-  HIP_LIBRARY_FIND_CHECKED(hipStreamSynchronize);
-  HIP_LIBRARY_FIND_CHECKED(hipStreamDestroy);
-  HIP_LIBRARY_FIND_CHECKED(hipEventCreateWithFlags);
-  HIP_LIBRARY_FIND_CHECKED(hipEventRecord);
-  HIP_LIBRARY_FIND_CHECKED(hipEventQuery);
-  HIP_LIBRARY_FIND_CHECKED(hipEventSynchronize);
-  HIP_LIBRARY_FIND_CHECKED(hipEventDestroy);
-  HIP_LIBRARY_FIND_CHECKED(hipEventElapsedTime);
-  HIP_LIBRARY_FIND_CHECKED(hipFuncGetAttribute);
-  HIP_LIBRARY_FIND_CHECKED(hipFuncSetCacheConfig);
-  HIP_LIBRARY_FIND_CHECKED(hipModuleLaunchKernel);
-  HIP_LIBRARY_FIND_CHECKED(hipModuleOccupancyMaxPotentialBlockSize);
-  HIP_LIBRARY_FIND_CHECKED(hipTexRefSetArray);
-  HIP_LIBRARY_FIND_CHECKED(hipTexRefSetAddress);
-  HIP_LIBRARY_FIND_CHECKED(hipTexRefSetAddress2D);
-  HIP_LIBRARY_FIND_CHECKED(hipTexRefSetFormat);
-  HIP_LIBRARY_FIND_CHECKED(hipTexRefSetAddressMode);
-  HIP_LIBRARY_FIND_CHECKED(hipTexRefSetFilterMode);
-  HIP_LIBRARY_FIND_CHECKED(hipTexRefSetFlags);
-  HIP_LIBRARY_FIND_CHECKED(hipTexRefGetAddress);
-  HIP_LIBRARY_FIND_CHECKED(hipTexRefGetAddressMode);
-  HIP_LIBRARY_FIND_CHECKED(hipTexObjectCreate);
-  HIP_LIBRARY_FIND_CHECKED(hipTexObjectDestroy);
-  HIP_LIBRARY_FIND_CHECKED(hipDeviceCanAccessPeer);
-  HIP_LIBRARY_FIND_CHECKED(hipCtxEnablePeerAccess);
-  HIP_LIBRARY_FIND_CHECKED(hipCtxDisablePeerAccess);
-  HIP_LIBRARY_FIND_CHECKED(hipDeviceGetP2PAttribute);
-#ifdef _WIN32
-  HIP_LIBRARY_FIND_CHECKED(hipGraphicsUnregisterResource);
-  HIP_LIBRARY_FIND_CHECKED(hipGraphicsMapResources);
-  HIP_LIBRARY_FIND_CHECKED(hipGraphicsUnmapResources);
-  HIP_LIBRARY_FIND_CHECKED(hipGraphicsResourceGetMappedPointer);
-  HIP_LIBRARY_FIND_CHECKED(hipGraphicsGLRegisterBuffer);
-  HIP_LIBRARY_FIND_CHECKED(hipGLGetDevices);
-#endif
-  result = HIPEW_SUCCESS;
-  return result;
-}
-
-
-
-int hipewInit(hipuint32_t flags) {
-  int result = HIPEW_SUCCESS;
-
-  if (flags & HIPEW_INIT_HIP) {
-    result = hipewHipInit();
-    if (result != HIPEW_SUCCESS) {
-      return result;
-    }
-  }
-
-  return result;
-}
-
-
-const char *hipewErrorString(hipError_t result) {
-  switch (result) {
-    case hipSuccess: return "No errors";
-    case hipErrorInvalidValue: return "Invalid value";
-    case hipErrorOutOfMemory: return "Out of memory";
-    case hipErrorNotInitialized: return "Driver not initialized";
-    case hipErrorDeinitialized: return "Driver deinitialized";
-    case hipErrorProfilerDisabled: return "Profiler disabled";
-    case hipErrorProfilerNotInitialized: return "Profiler not initialized";
-    case hipErrorProfilerAlreadyStarted: return "Profiler already started";
-    case hipErrorProfilerAlreadyStopped: return "Profiler already stopped";
-    case hipErrorNoDevice: return "No HIP-capable device available";
-    case hipErrorInvalidDevice: return "Invalid device";
-    case hipErrorInvalidImage: return "Invalid kernel image";
-    case hipErrorInvalidContext: return "Invalid context";
-    case hipErrorContextAlreadyCurrent: return "Context already current";
-    case hipErrorMapFailed: return "Map failed";
-    case hipErrorUnmapFailed: return "Unmap failed";
-    case hipErrorArrayIsMapped: return "Array is mapped";
-    case hipErrorAlreadyMapped: return "Already mapped";
-    case hipErrorNoBinaryForGpu: return "No binary for GPU";
-    case hipErrorAlreadyAcquired: return "Already acquired";
-    case hipErrorNotMapped: return "Not mapped";
-    case hipErrorNotMappedAsArray: return "Mapped resource not available for access as an array";
-    case hipErrorNotMappedAsPointer: return "Mapped resource not available for access as a pointer";
-    case hipErrorECCNotCorrectable: return "Uncorrectable ECC error detected";
-    case hipErrorUnsupportedLimit: return "hipLimit_t not supported by device";
-    case hipErrorContextAlreadyInUse: return "Context already in use";
-    case hipErrorPeerAccessUnsupported: return "Peer access unsupported";
-    case hipErrorInvalidKernelFile: return "Invalid ptx";
-    case hipErrorInvalidGraphicsContext: return "Invalid graphics context";
-    case hipErrorInvalidSource: return "Invalid source";
-    case hipErrorFileNotFound: return "File not found";
-    case hipErrorSharedObjectSymbolNotFound: return "Link to a shared object failed to resolve";
-    case hipErrorSharedObjectInitFailed: return "Shared object initialization failed";
-    case hipErrorOperatingSystem: return "Operating system";
-    case hipErrorInvalidHandle: return "Invalid handle";
-    case hipErrorNotFound: return "Not found";
-    case hipErrorNotReady: return "HIP not ready";
-    case hipErrorIllegalAddress: return "Illegal address";
-    case hipErrorLaunchOutOfResources: return "Launch exceeded resources";
-    case hipErrorLaunchTimeOut: return "Launch exceeded timeout";
-    case hipErrorPeerAccessAlreadyEnabled: return "Peer access already enabled";
-    case hipErrorPeerAccessNotEnabled: return "Peer access not enabled";
-    case hipErrorSetOnActiveProcess: return "Primary context active";
-    case hipErrorAssert: return "Assert";
-    case hipErrorHostMemoryAlreadyRegistered: return "Host memory already registered";
-    case hipErrorHostMemoryNotRegistered: return "Host memory not registered";
-    case hipErrorLaunchFailure: return "Launch failed";
-    case hipErrorCooperativeLaunchTooLarge: return "Cooperative launch too large";
-    case hipErrorNotSupported: return "Not supported";
-    case hipErrorUnknown: return "Unknown error";
-    default: return "Unknown HIP error value";
-  }
-}
-
-static void path_join(const char *path1,
-                      const char *path2,
-                      int maxlen,
-                      char *result) {
-#if defined(WIN32) || defined(_WIN32)
-  const char separator = '\\';
-#else
-  const char separator = '/';
-#endif
-  int n = snprintf(result, maxlen, "%s%c%s", path1, separator, path2);
-  if (n != -1 && n < maxlen) {
-    result[n] = '\0';
-  }
-  else {
-    result[maxlen - 1] = '\0';
-  }
-}
-
-static int path_exists(const char *path) {
-  struct stat st;
-  if (stat(path, &st)) {
-    return 0;
-  }
-  return 1;
-}
-
-const char *hipewCompilerPath(void) {
-    #ifdef _WIN32
-    const char *hipPath = getenv("HIP_ROCCLR_HOME");
-    const char *windowsCommand = "perl ";
-    const char *executable = "bin/hipcc";
-
-    static char hipcc[65536];
-    static char finalCommand[65536];
-    if(hipPath) {
-      path_join(hipPath, executable, sizeof(hipcc), hipcc);
-      if(path_exists(hipcc)) {
-        snprintf(finalCommand, sizeof(hipcc), "%s %s", windowsCommand, hipcc);
-        return finalCommand;
-      } else {
-        printf("Could not find hipcc. Make sure HIP_ROCCLR_HOME points to the directory holding /bin/hipcc");
-      }
-    }
-    #else
-    const char *hipPath =  "opt/rocm/hip/bin";
-    const char *executable = "hipcc";
-
-    static char hipcc[65536];
-    if(hipPath) {
-      path_join(hipPath, executable, sizeof(hipcc), hipcc);
-      if(path_exists(hipcc)){
-        return hipcc;
-      }
-    }
-    #endif
-
-  {
-#ifdef _WIN32
-    FILE *handle = popen("where hipcc", "r");
-#else
-    FILE *handle = popen("which hipcc", "r");
-#endif
-    if (handle) {
-      char buffer[4096] = {0};
-      int len = fread(buffer, 1, sizeof(buffer) - 1, handle);
-      buffer[len] = '\0';
-      pclose(handle);
-      if (buffer[0]) {
-        return "hipcc";
-      }
-    }
-  }
-
-  return NULL;
-}
-
-int hipewCompilerVersion(void) {
-  const char *path = hipewCompilerPath();
-  const char *marker = "Hip compilation tools, release ";
-  FILE *pipe;
-  int major, minor;
-  char *versionstr;
-  char buf[128];
-  char output[65536] = "\0";
-  char command[65536] = "\0";
-
-  if (path == NULL) {
-    return 0;
-  }
-
-  /* get --version output */
-  strcat(command, "\"");
-  strncat(command, path, sizeof(command) - 1);
-  strncat(command, "\" --version", sizeof(command) - strlen(path) - 1);
-  pipe = popen(command, "r");
-  if (!pipe) {
-    fprintf(stderr, "HIP: failed to run compiler to retrieve version");
-    return 0;
-  }
-
-  while (!feof(pipe)) {
-    if (fgets(buf, sizeof(buf), pipe) != NULL) {
-      strncat(output, buf, sizeof(output) - strlen(output) - 1);
-    }
-  }
-
-  pclose(pipe);
-  return 40;
-}

extern/json/README.blender

@@ -1,5 +0,0 @@
-Project: JSON
-URL: https://github.com/nlohmann/json/
-License: MIT License
-Upstream version: 3.10.2
-Local modifications: None

extern/mantaflow/UPDATE.sh

@@ -8,7 +8,7 @@
 
 # YOUR INSTALLATION PATHS GO HERE:
 MANTA_INSTALLATION=/Users/sebbas/Developer/Mantaflow/mantaflowDevelop
-BLENDER_INSTALLATION=/Users/sebbas/Developer/Blender
+BLENDER_INSTALLATION=/Users/sebbas/Developer/Blender/fluid-mantaflow
 
 # Try to check out Mantaflow repository before building?
 CLEAN_REPOSITORY=0

extern/mantaflow/helper/pwrapper/pconvert.cpp

@@ -28,13 +28,11 @@ extern PyTypeObject PbVec3Type;
 extern PyTypeObject PbVec4Type;
 
 struct PbVec3 {
-  PyObject_HEAD
-  float data[3];
+  PyObject_HEAD float data[3];
 };
 
 struct PbVec4 {
-  PyObject_HEAD
-  float data[4];
+  PyObject_HEAD float data[4];
 };
 
 PyObject *getPyNone()

extern/mantaflow/helper/pwrapper/pvec3.cpp

@@ -25,8 +25,7 @@ namespace Manta {
 extern PyTypeObject PbVec3Type;
 
 struct PbVec3 {
-  PyObject_HEAD
-  float data[3];
+  PyObject_HEAD float data[3];
 };
 
 static void PbVec3Dealloc(PbVec3 *self)
@@ -294,8 +293,7 @@ inline PyObject *castPy(PyTypeObject *p)
 extern PyTypeObject PbVec4Type;
 
 struct PbVec4 {
-  PyObject_HEAD
-  float data[4];
+  PyObject_HEAD float data[4];
 };
 
 static PyMethodDef PbVec4Methods[] = {

extern/mantaflow/helper/pwrapper/registry.cpp

@@ -76,8 +76,7 @@ struct ClassData {
 };
 
 struct PbObject {
-  PyObject_HEAD
-  Manta::PbClass *instance;
+  PyObject_HEAD Manta::PbClass *instance;
   ClassData *classdef;
 };
 

extern/mantaflow/preprocessed/fastmarch.cpp

@@ -874,136 +874,6 @@ static const Vec3i nb[6] = {Vec3i(1, 0, 0),
                             Vec3i(0, 0, 1),
                             Vec3i(0, 0, -1)};
 
-struct knMarkSkipCells : public KernelBase {
-  knMarkSkipCells(Grid<Real> &phi, Grid<int> &tmp, bool inside)
-      : KernelBase(&phi, 1), phi(phi), tmp(tmp), inside(inside)
-  {
-    runMessage();
-    run();
-  }
-  inline void op(int i, int j, int k, Grid<Real> &phi, Grid<int> &tmp, bool inside) const
-  {
-    if (!inside && phi(i, j, k) < 0.) {
-      tmp(i, j, k) = 1;
-    }
-    if (inside && phi(i, j, k) > 0.) {
-      tmp(i, j, k) = 1;
-    }
-  }
-  inline Grid<Real> &getArg0()
-  {
-    return phi;
-  }
-  typedef Grid<Real> type0;
-  inline Grid<int> &getArg1()
-  {
-    return tmp;
-  }
-  typedef Grid<int> type1;
-  inline bool &getArg2()
-  {
-    return inside;
-  }
-  typedef bool type2;
-  void runMessage()
-  {
-    debMsg("Executing kernel knMarkSkipCells ", 3);
-    debMsg("Kernel range"
-               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
-           4);
-  };
-  void operator()(const tbb::blocked_range<IndexInt> &__r) const
-  {
-    const int _maxX = maxX;
-    const int _maxY = maxY;
-    if (maxZ > 1) {
-      for (int k = __r.begin(); k != (int)__r.end(); k++)
-        for (int j = 1; j < _maxY; j++)
-          for (int i = 1; i < _maxX; i++)
-            op(i, j, k, phi, tmp, inside);
-    }
-    else {
-      const int k = 0;
-      for (int j = __r.begin(); j != (int)__r.end(); j++)
-        for (int i = 1; i < _maxX; i++)
-          op(i, j, k, phi, tmp, inside);
-    }
-  }
-  void run()
-  {
-    if (maxZ > 1)
-      tbb::parallel_for(tbb::blocked_range<IndexInt>(minZ, maxZ), *this);
-    else
-      tbb::parallel_for(tbb::blocked_range<IndexInt>(1, maxY), *this);
-  }
-  Grid<Real> &phi;
-  Grid<int> &tmp;
-  bool inside;
-};
-
-struct knSetFirstLayer : public KernelBase {
-  knSetFirstLayer(Grid<int> &tmp, int dim) : KernelBase(&tmp, 1), tmp(tmp), dim(dim)
-  {
-    runMessage();
-    run();
-  }
-  inline void op(int i, int j, int k, Grid<int> &tmp, int dim) const
-  {
-    Vec3i p(i, j, k);
-    if (tmp(p))
-      return;
-    for (int n = 0; n < 2 * dim; ++n) {
-      if (tmp(p + nb[n]) == 1) {
-        tmp(i, j, k) = 2;
-        break;
-      }
-    }
-  }
-  inline Grid<int> &getArg0()
-  {
-    return tmp;
-  }
-  typedef Grid<int> type0;
-  inline int &getArg1()
-  {
-    return dim;
-  }
-  typedef int type1;
-  void runMessage()
-  {
-    debMsg("Executing kernel knSetFirstLayer ", 3);
-    debMsg("Kernel range"
-               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
-           4);
-  };
-  void operator()(const tbb::blocked_range<IndexInt> &__r) const
-  {
-    const int _maxX = maxX;
-    const int _maxY = maxY;
-    if (maxZ > 1) {
-      for (int k = __r.begin(); k != (int)__r.end(); k++)
-        for (int j = 1; j < _maxY; j++)
-          for (int i = 1; i < _maxX; i++)
-            op(i, j, k, tmp, dim);
-    }
-    else {
-      const int k = 0;
-      for (int j = __r.begin(); j != (int)__r.end(); j++)
-        for (int i = 1; i < _maxX; i++)
-          op(i, j, k, tmp, dim);
-    }
-  }
-  void run()
-  {
-    if (maxZ > 1)
-      tbb::parallel_for(tbb::blocked_range<IndexInt>(minZ, maxZ), *this);
-    else
-      tbb::parallel_for(tbb::blocked_range<IndexInt>(1, maxY), *this);
-  }
-  Grid<int> &tmp;
-  int dim;
-};
-
 template<class S> struct knExtrapolateLsSimple : public KernelBase {
   knExtrapolateLsSimple(Grid<S> &val, int distance, Grid<int> &tmp, const int d, S direction)
       : KernelBase(&val, 1), val(val), distance(distance), tmp(tmp), d(d), direction(direction)
@@ -1173,12 +1043,39 @@ void extrapolateLsSimple(Grid<Real> &phi, int distance = 4, bool inside = false)
   tmp.clear();
   const int dim = (phi.is3D() ? 3 : 2);
 
-  // by default, march outside (ie mark all inside to be skipped)
-  Real direction = (inside) ? -1. : 1.;
-  knMarkSkipCells(phi, tmp, inside);
-
+  // by default, march outside
+  Real direction = 1.;
+  if (!inside) {
+    // mark all inside
+    FOR_IJK_BND(phi, 1)
+    {
+      if (phi(i, j, k) < 0.) {
+        tmp(i, j, k) = 1;
+      }
+    }
+  }
+  else {
+    direction = -1.;
+    FOR_IJK_BND(phi, 1)
+    {
+      if (phi(i, j, k) > 0.) {
+        tmp(i, j, k) = 1;
+      }
+    }
+  }
   // + first layer around
-  knSetFirstLayer(tmp, dim);
+  FOR_IJK_BND(phi, 1)
+  {
+    Vec3i p(i, j, k);
+    if (tmp(p))
+      continue;
+    for (int n = 0; n < 2 * dim; ++n) {
+      if (tmp(p + nb[n]) == 1) {
+        tmp(i, j, k) = 2;
+        n = 2 * dim;
+      }
+    }
+  }
 
   // extrapolate for distance
   for (int d = 2; d < 1 + distance; ++d) {
@@ -1229,12 +1126,37 @@ void extrapolateVec3Simple(Grid<Vec3> &vel, Grid<Real> &phi, int distance = 4, b
   tmp.clear();
   const int dim = (vel.is3D() ? 3 : 2);
 
-  // mark initial cells, by default, march outside (ie mark all inside to be skipped)
-  Real direction = (inside) ? -1. : 1.;
-  knMarkSkipCells(phi, tmp, inside);
-
+  // mark initial cells, by default, march outside
+  if (!inside) {
+    // mark all inside
+    FOR_IJK_BND(phi, 1)
+    {
+      if (phi(i, j, k) < 0.) {
+        tmp(i, j, k) = 1;
+      }
+    }
+  }
+  else {
+    FOR_IJK_BND(phi, 1)
+    {
+      if (phi(i, j, k) > 0.) {
+        tmp(i, j, k) = 1;
+      }
+    }
+  }
   // + first layer next to initial cells
-  knSetFirstLayer(tmp, dim);
+  FOR_IJK_BND(vel, 1)
+  {
+    Vec3i p(i, j, k);
+    if (tmp(p))
+      continue;
+    for (int n = 0; n < 2 * dim; ++n) {
+      if (tmp(p + nb[n]) == 1) {
+        tmp(i, j, k) = 2;
+        n = 2 * dim;
+      }
+    }
+  }
 
   for (int d = 2; d < 1 + distance; ++d) {
     knExtrapolateLsSimple<Vec3>(vel, distance, tmp, d, Vec3(0.));

extern/mantaflow/preprocessed/gitinfo.h

@@ -1,3 +1,3 @@
 
 
-#define MANTA_GIT_VERSION "commit d5d9a6c28daa8f21426d7a285f48639c0d8fd13f"
+#define MANTA_GIT_VERSION "commit 8fbebe02459b7f72575872c20961f7cb757db408"

extern/nanosvg/README.blender

@@ -1,7 +0,0 @@
-Project: NanoSVG
-URL: https://github.com/memononen/nanosvg
-License: zlib
-Upstream version: 
-Local modifications: Added some functionality to manage grease pencil layers
-
-Added a fix to SVG import arc and float errors (https://developer.blender.org/rB11dc674c78b49fc4e0b7c134c375b6c8b8eacbcc)

extern/nanosvg/patches/NanoSVG.diff

@@ -1,86 +0,0 @@
-diff --git a/c:/tmp/nanosvg_original.h b/c:/tmp/nanosvg_modif.h
-index 24a01a86d3d..eca0d07e79d 100644
---- a/c:/tmp/nanosvg_original.h
-+++ b/c:/tmp/nanosvg_modif.h
-@@ -24,7 +24,8 @@
-  *
-  * Bounding box calculation based on http://blog.hackers-cafe.net/2009/06/how-to-calculate-bezier-curves-bounding.html
-  *
-- */
-+ * This is a modified version for Blender used by importers.
-+ **/
- 
- #ifndef NANOSVG_H
- #define NANOSVG_H
-@@ -148,6 +149,8 @@ extern "C" {
- 	typedef struct NSVGshape
- 	{
- 		char id[64];				// Optional 'id' attr of the shape or its group
-+		/* Blender: Parent ID used for layer creation. */
-+  		char id_parent[64];		
- 		NSVGpaint fill;				// Fill paint
- 		NSVGpaint stroke;			// Stroke paint
- 		float opacity;				// Opacity of the shape.
-@@ -370,6 +373,7 @@ int nsvg__parseXML(char* input,
- /* Simple SVG parser. */
- 
- #define NSVG_MAX_ATTR 128
-+#define NSVG_MAX_BREADCRUMB 5
- 
- enum NSVGgradientUnits
- {
-@@ -471,6 +475,10 @@ typedef struct NSVGparser
- 	float dpi;
- 	char pathFlag;
- 	char defsFlag;
-+	/** Blender breadcrumb for layers. */
-+  	char breadcrumb[NSVG_MAX_BREADCRUMB][64];
-+  	/** Blender number of elements in breadcrumb. */
-+  	int breadcrumb_len;
- } NSVGparser;
- 
- static void nsvg__xformIdentity(float* t)
-@@ -980,6 +988,14 @@ static void nsvg__addShape(NSVGparser* p)
- 	memset(shape, 0, sizeof(NSVGshape));
- 
- 	memcpy(shape->id, attr->id, sizeof shape->id);
-+	/* Copy parent id from breadcrumb. */
-+	if (p->breadcrumb_len > 0) {
-+		memcpy(shape->id_parent, p->breadcrumb[0], sizeof shape->id_parent);
-+	}
-+	else {
-+		memcpy(shape->id_parent, attr->id, sizeof shape->id_parent);
-+	}
-+
- 	scale = nsvg__getAverageScale(attr->xform);
- 	shape->strokeWidth = attr->strokeWidth * scale;
- 	shape->strokeDashOffset = attr->strokeDashOffset * scale;
-@@ -2814,6 +2830,14 @@ static void nsvg__startElement(void* ud, const char* el, const char** attr)
- 	if (strcmp(el, "g") == 0) {
- 		nsvg__pushAttr(p);
- 		nsvg__parseAttribs(p, attr);
-+
-+		/* Save the breadcrumb of groups. */
-+		if (p->breadcrumb_len < NSVG_MAX_BREADCRUMB) {
-+		NSVGattrib *attr_id = nsvg__getAttr(p);
-+		memcpy(
-+			p->breadcrumb[p->breadcrumb_len], attr_id->id, sizeof(p->breadcrumb[p->breadcrumb_len]));
-+		p->breadcrumb_len++;
-+		}
- 	}
- 	else if (strcmp(el, "path") == 0) {
- 		if (p->pathFlag)	// Do not allow nested paths.
-@@ -2874,7 +2898,12 @@ static void nsvg__endElement(void* ud, const char* el)
- 	NSVGparser* p = (NSVGparser*)ud;
- 
- 	if (strcmp(el, "g") == 0) {
--		nsvg__popAttr(p);
-+  		/* Remove the breadcrumb level. */
-+    	if (p->breadcrumb_len > 0) {
-+      		p->breadcrumb[p->breadcrumb_len - 1][0] = '\0';
-+      		p->breadcrumb_len--;
-+		}
-+	  nsvg__popAttr(p);
- 	}
- 	else if (strcmp(el, "path") == 0) {
- 		p->pathFlag = 0;

extern/tinygltf/README.blender

@@ -1,6 +0,0 @@
-Project: TinyGLTF
-URL: https://github.com/syoyo/tinygltf
-License: MIT
-Upstream version: 2.5.0, 19a41d20ec0
-Local modifications: 
-* Silence "enum value not handled in switch" warnings due to JSON dependency.

intern/atomic/intern/atomic_ops_unix.h

@@ -60,108 +60,9 @@
 #  define JE_FORCE_SYNC_COMPARE_AND_SWAP_8
 #endif
 
-/* Define the `ATOMIC_FORCE_USE_FALLBACK` to force lock-based fallback implementation to be used
- * (even on platforms where there is native implementation available via compiler.
- * Useful for development purposes. */
-#undef ATOMIC_FORCE_USE_FALLBACK
-
-/* -------------------------------------------------------------------- */
-/** \name Spin-lock implementation
- *
- * Used to implement atomics on unsupported platforms.
- * The spin implementation is shared for all platforms to make sure it compiles and tested.
- * \{ */
-
-typedef struct AtomicSpinLock {
-  volatile int lock;
-
-  /* Pad the structure size to a cache-line, to avoid unwanted sharing with other data. */
-  int pad[32 - sizeof(int)];
-} __attribute__((aligned(32))) AtomicSpinLock;
-
-ATOMIC_INLINE void atomic_spin_lock(volatile AtomicSpinLock *lock)
-{
-  while (__sync_lock_test_and_set(&lock->lock, 1)) {
-    while (lock->lock) {
-    }
-  }
-}
-
-ATOMIC_INLINE void atomic_spin_unlock(volatile AtomicSpinLock *lock)
-{
-  __sync_lock_release(&lock->lock);
-}
-
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Common part of locking fallback implementation
- * \{ */
-
-/* Global lock, shared by all atomic operations implementations.
- *
- * Could be split into per-size locks, although added complexity and being more error-proone does
- * not seem to worth it for a fall-back implementation. */
-static _ATOMIC_MAYBE_UNUSED AtomicSpinLock _atomic_global_lock = {0};
-
-#define ATOMIC_LOCKING_OP_AND_FETCH_DEFINE(_type, _op_name, _op) \
-  ATOMIC_INLINE _type##_t atomic_##_op_name##_and_fetch_##_type(_type##_t *p, _type##_t x) \
-  { \
-    atomic_spin_lock(&_atomic_global_lock); \
-    const _type##_t original_value = *(p); \
-    const _type##_t new_value = original_value _op(x); \
-    *(p) = new_value; \
-    atomic_spin_unlock(&_atomic_global_lock); \
-    return new_value; \
-  }
-
-#define ATOMIC_LOCKING_FETCH_AND_OP_DEFINE(_type, _op_name, _op) \
-  ATOMIC_INLINE _type##_t atomic_fetch_and_##_op_name##_##_type(_type##_t *p, _type##_t x) \
-  { \
-    atomic_spin_lock(&_atomic_global_lock); \
-    const _type##_t original_value = *(p); \
-    *(p) = original_value _op(x); \
-    atomic_spin_unlock(&_atomic_global_lock); \
-    return original_value; \
-  }
-
-#define ATOMIC_LOCKING_ADD_AND_FETCH_DEFINE(_type) \
-  ATOMIC_LOCKING_OP_AND_FETCH_DEFINE(_type, add, +)
-
-#define ATOMIC_LOCKING_SUB_AND_FETCH_DEFINE(_type) \
-  ATOMIC_LOCKING_OP_AND_FETCH_DEFINE(_type, sub, -)
-
-#define ATOMIC_LOCKING_FETCH_AND_ADD_DEFINE(_type) \
-  ATOMIC_LOCKING_FETCH_AND_OP_DEFINE(_type, add, +)
-
-#define ATOMIC_LOCKING_FETCH_AND_SUB_DEFINE(_type) \
-  ATOMIC_LOCKING_FETCH_AND_OP_DEFINE(_type, sub, -)
-
-#define ATOMIC_LOCKING_FETCH_AND_OR_DEFINE(_type) ATOMIC_LOCKING_FETCH_AND_OP_DEFINE(_type, or, |)
-
-#define ATOMIC_LOCKING_FETCH_AND_AND_DEFINE(_type) \
-  ATOMIC_LOCKING_FETCH_AND_OP_DEFINE(_type, and, &)
-
-#define ATOMIC_LOCKING_CAS_DEFINE(_type) \
-  ATOMIC_INLINE _type##_t atomic_cas_##_type(_type##_t *v, _type##_t old, _type##_t _new) \
-  { \
-    atomic_spin_lock(&_atomic_global_lock); \
-    const _type##_t original_value = *v; \
-    if (*v == old) { \
-      *v = _new; \
-    } \
-    atomic_spin_unlock(&_atomic_global_lock); \
-    return original_value; \
-  }
-
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name 64-bit operations
- * \{ */
-
-#if !defined(ATOMIC_FORCE_USE_FALLBACK) && \
-    (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_8))
+/******************************************************************************/
+/* 64-bit operations. */
+#if (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_8))
 /* Unsigned */
 ATOMIC_INLINE uint64_t atomic_add_and_fetch_uint64(uint64_t *p, uint64_t x)
 {
@@ -214,7 +115,7 @@ ATOMIC_INLINE int64_t atomic_cas_int64(int64_t *v, int64_t old, int64_t _new)
   return __sync_val_compare_and_swap(v, old, _new);
 }
 
-#elif !defined(ATOMIC_FORCE_USE_FALLBACK) && (defined(__amd64__) || defined(__x86_64__))
+#elif (defined(__amd64__) || defined(__x86_64__))
 /* Unsigned */
 ATOMIC_INLINE uint64_t atomic_fetch_and_add_uint64(uint64_t *p, uint64_t x)
 {
@@ -289,36 +190,12 @@ ATOMIC_INLINE int64_t atomic_cas_int64(int64_t *v, int64_t old, int64_t _new)
   return ret;
 }
 #else
-
-/* Unsigned */
-
-ATOMIC_LOCKING_ADD_AND_FETCH_DEFINE(uint64)
-ATOMIC_LOCKING_SUB_AND_FETCH_DEFINE(uint64)
-
-ATOMIC_LOCKING_FETCH_AND_ADD_DEFINE(uint64)
-ATOMIC_LOCKING_FETCH_AND_SUB_DEFINE(uint64)
-
-ATOMIC_LOCKING_CAS_DEFINE(uint64)
-
-/* Signed */
-ATOMIC_LOCKING_ADD_AND_FETCH_DEFINE(int64)
-ATOMIC_LOCKING_SUB_AND_FETCH_DEFINE(int64)
-
-ATOMIC_LOCKING_FETCH_AND_ADD_DEFINE(int64)
-ATOMIC_LOCKING_FETCH_AND_SUB_DEFINE(int64)
-
-ATOMIC_LOCKING_CAS_DEFINE(int64)
-
+#  error "Missing implementation for 64-bit atomic operations"
 #endif
 
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name 32-bit operations
- * \{ */
-
-#if !defined(ATOMIC_FORCE_USE_FALLBACK) && \
-    (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_4))
+/******************************************************************************/
+/* 32-bit operations. */
+#if (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_4))
 /* Unsigned */
 ATOMIC_INLINE uint32_t atomic_add_and_fetch_uint32(uint32_t *p, uint32_t x)
 {
@@ -351,8 +228,7 @@ ATOMIC_INLINE int32_t atomic_cas_int32(int32_t *v, int32_t old, int32_t _new)
   return __sync_val_compare_and_swap(v, old, _new);
 }
 
-#elif !defined(ATOMIC_FORCE_USE_FALLBACK) && \
-    (defined(__i386__) || defined(__amd64__) || defined(__x86_64__))
+#elif (defined(__i386__) || defined(__amd64__) || defined(__x86_64__))
 /* Unsigned */
 ATOMIC_INLINE uint32_t atomic_add_and_fetch_uint32(uint32_t *p, uint32_t x)
 {
@@ -410,25 +286,10 @@ ATOMIC_INLINE int32_t atomic_cas_int32(int32_t *v, int32_t old, int32_t _new)
 }
 
 #else
-
-/* Unsigned */
-
-ATOMIC_LOCKING_ADD_AND_FETCH_DEFINE(uint32)
-ATOMIC_LOCKING_SUB_AND_FETCH_DEFINE(uint32)
-
-ATOMIC_LOCKING_CAS_DEFINE(uint32)
-
-/* Signed */
-
-ATOMIC_LOCKING_ADD_AND_FETCH_DEFINE(int32)
-ATOMIC_LOCKING_SUB_AND_FETCH_DEFINE(int32)
-
-ATOMIC_LOCKING_CAS_DEFINE(int32)
-
+#  error "Missing implementation for 32-bit atomic operations"
 #endif
 
-#if !defined(ATOMIC_FORCE_USE_FALLBACK) && \
-    (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_4))
+#if (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_4))
 /* Unsigned */
 ATOMIC_INLINE uint32_t atomic_fetch_and_add_uint32(uint32_t *p, uint32_t x)
 {
@@ -462,27 +323,12 @@ ATOMIC_INLINE int32_t atomic_fetch_and_and_int32(int32_t *p, int32_t x)
 }
 
 #else
-
-/* Unsigned */
-ATOMIC_LOCKING_FETCH_AND_ADD_DEFINE(uint32)
-ATOMIC_LOCKING_FETCH_AND_OR_DEFINE(uint32)
-ATOMIC_LOCKING_FETCH_AND_AND_DEFINE(uint32)
-
-/* Signed */
-ATOMIC_LOCKING_FETCH_AND_ADD_DEFINE(int32)
-ATOMIC_LOCKING_FETCH_AND_OR_DEFINE(int32)
-ATOMIC_LOCKING_FETCH_AND_AND_DEFINE(int32)
-
+#  error "Missing implementation for 32-bit atomic operations"
 #endif
 
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name 16-bit operations
- * \{ */
-
-#if !defined(ATOMIC_FORCE_USE_FALLBACK) && \
-    (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_2))
+/******************************************************************************/
+/* 16-bit operations. */
+#if (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_2))
 
 /* Signed */
 ATOMIC_INLINE int16_t atomic_fetch_and_and_int16(int16_t *p, int16_t b)
@@ -495,21 +341,12 @@ ATOMIC_INLINE int16_t atomic_fetch_and_or_int16(int16_t *p, int16_t b)
 }
 
 #else
-
-ATOMIC_LOCKING_FETCH_AND_AND_DEFINE(int16)
-ATOMIC_LOCKING_FETCH_AND_OR_DEFINE(int16)
-
+#  error "Missing implementation for 16-bit atomic operations"
 #endif
 
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name 8-bit operations
- * \{ */
-
-#if !defined(ATOMIC_FORCE_USE_FALLBACK) && \
-    (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_1))
-
+/******************************************************************************/
+/* 8-bit operations. */
+#if (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_1))
 /* Unsigned */
 ATOMIC_INLINE uint8_t atomic_fetch_and_and_uint8(uint8_t *p, uint8_t b)
 {
@@ -531,27 +368,7 @@ ATOMIC_INLINE int8_t atomic_fetch_and_or_int8(int8_t *p, int8_t b)
 }
 
 #else
-
-/* Unsigned */
-ATOMIC_LOCKING_FETCH_AND_AND_DEFINE(uint8)
-ATOMIC_LOCKING_FETCH_AND_OR_DEFINE(uint8)
-
-/* Signed */
-ATOMIC_LOCKING_FETCH_AND_AND_DEFINE(int8)
-ATOMIC_LOCKING_FETCH_AND_OR_DEFINE(int8)
-
+#  error "Missing implementation for 8-bit atomic operations"
 #endif
 
-/** \} */
-
-#undef ATOMIC_LOCKING_OP_AND_FETCH_DEFINE
-#undef ATOMIC_LOCKING_FETCH_AND_OP_DEFINE
-#undef ATOMIC_LOCKING_ADD_AND_FETCH_DEFINE
-#undef ATOMIC_LOCKING_SUB_AND_FETCH_DEFINE
-#undef ATOMIC_LOCKING_FETCH_AND_ADD_DEFINE
-#undef ATOMIC_LOCKING_FETCH_AND_SUB_DEFINE
-#undef ATOMIC_LOCKING_FETCH_AND_OR_DEFINE
-#undef ATOMIC_LOCKING_FETCH_AND_AND_DEFINE
-#undef ATOMIC_LOCKING_CAS_DEFINE
-
 #endif /* __ATOMIC_OPS_UNIX_H__ */

intern/atomic/intern/atomic_ops_utils.h

@@ -64,11 +64,9 @@
 #ifdef __GNUC__
 #  define _ATOMIC_LIKELY(x) __builtin_expect(!!(x), 1)
 #  define _ATOMIC_UNLIKELY(x) __builtin_expect(!!(x), 0)
-#  define _ATOMIC_MAYBE_UNUSED __attribute__((unused))
 #else
 #  define _ATOMIC_LIKELY(x) (x)
 #  define _ATOMIC_UNLIKELY(x) (x)
-#  define _ATOMIC_MAYBE_UNUSED
 #endif
 
 #if defined(__SIZEOF_POINTER__)

intern/cycles/CMakeLists.txt

@@ -247,7 +247,7 @@ if(WITH_CYCLES_OSL)
 endif()
 
 if(WITH_CYCLES_DEVICE_OPTIX)
-  find_package(OptiX 7.3.0)
+  find_package(OptiX)
 
   if(OPTIX_FOUND)
     add_definitions(-DWITH_OPTIX)
@@ -286,18 +286,11 @@ if(WITH_OPENSUBDIV)
   )
 endif()
 
-if(WITH_OPENIMAGEDENOISE)
-  add_definitions(-DWITH_OPENIMAGEDENOISE)
-  add_definitions(-DOIDN_STATIC_LIB)
-  include_directories(
-    SYSTEM
-    ${OPENIMAGEDENOISE_INCLUDE_DIRS}
-  )
-endif()
-
 if(WITH_CYCLES_STANDALONE)
+  set(WITH_CYCLES_DEVICE_OPENCL TRUE)
   set(WITH_CYCLES_DEVICE_CUDA TRUE)
-  set(WITH_CYCLES_DEVICE_HIP TRUE)
+  # Experimental and unfinished.
+  set(WITH_CYCLES_NETWORK FALSE)
 endif()
 # TODO(sergey): Consider removing it, only causes confusion in interface.
 set(WITH_CYCLES_DEVICE_MULTI TRUE)
@@ -314,9 +307,9 @@ if(WITH_CYCLES_LOGGING)
   )
 endif()
 
-# NaN debugging
-if(WITH_CYCLES_DEBUG_NAN)
-  add_definitions(-DWITH_CYCLES_DEBUG_NAN)
+# Debugging capabilities (debug passes etc).
+if(WITH_CYCLES_DEBUG)
+  add_definitions(-DWITH_CYCLES_DEBUG)
 endif()
 
 if(NOT OPENIMAGEIO_PUGIXML_FOUND)
@@ -393,12 +386,18 @@ if(WITH_CYCLES_BLENDER)
   add_subdirectory(blender)
 endif()
 
-add_subdirectory(app)
+if(WITH_CYCLES_NETWORK)
+  add_definitions(-DWITH_NETWORK)
+endif()
+
+if(WITH_CYCLES_STANDALONE OR WITH_CYCLES_NETWORK OR WITH_CYCLES_CUBIN_COMPILER)
+  add_subdirectory(app)
+endif()
+
 add_subdirectory(bvh)
 add_subdirectory(device)
 add_subdirectory(doc)
 add_subdirectory(graph)
-add_subdirectory(integrator)
 add_subdirectory(kernel)
 add_subdirectory(render)
 add_subdirectory(subd)

intern/cycles/app/CMakeLists.txt

@@ -90,6 +90,24 @@ if(WITH_CYCLES_STANDALONE)
   endif()
 endif()
 
+#####################################################################
+# Cycles network server executable
+#####################################################################
+
+if(WITH_CYCLES_NETWORK)
+  set(SRC
+    cycles_server.cpp
+  )
+  add_executable(cycles_server ${SRC})
+  target_link_libraries(cycles_server ${LIBRARIES})
+  cycles_target_link_libraries(cycles_server)
+
+  if(UNIX AND NOT APPLE)
+    set_target_properties(cycles_server PROPERTIES INSTALL_RPATH $ORIGIN/lib)
+  endif()
+  unset(SRC)
+endif()
+
 #####################################################################
 # Cycles cubin compiler executable
 #####################################################################

intern/cycles/app/cycles_standalone.cpp

@@ -53,7 +53,7 @@ struct Options {
   SessionParams session_params;
   bool quiet;
   bool show_help, interactive, pause;
-  string output_filepath;
+  string output_path;
 } options;
 
 static void session_print(const string &str)
@@ -126,7 +126,7 @@ static BufferParams &session_buffer_params()
 
 static void scene_init()
 {
-  options.scene = options.session->scene;
+  options.scene = new Scene(options.scene_params, options.session->device);
 
   /* Read XML */
   xml_read_file(options.scene, options.filepath.c_str());
@@ -148,7 +148,7 @@ static void scene_init()
 static void session_init()
 {
   options.session_params.write_render_cb = write_render;
-  options.session = new Session(options.session_params, options.scene_params);
+  options.session = new Session(options.session_params);
 
   if (options.session_params.background && !options.quiet)
     options.session->progress.set_update_callback(function_bind(&session_print_status));
@@ -159,8 +159,9 @@ static void session_init()
 
   /* load scene */
   scene_init();
+  options.session->scene = options.scene;
 
-  options.session->reset(options.session_params, session_buffer_params());
+  options.session->reset(session_buffer_params(), options.session_params.samples);
   options.session->start();
 }
 
@@ -222,7 +223,9 @@ static void display_info(Progress &progress)
 
 static void display()
 {
-  options.session->draw();
+  static DeviceDrawParams draw_params = DeviceDrawParams();
+
+  options.session->draw(session_buffer_params(), draw_params);
 
   display_info(options.session->progress);
 }
@@ -252,7 +255,7 @@ static void motion(int x, int y, int button)
     options.session->scene->camera->need_flags_update = true;
     options.session->scene->camera->need_device_update = true;
 
-    options.session->reset(options.session_params, session_buffer_params());
+    options.session->reset(session_buffer_params(), options.session_params.samples);
   }
 }
 
@@ -269,7 +272,7 @@ static void resize(int width, int height)
     options.session->scene->camera->need_flags_update = true;
     options.session->scene->camera->need_device_update = true;
 
-    options.session->reset(options.session_params, session_buffer_params());
+    options.session->reset(session_buffer_params(), options.session_params.samples);
   }
 }
 
@@ -281,7 +284,7 @@ static void keyboard(unsigned char key)
 
   /* Reset */
   else if (key == 'r')
-    options.session->reset(options.session_params, session_buffer_params());
+    options.session->reset(session_buffer_params(), options.session_params.samples);
 
   /* Cancel */
   else if (key == 27)  // escape
@@ -318,7 +321,7 @@ static void keyboard(unsigned char key)
     options.session->scene->camera->need_flags_update = true;
     options.session->scene->camera->need_device_update = true;
 
-    options.session->reset(options.session_params, session_buffer_params());
+    options.session->reset(session_buffer_params(), options.session_params.samples);
   }
 
   /* Set Max Bounces */
@@ -344,7 +347,7 @@ static void keyboard(unsigned char key)
 
     options.session->scene->integrator->set_max_bounce(bounce);
 
-    options.session->reset(options.session_params, session_buffer_params());
+    options.session->reset(session_buffer_params(), options.session_params.samples);
   }
 }
 #endif
@@ -359,13 +362,11 @@ static int files_parse(int argc, const char *argv[])
 
 static void options_parse(int argc, const char **argv)
 {
-  options.width = 1024;
-  options.height = 512;
+  options.width = 0;
+  options.height = 0;
   options.filepath = "";
   options.session = NULL;
   options.quiet = false;
-  options.session_params.use_auto_tile = false;
-  options.session_params.tile_size = 0;
 
   /* device names */
   string device_names = "";
@@ -411,7 +412,7 @@ static void options_parse(int argc, const char **argv)
              &options.session_params.samples,
              "Number of samples to render",
              "--output %s",
-             &options.output_filepath,
+             &options.output_path,
              "File path to write output image",
              "--threads %d",
              &options.session_params.threads,
@@ -422,9 +423,12 @@ static void options_parse(int argc, const char **argv)
              "--height %d",
              &options.height,
              "Window height in pixel",
-             "--tile-size %d",
-             &options.session_params.tile_size,
-             "Tile size in pixels",
+             "--tile-width %d",
+             &options.session_params.tile_size.x,
+             "Tile width in pixels",
+             "--tile-height %d",
+             &options.session_params.tile_size.y,
+             "Tile height in pixels",
              "--list-devices",
              &list,
              "List information about all available devices",
@@ -486,9 +490,8 @@ static void options_parse(int argc, const char **argv)
   options.session_params.background = true;
 #endif
 
-  if (options.session_params.tile_size > 0) {
-    options.session_params.use_auto_tile = true;
-  }
+  /* Use progressive rendering */
+  options.session_params.progressive = true;
 
   /* find matching device */
   DeviceType device_type = Device::type_from_string(devicename.c_str());
@@ -524,6 +527,9 @@ static void options_parse(int argc, const char **argv)
     fprintf(stderr, "No file path specified\n");
     exit(EXIT_FAILURE);
   }
+
+  /* For smoother Viewport */
+  options.session_params.start_resolution = 64;
 }
 
 CCL_NAMESPACE_END

intern/cycles/app/cycles_xml.cpp

@@ -703,7 +703,7 @@ void xml_read_file(Scene *scene, const char *filepath)
 
   xml_read_include(state, path_filename(filepath));
 
-  scene->params.bvh_type = BVH_TYPE_STATIC;
+  scene->params.bvh_type = SceneParams::BVH_STATIC;
 }
 
 CCL_NAMESPACE_END

intern/cycles/blender/CMakeLists.txt

@@ -33,7 +33,6 @@ set(SRC
   blender_device.cpp
   blender_image.cpp
   blender_geometry.cpp
-  blender_gpu_display.cpp
   blender_light.cpp
   blender_mesh.cpp
   blender_object.cpp
@@ -51,7 +50,6 @@ set(SRC
 
   CCL_api.h
   blender_device.h
-  blender_gpu_display.h
   blender_id_map.h
   blender_image.h
   blender_object_cull.h
@@ -95,9 +93,14 @@ set(ADDON_FILES
 
 add_definitions(${GL_DEFINITIONS})
 
-if(WITH_CYCLES_DEVICE_HIP)
-  add_definitions(-DWITH_HIP)
+if(WITH_CYCLES_DEVICE_OPENCL)
+  add_definitions(-DWITH_OPENCL)
 endif()
+
+if(WITH_CYCLES_NETWORK)
+  add_definitions(-DWITH_NETWORK)
+endif()
+
 if(WITH_MOD_FLUID)
   add_definitions(-DWITH_FLUID)
 endif()
@@ -112,16 +115,6 @@ if(WITH_OPENVDB)
   )
 endif()
 
-if(WITH_ALEMBIC)
-  add_definitions(-DWITH_ALEMBIC)
-  list(APPEND INC_SYS
-    ${ALEMBIC_INCLUDE_DIRS}
-  )
-  list(APPEND LIB
-    ${ALEMBIC_LIBRARIES}
-  )
-endif()
-
 if(WITH_OPENIMAGEDENOISE)
   add_definitions(-DWITH_OPENIMAGEDENOISE)
   list(APPEND INC_SYS

intern/cycles/blender/addon/__init__.py

@@ -58,9 +58,9 @@ class CyclesRender(bpy.types.RenderEngine):
     bl_use_eevee_viewport = True
     bl_use_preview = True
     bl_use_exclude_layers = True
+    bl_use_save_buffers = True
     bl_use_spherical_stereo = True
     bl_use_custom_freestyle = True
-    bl_use_alembic_procedural = True
 
     def __init__(self):
         self.session = None
@@ -84,12 +84,6 @@ class CyclesRender(bpy.types.RenderEngine):
     def render(self, depsgraph):
         engine.render(self, depsgraph)
 
-    def render_frame_finish(self):
-        engine.render_frame_finish(self)
-
-    def draw(self, context, depsgraph):
-        engine.draw(self, depsgraph, context.space_data)
-
     def bake(self, depsgraph, obj, pass_type, pass_filter, width, height):
         engine.bake(self, depsgraph, obj, pass_type, pass_filter, width, height)
 
@@ -103,7 +97,7 @@ class CyclesRender(bpy.types.RenderEngine):
         engine.sync(self, depsgraph, context.blend_data)
 
     def view_draw(self, context, depsgraph):
-        engine.view_draw(self, depsgraph, context.region, context.space_data, context.region_data)
+        engine.draw(self, depsgraph, context.region, context.space_data, context.region_data)
 
     def update_script_node(self, node):
         if engine.with_osl():

intern/cycles/blender/addon/engine.py

@@ -18,17 +18,62 @@
 from __future__ import annotations
 
 
+def _is_using_buggy_driver():
+    import gpu
+    # We need to be conservative here because in multi-GPU systems display card
+    # might be quite old, but others one might be just good.
+    #
+    # So We shouldn't disable possible good dedicated cards just because display
+    # card seems weak. And instead we only blacklist configurations which are
+    # proven to cause problems.
+    if gpu.platform.vendor_get() == "ATI Technologies Inc.":
+        import re
+        version = gpu.platform.version_get()
+        if version.endswith("Compatibility Profile Context"):
+            # Old HD 4xxx and 5xxx series drivers did not have driver version
+            # in the version string, but those cards do not quite work and
+            # causing crashes.
+            return True
+        regex = re.compile(".*Compatibility Profile Context ([0-9]+(\\.[0-9]+)+)$")
+        if not regex.match(version):
+            # Skip cards like FireGL
+            return False
+        version = regex.sub("\\1", version).split('.')
+        return int(version[0]) == 8
+    return False
+
+
+def _workaround_buggy_drivers():
+    if _is_using_buggy_driver():
+        import _cycles
+        if hasattr(_cycles, "opencl_disable"):
+            print("Cycles: OpenGL driver known to be buggy, disabling OpenCL platform.")
+            _cycles.opencl_disable()
+
+
 def _configure_argument_parser():
     import argparse
     # No help because it conflicts with general Python scripts argument parsing
     parser = argparse.ArgumentParser(description="Cycles Addon argument parser",
                                      add_help=False)
+    parser.add_argument("--cycles-resumable-num-chunks",
+                        help="Number of chunks to split sample range into",
+                        default=None)
+    parser.add_argument("--cycles-resumable-current-chunk",
+                        help="Current chunk of samples range to render",
+                        default=None)
+    parser.add_argument("--cycles-resumable-start-chunk",
+                        help="Start chunk to render",
+                        default=None)
+    parser.add_argument("--cycles-resumable-end-chunk",
+                        help="End chunk to render",
+                        default=None)
     parser.add_argument("--cycles-print-stats",
                         help="Print rendering statistics to stderr",
                         action='store_true')
     parser.add_argument("--cycles-device",
                         help="Set the device to use for Cycles, overriding user preferences and the scene setting."
-                             "Valid options are 'CPU', 'CUDA', 'OPTIX', or 'HIP'"
+                             "Valid options are 'CPU', 'CUDA', 'OPTIX' or 'OPENCL'."
                              "Additionally, you can append '+CPU' to any GPU type for hybrid rendering.",
                         default=None)
     return parser
@@ -44,6 +89,21 @@ def _parse_command_line():
     parser = _configure_argument_parser()
     args, _ = parser.parse_known_args(argv[argv.index("--") + 1:])
 
+    if args.cycles_resumable_num_chunks is not None:
+        if args.cycles_resumable_current_chunk is not None:
+            import _cycles
+            _cycles.set_resumable_chunk(
+                int(args.cycles_resumable_num_chunks),
+                int(args.cycles_resumable_current_chunk),
+            )
+        elif args.cycles_resumable_start_chunk is not None and \
+                args.cycles_resumable_end_chunk:
+            import _cycles
+            _cycles.set_resumable_chunk_range(
+                int(args.cycles_resumable_num_chunks),
+                int(args.cycles_resumable_start_chunk),
+                int(args.cycles_resumable_end_chunk),
+            )
     if args.cycles_print_stats:
         import _cycles
         _cycles.enable_print_stats()
@@ -58,11 +118,23 @@ def init():
     import _cycles
     import os.path
 
+    # Workaround possibly buggy legacy drivers which crashes on the OpenCL
+    # device enumeration.
+    #
+    # This checks are not really correct because they might still fail
+    # in the case of multiple GPUs. However, currently buggy drivers
+    # are really old and likely to be used in single GPU systems only
+    # anyway.
+    #
+    # Can't do it in the background mode, so we hope OpenCL is no enabled
+    # in the user preferences.
+    if not bpy.app.background:
+        _workaround_buggy_drivers()
+
     path = os.path.dirname(__file__)
     user_path = os.path.dirname(os.path.abspath(bpy.utils.user_resource('CONFIG', path='')))
-    temp_path = bpy.app.tempdir
 
-    _cycles.init(path, user_path, temp_path, bpy.app.background)
+    _cycles.init(path, user_path, bpy.app.background)
     _parse_command_line()
 
 
@@ -105,25 +177,6 @@ def render(engine, depsgraph):
         _cycles.render(engine.session, depsgraph.as_pointer())
 
 
-def render_frame_finish(engine):
-    if not engine.session:
-        return
-
-    import _cycles
-    _cycles.render_frame_finish(engine.session)
-
-def draw(engine, depsgraph, space_image):
-    if not engine.session:
-        return
-
-    depsgraph_ptr = depsgraph.as_pointer()
-    space_image_ptr = space_image.as_pointer()
-    screen_ptr = space_image.id_data.as_pointer()
-
-    import _cycles
-    _cycles.draw(engine.session, depsgraph_ptr, screen_ptr, space_image_ptr)
-
-
 def bake(engine, depsgraph, obj, pass_type, pass_filter, width, height):
     import _cycles
     session = getattr(engine, "session", None)
@@ -151,14 +204,14 @@ def sync(engine, depsgraph, data):
     _cycles.sync(engine.session, depsgraph.as_pointer())
 
 
-def view_draw(engine, depsgraph, region, v3d, rv3d):
+def draw(engine, depsgraph, region, v3d, rv3d):
     import _cycles
     depsgraph = depsgraph.as_pointer()
     v3d = v3d.as_pointer()
     rv3d = rv3d.as_pointer()
 
     # draw render image
-    _cycles.view_draw(engine.session, depsgraph, v3d, rv3d)
+    _cycles.draw(engine.session, depsgraph, v3d, rv3d)
 
 
 def available_devices():
@@ -171,28 +224,29 @@ def with_osl():
     return _cycles.with_osl
 
 
+def with_network():
+    import _cycles
+    return _cycles.with_network
+
+
 def system_info():
     import _cycles
     return _cycles.system_info()
 
 
 def list_render_passes(scene, srl):
-    crl = srl.cycles
-
-    # Combined pass.
+    # Builtin Blender passes.
     yield ("Combined", "RGBA", 'COLOR')
 
-    # Data passes.
     if srl.use_pass_z:                     yield ("Depth",         "Z",    'VALUE')
     if srl.use_pass_mist:                  yield ("Mist",          "Z",    'VALUE')
-    if srl.use_pass_position:              yield ("Position",      "XYZ",  'VECTOR')
     if srl.use_pass_normal:                yield ("Normal",        "XYZ",  'VECTOR')
     if srl.use_pass_vector:                yield ("Vector",        "XYZW", 'VECTOR')
     if srl.use_pass_uv:                    yield ("UV",            "UVA",  'VECTOR')
     if srl.use_pass_object_index:          yield ("IndexOB",       "X",    'VALUE')
     if srl.use_pass_material_index:        yield ("IndexMA",       "X",    'VALUE')
-
-    # Light passes.
+    if srl.use_pass_shadow:                yield ("Shadow",        "RGB",  'COLOR')
+    if srl.use_pass_ambient_occlusion:     yield ("AO",            "RGB",  'COLOR')
     if srl.use_pass_diffuse_direct:        yield ("DiffDir",       "RGB",  'COLOR')
     if srl.use_pass_diffuse_indirect:      yield ("DiffInd",       "RGB",  'COLOR')
     if srl.use_pass_diffuse_color:         yield ("DiffCol",       "RGB",  'COLOR')
@@ -202,17 +256,19 @@ def list_render_passes(scene, srl):
     if srl.use_pass_transmission_direct:   yield ("TransDir",      "RGB",  'COLOR')
     if srl.use_pass_transmission_indirect: yield ("TransInd",      "RGB",  'COLOR')
     if srl.use_pass_transmission_color:    yield ("TransCol",      "RGB",  'COLOR')
-    if crl.use_pass_volume_direct:         yield ("VolumeDir",     "RGB",  'COLOR')
-    if crl.use_pass_volume_indirect:       yield ("VolumeInd",     "RGB",  'COLOR')
     if srl.use_pass_emit:                  yield ("Emit",          "RGB",  'COLOR')
     if srl.use_pass_environment:           yield ("Env",           "RGB",  'COLOR')
-    if srl.use_pass_shadow:                yield ("Shadow",        "RGB",  'COLOR')
-    if srl.use_pass_ambient_occlusion:     yield ("AO",            "RGB",  'COLOR')
-    if crl.use_pass_shadow_catcher:        yield ("Shadow Catcher",      "RGB",  'COLOR')
 
-    # Debug passes.
+    # Cycles specific passes.
+    crl = srl.cycles
     if crl.pass_debug_render_time:             yield ("Debug Render Time",             "X",   'VALUE')
+    if crl.pass_debug_bvh_traversed_nodes:     yield ("Debug BVH Traversed Nodes",     "X",   'VALUE')
+    if crl.pass_debug_bvh_traversed_instances: yield ("Debug BVH Traversed Instances", "X",   'VALUE')
+    if crl.pass_debug_bvh_intersections:       yield ("Debug BVH Intersections",       "X",   'VALUE')
+    if crl.pass_debug_ray_bounces:             yield ("Debug Ray Bounces",             "X",   'VALUE')
     if crl.pass_debug_sample_count:            yield ("Debug Sample Count",            "X",   'VALUE')
+    if crl.use_pass_volume_direct:             yield ("VolumeDir",                     "RGB", 'COLOR')
+    if crl.use_pass_volume_indirect:           yield ("VolumeInd",                     "RGB", 'COLOR')
 
     # Cryptomatte passes.
     crypto_depth = (srl.pass_cryptomatte_depth + 1) // 2
@@ -227,20 +283,30 @@ def list_render_passes(scene, srl):
             yield ("CryptoAsset" + '{:02d}'.format(i), "RGBA", 'COLOR')
 
     # Denoising passes.
-    if scene.cycles.use_denoising and crl.use_denoising:
+    if (scene.cycles.use_denoising and crl.use_denoising) or crl.denoising_store_passes:
         yield ("Noisy Image", "RGBA", 'COLOR')
-        if crl.use_pass_shadow_catcher:
-            yield ("Noisy Shadow Catcher", "RGBA", 'COLOR')
-    if crl.denoising_store_passes:
-        yield ("Denoising Normal",          "XYZ", 'VECTOR')
-        yield ("Denoising Albedo",          "RGB", 'COLOR')
+        if crl.denoising_store_passes:
+            yield ("Denoising Normal",          "XYZ", 'VECTOR')
+            yield ("Denoising Albedo",          "RGB", 'COLOR')
+            yield ("Denoising Depth",           "Z",   'VALUE')
+
+            if scene.cycles.denoiser == 'NLM':
+                yield ("Denoising Shadowing",       "X",   'VALUE')
+                yield ("Denoising Variance",        "RGB", 'COLOR')
+                yield ("Denoising Intensity",       "X",   'VALUE')
+
+                clean_options = ("denoising_diffuse_direct", "denoising_diffuse_indirect",
+                                 "denoising_glossy_direct", "denoising_glossy_indirect",
+                                 "denoising_transmission_direct", "denoising_transmission_indirect")
+                if any(getattr(crl, option) for option in clean_options):
+                    yield ("Denoising Clean", "RGB", 'COLOR')
 
     # Custom AOV passes.
     for aov in srl.aovs:
         if aov.type == 'VALUE':
             yield (aov.name, "X", 'VALUE')
         else:
-            yield (aov.name, "RGB", 'COLOR')
+            yield (aov.name, "RGBA", 'COLOR')
 
 
 def register_passes(engine, scene, view_layer):

intern/cycles/blender/addon/presets.py

@@ -60,48 +60,32 @@ class AddPresetSampling(AddPresetBase, Operator):
     ]
 
     preset_values = [
-        "cycles.use_adaptive_sampling",
         "cycles.samples",
-        "cycles.adaptive_threshold",
-        "cycles.adaptive_min_samples",
-        "cycles.time_limit",
-        "cycles.use_denoising",
-        "cycles.denoiser",
-        "cycles.denoising_input_passes",
-        "cycles.denoising_prefilter",
+        "cycles.preview_samples",
+        "cycles.aa_samples",
+        "cycles.preview_aa_samples",
+        "cycles.diffuse_samples",
+        "cycles.glossy_samples",
+        "cycles.transmission_samples",
+        "cycles.ao_samples",
+        "cycles.mesh_light_samples",
+        "cycles.subsurface_samples",
+        "cycles.volume_samples",
+        "cycles.use_square_samples",
+        "cycles.progressive",
+        "cycles.seed",
+        "cycles.sample_clamp_direct",
+        "cycles.sample_clamp_indirect",
+        "cycles.sample_all_lights_direct",
+        "cycles.sample_all_lights_indirect",
     ]
 
     preset_subdir = "cycles/sampling"
 
 
-class AddPresetViewportSampling(AddPresetBase, Operator):
-    '''Add a Viewport Sampling Preset'''
-    bl_idname = "render.cycles_viewport_sampling_preset_add"
-    bl_label = "Add Viewport Sampling Preset"
-    preset_menu = "CYCLES_PT_viewport_sampling_presets"
-
-    preset_defines = [
-        "cycles = bpy.context.scene.cycles"
-    ]
-
-    preset_values = [
-        "cycles.use_preview_adaptive_sampling",
-        "cycles.preview_samples",
-        "cycles.preview_adaptive_threshold",
-        "cycles.preview_adaptive_min_samples",
-        "cycles.use_preview_denoising",
-        "cycles.preview_denoiser",
-        "cycles.preview_denoising_input_passes",
-        "cycles.preview_denoising_prefilter",
-        "cycles.preview_denoising_start_sample",
-    ]
-
-    preset_subdir = "cycles/viewport_sampling"
-
 classes = (
     AddPresetIntegrator,
     AddPresetSampling,
-    AddPresetViewportSampling,
 )