update tests

CMakeLists.txt

@@ -349,7 +349,7 @@ mark_as_advanced(WITH_SYSTEM_GLOG)
 option(WITH_FREESTYLE     "Enable Freestyle (advanced edges rendering)" ON)
 
 # Misc
-if(WIN32 OR APPLE)
+if(WIN32)
   option(WITH_INPUT_IME "Enable Input Method Editor (IME) for complex Asian character input" ON)
 endif()
 option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
@@ -1705,18 +1705,22 @@ if(WITH_PYTHON)
   endif()
 endif()
 
-# Select C++17 as the standard for C++ projects.
-set(CMAKE_CXX_STANDARD 17)
-# If C++17 is not available, downgrading to an earlier standard is NOT OK.
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-# Do not enable compiler specific language extentions.
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-# Make MSVC properly report the value of the __cplusplus preprocessor macro
-# Available MSVC 15.7 (1914) and up, without this it reports 199711L regardless
-# of the C++ standard chosen above.
-if(MSVC AND MSVC_VERSION GREATER 1913)
-  string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus")
+if(MSVC)
+  string(APPEND CMAKE_CXX_FLAGS " /std:c++17")
+  # Make MSVC properly report the value of the __cplusplus preprocessor macro
+  # Available MSVC 15.7 (1914) and up, without this it reports 199711L regardless
+  # of the C++ standard chosen above
+  if(MSVC_VERSION GREATER 1913)
+    string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus")
+  endif()
+elseif(
+  CMAKE_COMPILER_IS_GNUCC OR
+  CMAKE_C_COMPILER_ID MATCHES "Clang" OR
+  CMAKE_C_COMPILER_ID MATCHES "Intel"
+)
+  string(APPEND CMAKE_CXX_FLAGS " -std=c++17")
+else()
+  message(FATAL_ERROR "Unknown compiler ${CMAKE_C_COMPILER_ID}, can't enable C++17 build")
 endif()
 
 # Visual Studio has all standards it supports available by default
@@ -1911,7 +1915,6 @@ if(FIRST_RUN)
   info_cfg_option(WITH_IK_ITASC)
   info_cfg_option(WITH_IK_SOLVER)
   info_cfg_option(WITH_INPUT_NDOF)
-  info_cfg_option(WITH_INPUT_IME)
   info_cfg_option(WITH_INTERNATIONAL)
   info_cfg_option(WITH_OPENCOLLADA)
   info_cfg_option(WITH_OPENCOLORIO)

build_files/build_environment/CMakeLists.txt

@@ -56,7 +56,6 @@ else()
 endif()
 
 include(cmake/zlib.cmake)
-include(cmake/zstd.cmake)
 include(cmake/openal.cmake)
 include(cmake/png.cmake)
 include(cmake/jpeg.cmake)
@@ -82,11 +81,7 @@ if(UNIX)
 endif()
 include(cmake/openimageio.cmake)
 include(cmake/tiff.cmake)
-if(WIN32)
-  include(cmake/flexbison.cmake)
-else()
-  include(cmake/flex.cmake)
-endif()
+include(cmake/flexbison.cmake)
 include(cmake/osl.cmake)
 include(cmake/tbb.cmake)
 include(cmake/openvdb.cmake)
@@ -169,7 +164,6 @@ endif()
 if(UNIX AND NOT APPLE)
   include(cmake/libglu.cmake)
   include(cmake/mesa.cmake)
-  include(cmake/wayland_protocols.cmake)
 endif()
 
 include(cmake/harvest.cmake)

build_files/build_environment/cmake/download.cmake

@@ -87,10 +87,7 @@ download_source(LIBGLU)
 download_source(MESA)
 download_source(NASM)
 download_source(XR_OPENXR_SDK)
-download_source(WL_PROTOCOLS)
 download_source(ISPC)
 download_source(GMP)
 download_source(POTRACE)
 download_source(HARU)
-download_source(ZSTD)
-download_source(FLEX)

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")
@@ -127,8 +126,6 @@ if(UNIX AND NOT APPLE)
 
   harvest(xml2/include xml2/include "*.h")
   harvest(xml2/lib xml2/lib "*.a")
-
-  harvest(wayland-protocols/share/wayland-protocols wayland-protocols/share/wayland-protocols/ "*.xml")
 else()
   harvest(blosc/lib openvdb/lib "*.a")
   harvest(xml2/lib opencollada/lib "*.a")
@@ -193,8 +190,6 @@ harvest(potrace/include potrace/include "*.h")
 harvest(potrace/lib potrace/lib "*.a")
 harvest(haru/include haru/include "*.h")
 harvest(haru/lib haru/lib "*.a")
-harvest(zstd/include zstd/include "*.h")
-harvest(zstd/lib zstd/lib "*.a")
 
 if(UNIX AND NOT APPLE)
   harvest(libglu/lib mesa/lib "*.so*")

build_files/build_environment/cmake/ispc.cmake

@@ -29,13 +29,12 @@ elseif(APPLE)
   if("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "arm64")
     set(ISPC_EXTRA_ARGS_APPLE
       -DBISON_EXECUTABLE=/opt/homebrew/opt/bison/bin/bison
-      -DFLEX_EXECUTABLE=${LIBDIR}/flex/bin/flex
+      -DFLEX_EXECUTABLE=/opt/homebrew/opt/flex/bin/flex
       -DARM_ENABLED=On
     )
   else()
     set(ISPC_EXTRA_ARGS_APPLE
       -DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison
-      -DFLEX_EXECUTABLE=${LIBDIR}/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
   )
-else()
-  add_dependencies(
-    external_ispc
-    external_flex
-  )
 endif()

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

@@ -22,8 +22,9 @@ ExternalProject_Add(external_openmp
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENMP_HASH_TYPE}=${OPENMP_HASH}
   PREFIX ${BUILD_DIR}/openmp
+  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

@@ -51,7 +51,6 @@ 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}
@@ -70,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}
@@ -90,20 +93,10 @@ add_dependencies(
   ll
   external_openexr
   external_zlib
+  external_flexbison
   external_openimageio
   external_pugixml
 )
-if(WIN32)
-  add_dependencies(
-    external_osl
-    external_flexbison
-  )
-else()
-  add_dependencies(
-    external_osl
-    external_flex
-  )
-endif()
 
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)

build_files/build_environment/cmake/versions.cmake

@@ -152,20 +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)
 
-set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz)
-set(OPENMP_HASH ac48ce3e4582ccb82f81ab59eb3fc9dc)
-set(OPENMP_HASH_TYPE MD5)
-set(OPENMP_FILE openmp-${LLVM_VERSION}.src.tar.xz)
+  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(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)
 
@@ -175,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)
 
@@ -201,9 +216,9 @@ set(OPENVDB_HASH 01b490be16cc0e15c690f9a153c21461)
 set(OPENVDB_HASH_TYPE MD5)
 set(OPENVDB_FILE openvdb-${OPENVDB_VERSION}.tar.gz)
 
-set(NANOVDB_GIT_UID dc37d8a631922e7bef46712947dc19b755f3e841)
+set(NANOVDB_GIT_UID e62f7a0bf1e27397223c61ddeaaf57edf111b77f)
 set(NANOVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/${NANOVDB_GIT_UID}.tar.gz)
-set(NANOVDB_HASH e7b9e863ec2f3b04ead171dec2322807)
+set(NANOVDB_HASH 90919510bc6ccd630fedc56f748cb199)
 set(NANOVDB_HASH_TYPE MD5)
 set(NANOVDB_FILE nano-vdb-${NANOVDB_GIT_UID}.tar.gz)
 
@@ -355,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
@@ -423,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)
 
@@ -435,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)
@@ -447,23 +456,25 @@ set(NASM_HASH aded8b796c996a486a56e0515c83e414116decc3b184d88043480b32eb0a8589)
 set(NASM_HASH_TYPE SHA256)
 set(NASM_FILE nasm-${NASM_VERSION}.tar.gz)
 
-set(XR_OPENXR_SDK_VERSION 1.0.17)
+set(XR_OPENXR_SDK_VERSION 1.0.14)
 set(XR_OPENXR_SDK_URI https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${XR_OPENXR_SDK_VERSION}.tar.gz)
-set(XR_OPENXR_SDK_HASH bf0fd8828837edff01047474e90013e1)
+set(XR_OPENXR_SDK_HASH 0df6b2fd6045423451a77ff6bc3e1a75)
 set(XR_OPENXR_SDK_HASH_TYPE MD5)
 set(XR_OPENXR_SDK_FILE OpenXR-SDK-${XR_OPENXR_SDK_VERSION}.tar.gz)
 
-set(WL_PROTOCOLS_VERSION 1.21)
-set(WL_PROTOCOLS_FILE wayland-protocols-${WL_PROTOCOLS_VERSION}.tar.gz)
-set(WL_PROTOCOLS_URI https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/${WL_PROTOCOLS_VERSION}/${WL_PROTOCOLS_FILE})
-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)
@@ -483,11 +494,5 @@ set(HARU_HASH 4f916aa49c3069b3a10850013c507460)
 set(HARU_HASH_TYPE MD5)
 set(HARU_FILE libharu-${HARU_VERSION}.tar.gz)
 
-set(ZSTD_VERSION 1.5.0)
-set(ZSTD_URI https://github.com/facebook/zstd/releases/download/v${ZSTD_VERSION}/zstd-${ZSTD_VERSION}.tar.gz)
-set(ZSTD_HASH 5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94)
-set(ZSTD_HASH_TYPE SHA256)
-set(ZSTD_FILE zstd-${ZSTD_VERSION}.tar.gz)
-
 set(SSE2NEON_GIT https://github.com/DLTcollab/sse2neon.git)
 set(SSE2NEON_GIT_HASH fe5ff00bb8d19b327714a3c290f3e2ce81ba3525)

build_files/build_environment/cmake/wayland_protocols.cmake

@@ -1,27 +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_wayland_protocols
-  URL file://${PACKAGE_DIR}/${WL_PROTOCOLS_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${WL_PROTOCOLS_HASH_TYPE}=${WL_PROTOCOLS_HASH}
-  PREFIX ${BUILD_DIR}/wayland-protocols
-  CONFIGURE_COMMAND meson --prefix ${LIBDIR}/wayland-protocols . ../external_wayland_protocols -Dtests=false
-  BUILD_COMMAND ninja
-  INSTALL_COMMAND ninja install
-)

build_files/build_environment/cmake/zstd.cmake

@@ -1,51 +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 *****
-
-set(ZSTD_EXTRA_ARGS
-  -DZSTD_BUILD_PROGRAMS=OFF
-  -DZSTD_BUILD_SHARED=OFF
-  -DZSTD_BUILD_STATIC=ON
-  -DZSTD_BUILD_TESTS=OFF
-  -DZSTD_LEGACY_SUPPORT=OFF
-  -DZSTD_LZ4_SUPPORT=OFF
-  -DZSTD_LZMA_SUPPORT=OFF
-  -DZSTD_MULTITHREAD_SUPPORT=ON
-  -DZSTD_PROGRAMS_LINK_SHARED=OFF
-  -DZSTD_USE_STATIC_RUNTIME=OFF
-  -DZSTD_ZLIB_SUPPORT=OFF
-)
-
-ExternalProject_Add(external_zstd
-  URL file://${PACKAGE_DIR}/${ZSTD_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${ZSTD_HASH_TYPE}=${ZSTD_HASH}
-  PREFIX ${BUILD_DIR}/zstd
-  SOURCE_SUBDIR build/cmake
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zstd ${DEFAULT_CMAKE_FLAGS} ${ZSTD_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/zstd
-)
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_zstd after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zstd/lib/zstd_static${LIBEXT} ${HARVEST_TARGET}/zstd/lib/zstd_static${LIBEXT}
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zstd/include/ ${HARVEST_TARGET}/zstd/include/
-      DEPENDEES install
-    )
-  endif()
-endif()

build_files/build_environment/install_deps.sh

@@ -572,7 +572,7 @@ FFMPEG_FORCE_REBUILD=false
 FFMPEG_SKIP=false
 _ffmpeg_list_sep=";"
 
-XR_OPENXR_VERSION="1.0.17"
+XR_OPENXR_VERSION="1.0.14"
 XR_OPENXR_VERSION_SHORT="1.0"
 XR_OPENXR_VERSION_MIN="1.0.8"
 XR_OPENXR_VERSION_MAX="2.0"
@@ -1073,7 +1073,7 @@ OPENVDB_SOURCE=( "https://github.com/AcademySoftwareFoundation/openvdb/archive/v
 #~ OPENVDB_SOURCE_REPO_BRANCH="dev"
 
 NANOVDB_USE_REPO=false
-NANOVDB_SOURCE_REPO_UID="dc37d8a631922e7bef46712947dc19b755f3e841"
+NANOVDB_SOURCE_REPO_UID="e62f7a0bf1e27397223c61ddeaaf57edf111b77f"
 NANOVDB_SOURCE=( "https://github.com/AcademySoftwareFoundation/openvdb/archive/${NANOVDB_SOURCE_REPO_UID}.tar.gz" )
 
 ALEMBIC_USE_REPO=false
@@ -1108,9 +1108,9 @@ FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )
 
 XR_OPENXR_USE_REPO=false
 XR_OPENXR_SOURCE=("https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${XR_OPENXR_VERSION}.tar.gz")
-XR_OPENXR_SOURCE_REPO=("https://github.com/KhronosGroup/OpenXR-SDK.git")
-XR_OPENXR_REPO_UID="bf21ccb1007bb531b45d9978919a56ea5059c245"
-XR_OPENXR_REPO_BRANCH="master"
+#~ XR_OPENXR_SOURCE_REPO=("https://github.com/KhronosGroup/OpenXR-SDK.git")
+#~ XR_OPENXR_REPO_UID="5900c51562769b03bea699dc0352cae56acb6419d"
+#~ XR_OPENXR_REPO_BRANCH="master"
 
 # C++11 is required now
 CXXFLAGS_BACK=$CXXFLAGS
@@ -1128,7 +1128,6 @@ Those libraries should be available as packages in all recent distributions (opt
     * Basics of dev environment (cmake, gcc, svn , git, ...).
     * 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, libbz2, libssl, libfftw3, libxml2, libtinyxml, yasm, libyaml-cpp.
     * libsdl2, libglew, libpugixml, libpotrace, [libgmp], [libglewmx], fontconfig, [libharu/libhpdf].\""
 
@@ -2738,7 +2737,7 @@ _init_openvdb() {
   _git=false
   _inst=$INST/openvdb-$OPENVDB_VERSION_SHORT
   _inst_shortcut=$INST/openvdb
-
+  
   _openvdb_source=$OPENVDB_SOURCE
   if [ "$WITH_NANOVDB" = true ]; then
     _openvdb_source=$NANOVDB_SOURCE
@@ -2843,7 +2842,7 @@ compile_OPENVDB() {
     if [ -d $INST/blosc ]; then
       cmake_d="$cmake_d -D Blosc_ROOT=$INST/blosc"
     fi
-
+  
     cmake $cmake_d ..
 
     make -j$THREADS install
@@ -3840,7 +3839,6 @@ install_DEB() {
   _packages="gawk cmake cmake-curses-gui build-essential libjpeg-dev libpng-dev libtiff-dev \
              git libfreetype6-dev libfontconfig-dev libx11-dev flex bison libxxf86vm-dev \
              libxcursor-dev libxi-dev wget libsqlite3-dev libxrandr-dev libxinerama-dev \
-             libwayland-dev wayland-protocols libegl-dev libxkbcommon-dev libdbus-1-dev linux-libc-dev \
              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 \
@@ -4510,7 +4508,6 @@ install_RPM() {
   _packages="gcc gcc-c++ git make cmake tar bzip2 xz findutils flex bison fontconfig-devel \
              libtiff-devel libjpeg-devel libpng-devel sqlite-devel fftw-devel SDL2-devel \
              libX11-devel libXi-devel libXcursor-devel libXrandr-devel libXinerama-devel \
-             wayland-devel wayland-protocols-devel mesa-libEGL-devel libxkbcommon-devel dbus-devel kernel-headers \
              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 \

build_files/build_environment/patches/ffmpeg.diff

@@ -68,32 +68,3 @@
 +
      return ret;
  }
---- a/libavcodec/rl.c
-+++ b/libavcodec/rl.c
-@@ -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));
-     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);
-@@ -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;
- 
--        if (!rl->rl_vlc[q])
-+        if (!rl->rl_vlc[q]){
-+            av_free(table);
-             return;
-+        }
- 
-         if (q == 0) {
-             qmul = 1;
-@@ -113,4 +115,5 @@ av_cold void ff_rl_init_vlc(RLTable *rl, unsigned static_size)
-             rl->rl_vlc[q][i].run   = run;
-         }
-     }
-+    av_free(table);
- }

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/openmp.diff

@@ -0,0 +1,23 @@
+diff --git a/runtime/src/z_Linux_asm.S b/runtime/src/z_Linux_asm.S
+index 0d8885e..42aa5ad 100644
+--- a/runtime/src/z_Linux_asm.S
++++ b/runtime/src/z_Linux_asm.S
+@@ -1540,10 +1540,12 @@ __kmp_unnamed_critical_addr:
+     .comm .gomp_critical_user_,32,8
+     .data
+     .align 8
+-    .global __kmp_unnamed_critical_addr
+-__kmp_unnamed_critical_addr:
++    .global ___kmp_unnamed_critical_addr
++___kmp_unnamed_critical_addr:
+     .8byte .gomp_critical_user_
+-    .size __kmp_unnamed_critical_addr,8
++#  if !(KMP_OS_DARWIN)
++    .size ___kmp_unnamed_critical_addr,8
++#  endif
+ #endif /* KMP_ARCH_PPC64 || KMP_ARCH_AARCH64 */
+ 
+ #if KMP_OS_LINUX
+
+
+

build_files/build_environment/patches/osl.diff

@@ -63,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/cmake_consistency_check_config.py

@@ -8,9 +8,6 @@ IGNORE_SOURCE = (
     # specific source files
     "extern/audaspace/",
 
-    # Use for `WIN32` only.
-    "source/creator/blender_launcher_win32.c",
-
     # specific source files
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp",
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp",

build_files/cmake/cmake_netbeans_project.py

@@ -82,7 +82,7 @@ def create_nb_project_main():
         make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM")
         make_exe_basename = os.path.basename(make_exe)
 
-        # --------------- NetBeans specific.
+        # --------------- NB specific
         defines = [("%s=%s" % cdef) if cdef[1] else cdef[0] for cdef in defines]
         defines += [cdef.replace("#define", "").strip() for cdef in cmake_compiler_defines()]
 

build_files/cmake/config/blender_full.cmake

@@ -29,7 +29,6 @@ set(WITH_IMAGE_OPENEXR       ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENJPEG      ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_TIFF          ON  CACHE BOOL "" FORCE)
 set(WITH_INPUT_NDOF          ON  CACHE BOOL "" FORCE)
-set(WITH_INPUT_IME           ON  CACHE BOOL "" FORCE)
 set(WITH_INTERNATIONAL       ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)

build_files/cmake/config/blender_release.cmake

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

build_files/cmake/platform/platform_apple.cmake

@@ -404,7 +404,7 @@ 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)
@@ -480,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.

build_files/config/pipeline_config.json

@@ -41,7 +41,7 @@
             },
             "cuda11":
             {
-                "version": "11.4"
+                "version": "11.3"
             }
         },
         "cmake":

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: '10.0.0'
-    cuda10:
-        version: '10.1.0'
-    cuda11:
-        version: '11.4.0'
-    optix:
-        version: '7.1.0'
-    cmake:
-        default:
-            version: any
-            overrides: {}
-        darwin-arm64:
-            overrides: {}
-        darwin-x86_64:
-            overrides: {}
-        linux-x86_64:
-            overrides: {}
-        windows-amd64:
-            overrides: {}

build_files/windows/autodetect_msvc.cmd

@@ -1,9 +1,9 @@
 echo No explicit msvc version requested, autodetecting version.
 
-call "%~dp0\detect_msvc2019.cmd"
+call "%~dp0\detect_msvc2017.cmd"
 if %ERRORLEVEL% EQU 0 goto DetectionComplete
 
-call "%~dp0\detect_msvc2017.cmd"
+call "%~dp0\detect_msvc2019.cmd"
 if %ERRORLEVEL% EQU 0 goto DetectionComplete
 
 call "%~dp0\detect_msvc2022.cmd"

doc/manpage/blender.1.py

@@ -122,7 +122,7 @@ is a full-featured 3D application. It supports the entirety of the 3D pipeline -
 '''modeling, rigging, animation, simulation, rendering, compositing, motion tracking, and video editing.
 
 Use Blender to create 3D images and animations, films and commercials, content for games, '''
-r'''architectural and industrial visualizations, and scientific visualizations.
+r'''architectural and industrial visualizatons, and scientific visualizations.
 
 https://www.blender.org''')
 

doc/python_api/examples/bpy.app.handlers.2.py

@@ -12,7 +12,6 @@ such cases, lock the interface (Render → Lock Interface or
 Below is an example of a mesh that is altered from a handler:
 """
 
-
 def frame_change_pre(scene):
     # A triangle that shifts in the z direction
     zshift = scene.frame_current * 0.1

doc/python_api/examples/bpy.app.timers.5.py

@@ -16,12 +16,10 @@ execution_queue = queue.Queue()
 def run_in_main_thread(function):
     execution_queue.put(function)
 
-
 def execute_queued_functions():
     while not execution_queue.empty():
         function = execution_queue.get()
         function()
     return 1.0
 
-
 bpy.app.timers.register(execute_queued_functions)

doc/python_api/examples/bpy.msgbus.1.py

@@ -31,13 +31,11 @@ owner = object()
 
 subscribe_to = bpy.context.object.location
 
-
 def msgbus_callback(*args):
     # This will print:
     # Something changed! (1, 2, 3)
     print("Something changed!", args)
 
-
 bpy.msgbus.subscribe_rna(
     key=subscribe_to,
     owner=owner,

doc/python_api/examples/bpy.types.Depsgraph.7.py

@@ -44,7 +44,7 @@ class OBJECT_OT_object_to_curve(bpy.types.Operator):
         # Remove temporary curve.
         obj.to_curve_clear()
         # Invoke to_curve() with applying modifiers.
-        curve_with_modifiers = obj.to_curve(depsgraph, apply_modifiers=True)
+        curve_with_modifiers = obj.to_curve(depsgraph, apply_modifiers = True)
         self.report({'INFO'}, f"{len(curve_with_modifiers.splines)} splines in new curve with modifiers.")
         # Remove temporary curve.
         obj.to_curve_clear()

doc/python_api/examples/gpu.6.py

@@ -21,7 +21,6 @@ batch = batch_for_shader(
     },
 )
 
-
 def draw():
     shader.bind()
     shader.uniform_sampler("image", texture)

doc/python_api/sphinx_doc_gen.py

@@ -1047,7 +1047,6 @@ context_type_map = {
     "annotation_data": ("GreasePencil", False),
     "annotation_data_owner": ("ID", False),
     "armature": ("Armature", False),
-    "asset_library": ("AssetLibraryReference", False),
     "bone": ("Bone", False),
     "brush": ("Brush", False),
     "camera": ("Camera", False),
@@ -1114,7 +1113,6 @@ context_type_map = {
     "texture_slot": ("MaterialTextureSlot", False),
     "texture_user": ("ID", False),
     "texture_user_property": ("Property", False),
-    "ui_list": ("UIList", False),
     "vertex_paint_object": ("Object", False),
     "view_layer": ("ViewLayer", False),
     "visible_bones": ("EditBone", True),

extern/audaspace/include/devices/SoftwareDevice.h

@@ -265,12 +265,6 @@ protected:
 	 */
 	void setSpecs(Specs specs);
 
-	/**
-	 * Sets the audio output specification of the device.
-	 * \param specs The output specification.
-	 */
-	void setSpecs(DeviceSpecs specs);
-
 	/**
 	 * Empty default constructor. To setup the device call the function create()
 	 * and to uninitialize call destroy().

extern/audaspace/include/respec/Mixer.h

@@ -87,12 +87,6 @@ public:
 	 */
 	void setSpecs(Specs specs);
 
-	/**
-	 * Sets the target specification for superposing.
-	 * \param specs The target specification.
-	 */
-	void setSpecs(DeviceSpecs specs);
-
 	/**
 	 * Mixes a buffer.
 	 * \param buffer The buffer to superpose.

extern/audaspace/plugins/pulseaudio/PulseAudioDevice.cpp

@@ -78,7 +78,6 @@ void PulseAudioDevice::runMixingThread()
 			if(shouldStop())
 			{
 				AUD_pa_stream_cork(m_stream, 1, nullptr, nullptr);
-				AUD_pa_stream_flush(m_stream, nullptr, nullptr);
 				doStop();
 				return;
 			}
@@ -87,10 +86,7 @@ void PulseAudioDevice::runMixingThread()
 		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);
+		AUD_pa_mainloop_iterate(m_mainloop, true, nullptr);
 	}
 }
 

extern/audaspace/plugins/pulseaudio/PulseAudioSymbols.h

@@ -24,7 +24,6 @@ PULSEAUDIO_SYMBOL(pa_context_unref);
 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_is_corked);
 PULSEAUDIO_SYMBOL(pa_stream_new);
 PULSEAUDIO_SYMBOL(pa_stream_set_buffer_attr);
@@ -36,6 +35,3 @@ PULSEAUDIO_SYMBOL(pa_mainloop_free);
 PULSEAUDIO_SYMBOL(pa_mainloop_get_api);
 PULSEAUDIO_SYMBOL(pa_mainloop_new);
 PULSEAUDIO_SYMBOL(pa_mainloop_iterate);
-PULSEAUDIO_SYMBOL(pa_mainloop_prepare);
-PULSEAUDIO_SYMBOL(pa_mainloop_poll);
-PULSEAUDIO_SYMBOL(pa_mainloop_dispatch);

extern/audaspace/plugins/wasapi/WASAPIDevice.cpp

@@ -31,81 +31,65 @@ template <class T> void SafeRelease(T **ppT)
 	}
 }
 
-HRESULT WASAPIDevice::setupRenderClient(IAudioRenderClient*& render_client, UINT32& buffer_size)
+void WASAPIDevice::runMixingThread()
 {
-	const IID IID_IAudioRenderClient = __uuidof(IAudioRenderClient);
-
+	UINT32 buffer_size;
 	UINT32 padding;
 	UINT32 length;
 	data_t* buffer;
 
-	HRESULT result;
+	IAudioRenderClient* render_client = nullptr;
 
-	if(FAILED(result = m_audio_client->GetBufferSize(&buffer_size)))
-		return result;
+	{
+		std::lock_guard<ILockable> lock(*this);
 
-	if(FAILED(result = m_audio_client->GetService(IID_IAudioRenderClient, reinterpret_cast<void**>(&render_client))))
-		return result;
+		const IID IID_IAudioRenderClient = __uuidof(IAudioRenderClient);
 
-	if(FAILED(result = m_audio_client->GetCurrentPadding(&padding)))
-		return result;
+		if(FAILED(m_audio_client->GetBufferSize(&buffer_size)))
+			goto init_error;
 
-	length = buffer_size - padding;
+		if(FAILED(m_audio_client->GetService(IID_IAudioRenderClient, reinterpret_cast<void**>(&render_client))))
+			goto init_error;
 
-	if(FAILED(result = render_client->GetBuffer(length, &buffer)))
-		return result;
+		if(FAILED(m_audio_client->GetCurrentPadding(&padding)))
+			goto init_error;
 
-	mix((data_t*)buffer, length);
+		length = buffer_size - padding;
 
-	if(FAILED(result = render_client->ReleaseBuffer(length, 0)))
-		return result;
+		if(FAILED(render_client->GetBuffer(length, &buffer)))
+			goto init_error;
+
+		mix((data_t*)buffer, length);
+
+		if(FAILED(render_client->ReleaseBuffer(length, 0)))
+		{
+			init_error:
+				SafeRelease(&render_client);
+				doStop();
+				return;
+		}
+	}
 
 	m_audio_client->Start();
 
-	return result;
-}
-
-void WASAPIDevice::runMixingThread()
-{
-	UINT32 buffer_size;
-
-	IAudioRenderClient* render_client = nullptr;
-
-	std::chrono::milliseconds sleep_duration;
-
-	bool run_init = true;
+	auto sleepDuration = std::chrono::milliseconds(buffer_size * 1000 / int(m_specs.rate) / 2);
 
 	for(;;)
 	{
-		HRESULT result = S_OK;
-
 		{
-			UINT32 padding;
-			UINT32 length;
-			data_t* buffer;
 			std::lock_guard<ILockable> lock(*this);
 
-			if(run_init)
-			{
-				result = setupRenderClient(render_client, buffer_size);
-
-				if(FAILED(result))
-					goto stop_thread;
-
-				sleep_duration = std::chrono::milliseconds(buffer_size * 1000 / int(m_specs.rate) / 2);
-			}
-
-			if(FAILED(result = m_audio_client->GetCurrentPadding(&padding)))
+			if(FAILED(m_audio_client->GetCurrentPadding(&padding)))
 				goto stop_thread;
 
 			length = buffer_size - padding;
 
-			if(FAILED(result = render_client->GetBuffer(length, &buffer)))
+			if(FAILED(render_client->GetBuffer(length, &buffer)))
 				goto stop_thread;
 
 			mix((data_t*)buffer, length);
 
-			if(FAILED(result = render_client->ReleaseBuffer(length, 0)))
+			if(FAILED(render_client->ReleaseBuffer(length, 0)))
 				goto stop_thread;
 
 			// stop thread
@@ -114,51 +98,53 @@ void WASAPIDevice::runMixingThread()
 				stop_thread:
 					m_audio_client->Stop();
 					SafeRelease(&render_client);
-
-					if(result == AUDCLNT_E_DEVICE_INVALIDATED)
-					{
-						DeviceSpecs specs = m_specs;
-						if(!setupDevice(specs))
-							result = S_FALSE;
-						else
-						{
-							setSpecs(specs);
-
-							run_init = true;
-						}
-					}
-
-					if(result != AUDCLNT_E_DEVICE_INVALIDATED)
-					{
-						doStop();
-						return;
-					}
+					doStop();
+					return;
 			}
 		}
 
-		std::this_thread::sleep_for(sleep_duration);
+		std::this_thread::sleep_for(sleepDuration);
 	}
 }
 
-bool WASAPIDevice::setupDevice(DeviceSpecs &specs)
+WASAPIDevice::WASAPIDevice(DeviceSpecs specs, int buffersize) :
+	m_imm_device_enumerator(nullptr),
+	m_imm_device(nullptr),
+	m_audio_client(nullptr),
+
+	m_wave_format_extensible({})
 {
-	SafeRelease(&m_audio_client);
-	SafeRelease(&m_imm_device);
+	// initialize COM if it hasn't happened yet
+	CoInitializeEx(nullptr, COINIT_MULTITHREADED);
 
+	const CLSID CLSID_MMDeviceEnumerator = __uuidof(MMDeviceEnumerator);
+	const IID IID_IMMDeviceEnumerator = __uuidof(IMMDeviceEnumerator);
 	const IID IID_IAudioClient = __uuidof(IAudioClient);
 
-	if(FAILED(m_imm_device_enumerator->GetDefaultAudioEndpoint(eRender, eMultimedia, &m_imm_device)))
-		return false;
-
-	if(FAILED(m_imm_device->Activate(IID_IAudioClient, CLSCTX_ALL, nullptr, reinterpret_cast<void**>(&m_audio_client))))
-		return false;
-
 	WAVEFORMATEXTENSIBLE wave_format_extensible_closest_match;
 	WAVEFORMATEXTENSIBLE* closest_match_pointer = &wave_format_extensible_closest_match;
 
+	HRESULT result;
+
 	REFERENCE_TIME minimum_time = 0;
 	REFERENCE_TIME buffer_duration;
 
+	if(FAILED(CoCreateInstance(CLSID_MMDeviceEnumerator, nullptr, CLSCTX_ALL, IID_IMMDeviceEnumerator, reinterpret_cast<void**>(&m_imm_device_enumerator))))
+		goto error;
+
+	if(FAILED(m_imm_device_enumerator->GetDefaultAudioEndpoint(eRender, eMultimedia, &m_imm_device)))
+		goto error;
+
+	if(FAILED(m_imm_device->Activate(IID_IAudioClient, CLSCTX_ALL, nullptr, reinterpret_cast<void**>(&m_audio_client))))
+		goto error;
+
+	if(specs.channels == CHANNELS_INVALID)
+		specs.channels = CHANNELS_STEREO;
+	if(specs.format == FORMAT_INVALID)
+		specs.format = FORMAT_FLOAT32;
+	if(specs.rate == RATE_INVALID)
+		specs.rate = RATE_48000;
+
 	switch(specs.format)
 	{
 	case FORMAT_U8:
@@ -217,14 +203,12 @@ bool WASAPIDevice::setupDevice(DeviceSpecs &specs)
 	m_wave_format_extensible.Format.cbSize = 22;
 	m_wave_format_extensible.Samples.wValidBitsPerSample = m_wave_format_extensible.Format.wBitsPerSample;
 
-	HRESULT result = m_audio_client->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED, reinterpret_cast<const WAVEFORMATEX*>(&m_wave_format_extensible), reinterpret_cast<WAVEFORMATEX**>(&closest_match_pointer));
+	result = m_audio_client->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED, reinterpret_cast<const WAVEFORMATEX*>(&m_wave_format_extensible), reinterpret_cast<WAVEFORMATEX**>(&closest_match_pointer));
 
 	if(result == S_FALSE)
 	{
-		bool errored = false;
-
 		if(closest_match_pointer->Format.wFormatTag != WAVE_FORMAT_EXTENSIBLE)
-			goto closest_match_error;
+			goto error;
 
 		specs.channels = Channels(closest_match_pointer->Format.nChannels);
 		specs.rate = closest_match_pointer->Format.nSamplesPerSec;
@@ -236,7 +220,7 @@ bool WASAPIDevice::setupDevice(DeviceSpecs &specs)
 			else if(closest_match_pointer->Format.wBitsPerSample == 64)
 				specs.format = FORMAT_FLOAT64;
 			else
-				goto closest_match_error;
+				goto error;
 		}
 		else if(closest_match_pointer->SubFormat == KSDATAFORMAT_SUBTYPE_PCM)
 		{
@@ -255,81 +239,44 @@ bool WASAPIDevice::setupDevice(DeviceSpecs &specs)
 				specs.format = FORMAT_S32;
 				break;
 			default:
-				goto closest_match_error;
+				goto error;
 				break;
 			}
 		}
 		else
-			goto closest_match_error;
+			goto error;
 
 		m_wave_format_extensible = *closest_match_pointer;
 
-		if(false)
-		{
-			closest_match_error:
-			errored = true;
-		}
-
 		if(closest_match_pointer != &wave_format_extensible_closest_match)
 		{
 			CoTaskMemFree(closest_match_pointer);
 			closest_match_pointer = &wave_format_extensible_closest_match;
 		}
-
-		if(errored)
-			return false;
 	}
 	else if(FAILED(result))
-		return false;
+		goto error;
 
 	if(FAILED(m_audio_client->GetDevicePeriod(nullptr, &minimum_time)))
-		return false;
+		goto error;
 
-	buffer_duration = REFERENCE_TIME(m_buffersize) * REFERENCE_TIME(10000000) / REFERENCE_TIME(specs.rate);
+	buffer_duration = REFERENCE_TIME(buffersize) * REFERENCE_TIME(10000000) / REFERENCE_TIME(specs.rate);
 
 	if(minimum_time > buffer_duration)
 		buffer_duration = minimum_time;
 
-	if(FAILED(m_audio_client->Initialize(AUDCLNT_SHAREMODE_SHARED, 0, buffer_duration, 0, reinterpret_cast<WAVEFORMATEX*>(&m_wave_format_extensible), nullptr)))
-		return false;
-
-	return true;
-}
-
-WASAPIDevice::WASAPIDevice(DeviceSpecs specs, int buffersize) :
-	m_buffersize(buffersize),
-	m_imm_device_enumerator(nullptr),
-	m_imm_device(nullptr),
-	m_audio_client(nullptr),
-
-	m_wave_format_extensible({})
-{
-	// initialize COM if it hasn't happened yet
-	CoInitializeEx(nullptr, COINIT_MULTITHREADED);
-
-	const CLSID CLSID_MMDeviceEnumerator = __uuidof(MMDeviceEnumerator);
-	const IID IID_IMMDeviceEnumerator = __uuidof(IMMDeviceEnumerator);
-
-	if(specs.channels == CHANNELS_INVALID)
-		specs.channels = CHANNELS_STEREO;
-	if(specs.format == FORMAT_INVALID)
-		specs.format = FORMAT_FLOAT32;
-	if(specs.rate == RATE_INVALID)
-		specs.rate = RATE_48000;
-
-	if(FAILED(CoCreateInstance(CLSID_MMDeviceEnumerator, nullptr, CLSCTX_ALL, IID_IMMDeviceEnumerator, reinterpret_cast<void**>(&m_imm_device_enumerator))))
-		goto error;
-
-	if(!setupDevice(specs))
-		goto error;
-
 	m_specs = specs;
 
+	if(FAILED(m_audio_client->Initialize(AUDCLNT_SHAREMODE_SHARED, 0, buffer_duration, 0, reinterpret_cast<WAVEFORMATEX*>(&m_wave_format_extensible), nullptr)))
+		goto error;
+
 	create();
 
 	return;
 
 	error:
+	if(closest_match_pointer != &wave_format_extensible_closest_match)
+		CoTaskMemFree(closest_match_pointer);
 	SafeRelease(&m_imm_device);
 	SafeRelease(&m_imm_device_enumerator);
 	SafeRelease(&m_audio_client);

extern/audaspace/plugins/wasapi/WASAPIDevice.h

@@ -43,21 +43,16 @@ AUD_NAMESPACE_BEGIN
 class AUD_PLUGIN_API WASAPIDevice : public ThreadedDevice
 {
 private:
-	int m_buffersize;
 	IMMDeviceEnumerator* m_imm_device_enumerator;
 	IMMDevice* m_imm_device;
 	IAudioClient* m_audio_client;
 	WAVEFORMATEXTENSIBLE m_wave_format_extensible;
 
-	AUD_LOCAL HRESULT setupRenderClient(IAudioRenderClient*& render_client, UINT32& buffer_size);
-
 	/**
 	 * Streaming thread main function.
 	 */
 	AUD_LOCAL void runMixingThread();
 
-	AUD_LOCAL bool setupDevice(DeviceSpecs& specs);
-
 	// delete copy constructor and operator=
 	WASAPIDevice(const WASAPIDevice&) = delete;
 	WASAPIDevice& operator=(const WASAPIDevice&) = delete;

extern/audaspace/src/devices/SoftwareDevice.cpp

@@ -756,7 +756,6 @@ void SoftwareDevice::mix(data_t* buffer, int length)
 			// get the buffer from the source
 			pos = 0;
 			len = length;
-			eos = false;
 
 			// update 3D Info
 			sound->update();
@@ -843,27 +842,6 @@ void SoftwareDevice::setSpecs(Specs specs)
 	{
 		sound->setSpecs(specs);
 	}
-
-	for(auto& sound : m_pausedSounds)
-	{
-		sound->setSpecs(specs);
-	}
-}
-
-void SoftwareDevice::setSpecs(DeviceSpecs specs)
-{
-	m_specs = specs;
-	m_mixer->setSpecs(specs);
-
-	for(auto& sound : m_playingSounds)
-	{
-		sound->setSpecs(specs.specs);
-	}
-
-	for(auto& sound : m_pausedSounds)
-	{
-		sound->setSpecs(specs.specs);
-	}
 }
 
 SoftwareDevice::SoftwareDevice()

extern/audaspace/src/respec/Mixer.cpp

@@ -21,25 +21,9 @@
 
 AUD_NAMESPACE_BEGIN
 
-Mixer::Mixer(DeviceSpecs specs)
+Mixer::Mixer(DeviceSpecs specs) :
+	m_specs(specs)
 {
-	setSpecs(specs);
-}
-
-DeviceSpecs Mixer::getSpecs() const
-{
-	return m_specs;
-}
-
-void Mixer::setSpecs(Specs specs)
-{
-	m_specs.specs = specs;
-}
-
-void Mixer::setSpecs(DeviceSpecs specs)
-{
-	m_specs = specs;
-
 	switch(m_specs.format)
 	{
 	case FORMAT_U8:
@@ -70,6 +54,16 @@ void Mixer::setSpecs(DeviceSpecs specs)
 	}
 }
 
+DeviceSpecs Mixer::getSpecs() const
+{
+	return m_specs;
+}
+
+void Mixer::setSpecs(Specs specs)
+{
+	m_specs.specs = specs;
+}
+
 void Mixer::clear(int length)
 {
 	m_buffer.assureSize(length * AUD_SAMPLE_SIZE(m_specs));

extern/glog/README.blender

@@ -7,4 +7,3 @@ Local modifications:
   checks for functions and so are needed.
 * Added special definitions of HAVE_SNPRINTF and HAVE_LIB_GFLAGS
   in Windows' specific config.h.
-* Silenced syscall deprecation warnings on macOS >= 10.12.

extern/glog/src/raw_logging.cc

@@ -59,7 +59,7 @@
 # include <unistd.h>
 #endif
 
-#if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) && (!(defined OS_MACOSX))
+#if defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)
 # define safe_write(fd, s, len)  syscall(SYS_write, fd, s, len)
 #else
   // Not so safe, but what can you do?

extern/glog/src/utilities.cc

@@ -259,13 +259,7 @@ pid_t GetTID() {
 #endif
   static bool lacks_gettid = false;
   if (!lacks_gettid) {
-#ifdef OS_MACOSX
-    uint64_t tid64;
-    const int error = pthread_threadid_np(NULL, &tid64);
-    pid_t tid = error ? -1 : (pid_t)tid64;
-#else
     pid_t tid = syscall(__NR_gettid);
-#endif
     if (tid != -1) {
       return tid;
     }

extern/rangetree/intern/generic_alloc_impl.h

@@ -32,7 +32,7 @@
  * - #TPOOL_STRUCT: Name for pool struct name.
  * - #TPOOL_CHUNK_SIZE: Chunk size (optional), use 64kb when not defined.
  *
- * \note #TPOOL_ALLOC_TYPE must be at least `sizeof(void *)`.
+ * \note #TPOOL_ALLOC_TYPE must be at least ``sizeof(void *)``.
  *
  * Defines the API, uses #TPOOL_IMPL_PREFIX to prefix each function.
  *

intern/atomic/intern/atomic_ops_unix.h

@@ -49,9 +49,9 @@
 
 #include "atomic_ops_utils.h"
 
-#if defined(__arm__) || defined(__riscv)
-/* Attempt to fix compilation error on Debian armel and RISC-V kernels.
- * Both architectures do have both 32 and 64bit atomics, however
+#if defined(__arm__)
+/* Attempt to fix compilation error on Debian armel kernel.
+ * arm7 architecture does have both 32 and 64bit atomics, however
  * its gcc doesn't have __GCC_HAVE_SYNC_COMPARE_AND_SWAP_n defined.
  */
 #  define JE_FORCE_SYNC_COMPARE_AND_SWAP_1

intern/cycles/blender/addon/properties.py

@@ -263,7 +263,6 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
         name="Use Denoising",
         description="Denoise the rendered image",
         default=False,
-        update=update_render_passes,
     )
     use_preview_denoising: BoolProperty(
         name="Use Viewport Denoising",
@@ -483,7 +482,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
 
     transparent_max_bounces: IntProperty(
         name="Transparent Max Bounces",
-        description="Maximum number of transparent bounces. This is independent of maximum number of other bounces ",
+        description="Maximum number of transparent bounces",
         min=0, max=1024,
         default=8,
     )
@@ -1255,19 +1254,12 @@ class CyclesObjectSettings(bpy.types.PropertyGroup):
     )
 
     shadow_terminator_offset: FloatProperty(
-        name="Shadow Terminator Shading Offset",
+        name="Shadow Terminator Offset",
         description="Push the shadow terminator towards the light to hide artifacts on low poly geometry",
         min=0.0, max=1.0,
         default=0.0,
     )
 
-    shadow_terminator_geometry_offset: FloatProperty(
-        name="Shadow Terminator Geometry Offset",
-        description="Offset rays from the surface to reduce shadow terminator artifact on low poly geometry. Only affects triangles at grazing angles to light",
-        min=0.0, max=1.0,
-        default=0.1,
-    )
-
     is_shadow_catcher: BoolProperty(
         name="Shadow Catcher",
         description="Only render shadows on this object, for compositing renders into real footage",

intern/cycles/blender/addon/ui.py

@@ -485,12 +485,10 @@ class CYCLES_RENDER_PT_light_paths_max_bounces(CyclesButtonsPanel, Panel):
         col = layout.column(align=True)
         col.prop(cscene, "diffuse_bounces", text="Diffuse")
         col.prop(cscene, "glossy_bounces", text="Glossy")
+        col.prop(cscene, "transparent_max_bounces", text="Transparency")
         col.prop(cscene, "transmission_bounces", text="Transmission")
         col.prop(cscene, "volume_bounces", text="Volume")
 
-        col = layout.column(align=True)
-        col.prop(cscene, "transparent_max_bounces", text="Transparent")
-
 
 class CYCLES_RENDER_PT_light_paths_clamping(CyclesButtonsPanel, Panel):
     bl_label = "Clamping"
@@ -1136,7 +1134,7 @@ class CYCLES_PT_context_material(CyclesButtonsPanel, Panel):
             col = row.column(align=True)
             col.operator("object.material_slot_add", icon='ADD', text="")
             col.operator("object.material_slot_remove", icon='REMOVE', text="")
-            col.separator()
+
             col.menu("MATERIAL_MT_context_menu", icon='DOWNARROW_HLT', text="")
 
             if is_sortable:
@@ -1151,15 +1149,16 @@ class CYCLES_PT_context_material(CyclesButtonsPanel, Panel):
                 row.operator("object.material_slot_select", text="Select")
                 row.operator("object.material_slot_deselect", text="Deselect")
 
-        row = layout.row()
+        split = layout.split(factor=0.65)
 
         if ob:
-            row.template_ID(ob, "active_material", new="material.new")
+            split.template_ID(ob, "active_material", new="material.new")
+            row = split.row()
 
             if slot:
-                icon_link = 'MESH_DATA' if slot.link == 'DATA' else 'OBJECT_DATA'
-                row.prop(slot, "link", text="", icon=icon_link, icon_only=True)
-
+                row.prop(slot, "link", text="")
+            else:
+                row.label()
         elif mat:
             split.template_ID(space, "pin_id")
             split.separator()
@@ -1224,31 +1223,20 @@ class CYCLES_OBJECT_PT_shading(CyclesButtonsPanel, Panel):
 
     @classmethod
     def poll(cls, context):
-        if not CyclesButtonsPanel.poll(context):
-            return False
-
-        ob = context.object
-        return ob and has_geometry_visibility(ob)
-
-    def draw(self, context):
-        pass
-
-
-class CYCLES_OBJECT_PT_shading_shadow_terminator(CyclesButtonsPanel, Panel):
-    bl_label = "Shadow Terminator"
-    bl_parent_id = "CYCLES_OBJECT_PT_shading"
-    bl_context = "object"
+        return CyclesButtonsPanel.poll(context) and (context.object)
 
     def draw(self, context):
         layout = self.layout
         layout.use_property_split = True
 
-        flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=True)
-
+        flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
+        layout = self.layout
         ob = context.object
         cob = ob.cycles
-        flow.prop(cob, "shadow_terminator_geometry_offset", text="Geometry Offset")
-        flow.prop(cob, "shadow_terminator_offset", text="Shading Offset")
+
+        if has_geometry_visibility(ob):
+            col = flow.column()
+            col.prop(cob, "shadow_terminator_offset")
 
 
 class CYCLES_OBJECT_PT_visibility(CyclesButtonsPanel, Panel):
@@ -2328,7 +2316,6 @@ classes = (
     CYCLES_PT_context_material,
     CYCLES_OBJECT_PT_motion_blur,
     CYCLES_OBJECT_PT_shading,
-    CYCLES_OBJECT_PT_shading_shadow_terminator,
     CYCLES_OBJECT_PT_visibility,
     CYCLES_OBJECT_PT_visibility_ray_visibility,
     CYCLES_OBJECT_PT_visibility_culling,

intern/cycles/blender/blender_image.cpp

@@ -137,9 +137,9 @@ bool BlenderImageLoader::load_pixels(const ImageMetaData &metadata,
       /* Premultiply, byte images are always straight for Blender. */
       unsigned char *cp = (unsigned char *)pixels;
       for (size_t i = 0; i < num_pixels; i++, cp += channels) {
-        cp[0] = (cp[0] * cp[3]) / 255;
-        cp[1] = (cp[1] * cp[3]) / 255;
-        cp[2] = (cp[2] * cp[3]) / 255;
+        cp[0] = (cp[0] * cp[3]) >> 8;
+        cp[1] = (cp[1] * cp[3]) >> 8;
+        cp[2] = (cp[2] * cp[3]) >> 8;
       }
     }
   }

intern/cycles/blender/blender_object.cpp

@@ -109,23 +109,23 @@ void BlenderSync::sync_object_motion_init(BL::Object &b_parent, BL::Object &b_ob
   }
 
   Geometry *geom = object->get_geometry();
+  geom->set_use_motion_blur(false);
+  geom->set_motion_steps(0);
 
-  int motion_steps = 0;
-  bool use_motion_blur = false;
+  uint motion_steps;
 
   if (need_motion == Scene::MOTION_BLUR) {
     motion_steps = object_motion_steps(b_parent, b_ob, Object::MAX_MOTION_STEPS);
+    geom->set_motion_steps(motion_steps);
     if (motion_steps && object_use_deform_motion(b_parent, b_ob)) {
-      use_motion_blur = true;
+      geom->set_use_motion_blur(true);
     }
   }
   else {
     motion_steps = 3;
+    geom->set_motion_steps(motion_steps);
   }
 
-  geom->set_use_motion_blur(use_motion_blur);
-  geom->set_motion_steps(motion_steps);
-
   motion.resize(motion_steps, transform_empty());
 
   if (motion_steps) {
@@ -290,12 +290,8 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
   bool is_shadow_catcher = get_boolean(cobject, "is_shadow_catcher");
   object->set_is_shadow_catcher(is_shadow_catcher);
 
-  float shadow_terminator_shading_offset = get_float(cobject, "shadow_terminator_offset");
-  object->set_shadow_terminator_shading_offset(shadow_terminator_shading_offset);
-
-  float shadow_terminator_geometry_offset = get_float(cobject,
-                                                      "shadow_terminator_geometry_offset");
-  object->set_shadow_terminator_geometry_offset(shadow_terminator_geometry_offset);
+  float shadow_terminator_offset = get_float(cobject, "shadow_terminator_offset");
+  object->set_shadow_terminator_offset(shadow_terminator_offset);
 
   /* sync the asset name for Cryptomatte */
   BL::Object parent = b_ob.parent();

intern/cycles/blender/blender_sync.cpp

@@ -404,6 +404,8 @@ void BlenderSync::sync_film(BL::SpaceView3D &b_v3d)
 
   Film *film = scene->film;
 
+  vector<Pass> prevpasses = scene->passes;
+
   if (b_v3d) {
     film->set_display_pass(update_viewport_display_passes(b_v3d, scene->passes));
   }
@@ -433,6 +435,11 @@ void BlenderSync::sync_film(BL::SpaceView3D &b_v3d)
         break;
     }
   }
+
+  if (!Pass::equals(prevpasses, scene->passes)) {
+    film->tag_passes_update(scene, prevpasses, false);
+    film->tag_modified();
+  }
 }
 
 /* Render Layer */
@@ -596,10 +603,8 @@ vector<Pass> BlenderSync::sync_render_passes(BL::Scene &b_scene,
   for (BL::RenderPass &b_pass : b_rlay.passes) {
     PassType pass_type = get_pass_type(b_pass);
 
-    if (pass_type == PASS_MOTION &&
-        (b_view_layer.use_motion_blur() && b_scene.render().use_motion_blur())) {
+    if (pass_type == PASS_MOTION && view_layer.use_motion_blur)
       continue;
-    }
     if (pass_type != PASS_NONE)
       Pass::add(pass_type, passes, b_pass.name().c_str());
   }
@@ -742,13 +747,10 @@ vector<Pass> BlenderSync::sync_render_passes(BL::Scene &b_scene,
                                         DENOISING_CLEAN_ALL_PASSES);
   scene->film->set_denoising_prefiltered_pass(denoising.store_passes &&
                                               denoising.type == DENOISER_NLM);
-  scene->film->set_pass_alpha_threshold(b_view_layer.pass_alpha_threshold());
 
-  if (!Pass::equals(passes, scene->passes)) {
-    scene->film->tag_passes_update(scene, passes);
-    scene->film->tag_modified();
-    scene->integrator->tag_update(scene, Integrator::UPDATE_ALL);
-  }
+  scene->film->set_pass_alpha_threshold(b_view_layer.pass_alpha_threshold());
+  scene->film->tag_passes_update(scene, passes);
+  scene->integrator->tag_update(scene, Integrator::UPDATE_ALL);
 
   return passes;
 }

intern/cycles/blender/blender_viewport.cpp

@@ -40,8 +40,8 @@ BlenderViewportParameters::BlenderViewportParameters(BL::SpaceView3D &b_v3d)
   BL::View3DShading shading = b_v3d.shading();
   PointerRNA cshading = RNA_pointer_get(&shading.ptr, "cycles");
 
-  /* We only copy the shading parameters if we are in look-dev mode.
-   * Otherwise defaults are being used. These defaults mimic normal render settings. */
+  /* We only copy the shading parameters if we are in look dev mode. otherwise
+   * defaults are being used. These defaults mimic normal render settings */
   if (shading.type() == BL::View3DShading::type_RENDERED) {
     use_scene_world = shading.use_scene_world_render();
     use_scene_lights = shading.use_scene_lights_render();

intern/cycles/bvh/bvh_node.h

@@ -179,7 +179,7 @@ class InnerNode : public BVHNode {
   }
 
   /* NOTE: This function is only used during binary BVH builder, and it
-   * supposed to be configured to have 2 children which will be filled-in in a
+   * supposed to be configured to have 2 children which will be filled in in a
    * bit. But this is important to have children reset to NULL. */
   explicit InnerNode(const BoundBox &bounds) : BVHNode(bounds), num_children_(0)
   {

intern/cycles/device/cuda/device_cuda_impl.cpp

@@ -461,19 +461,18 @@ string CUDADevice::compile_kernel(const DeviceRequestedFeatures &requested_featu
 
   const int nvcc_cuda_version = cuewCompilerVersion();
   VLOG(1) << "Found nvcc " << nvcc << ", CUDA version " << nvcc_cuda_version << ".";
-  if (nvcc_cuda_version < 101) {
+  if (nvcc_cuda_version < 80) {
     printf(
         "Unsupported CUDA version %d.%d detected, "
-        "you need CUDA 10.1 or newer.\n",
+        "you need CUDA 8.0 or newer.\n",
         nvcc_cuda_version / 10,
         nvcc_cuda_version % 10);
     return string();
   }
-  else if (!(nvcc_cuda_version == 101 || nvcc_cuda_version == 102 || nvcc_cuda_version == 111 ||
-             nvcc_cuda_version == 112 || nvcc_cuda_version == 113 || nvcc_cuda_version == 114)) {
+  else if (!(nvcc_cuda_version == 101 || nvcc_cuda_version == 102)) {
     printf(
         "CUDA version %d.%d detected, build may succeed but only "
-        "CUDA 10.1 to 11.4 are officially supported.\n",
+        "CUDA 10.1 and 10.2 are officially supported.\n",
         nvcc_cuda_version / 10,
         nvcc_cuda_version % 10);
   }

intern/cycles/kernel/CMakeLists.txt

@@ -380,16 +380,11 @@ if(WITH_CYCLES_CUDA_BINARIES)
   set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}")
 
   # warn for other versions
-  if((CUDA_VERSION MATCHES "101") OR
-     (CUDA_VERSION MATCHES "102") OR
-     (CUDA_VERSION MATCHES "111") OR
-     (CUDA_VERSION MATCHES "112") OR
-     (CUDA_VERSION MATCHES "113") OR
-     (CUDA_VERSION MATCHES "114"))
+  if((CUDA_VERSION MATCHES "101") OR (CUDA_VERSION MATCHES "102") OR (CUDA_VERSION MATCHES "111"))
   else()
     message(WARNING
       "CUDA version ${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR} detected, "
-      "build may succeed but only CUDA 10.1 to 11.4 are officially supported")
+      "build may succeed but only CUDA 10.1, 10.2 and 11.1 are officially supported")
   endif()
 
   # build for each arch

intern/cycles/kernel/bvh/bvh_util.h

@@ -71,86 +71,6 @@ ccl_device_inline float3 ray_offset(float3 P, float3 Ng)
 #endif
 }
 
-/* This function should be used to compute a modified ray start position for
- * rays leaving from a surface. The algorithm slightly distorts flat surface
- * of a triangle. Surface is lifted by amount h along normal n in the incident
- * point. */
-
-ccl_device_inline float3 smooth_surface_offset(KernelGlobals *kg, ShaderData *sd, float3 Ng)
-{
-  float3 V[3], N[3];
-  triangle_vertices_and_normals(kg, sd->prim, V, N);
-
-  const float u = sd->u, v = sd->v;
-  const float w = 1 - u - v;
-  float3 P = V[0] * u + V[1] * v + V[2] * w; /* Local space */
-  float3 n = N[0] * u + N[1] * v + N[2] * w; /* We get away without normalization */
-
-  object_normal_transform(kg, sd, &n); /* Normal x scale, world space */
-
-  /* Parabolic approximation */
-  float a = dot(N[2] - N[0], V[0] - V[2]);
-  float b = dot(N[2] - N[1], V[1] - V[2]);
-  float c = dot(N[1] - N[0], V[1] - V[0]);
-  float h = a * u * (u - 1) + (a + b + c) * u * v + b * v * (v - 1);
-
-  /* Check flipped normals */
-  if (dot(n, Ng) > 0) {
-    /* Local linear envelope */
-    float h0 = max(max(dot(V[1] - V[0], N[0]), dot(V[2] - V[0], N[0])), 0.0f);
-    float h1 = max(max(dot(V[0] - V[1], N[1]), dot(V[2] - V[1], N[1])), 0.0f);
-    float h2 = max(max(dot(V[0] - V[2], N[2]), dot(V[1] - V[2], N[2])), 0.0f);
-    h0 = max(dot(V[0] - P, N[0]) + h0, 0.0f);
-    h1 = max(dot(V[1] - P, N[1]) + h1, 0.0f);
-    h2 = max(dot(V[2] - P, N[2]) + h2, 0.0f);
-    h = max(min(min(h0, h1), h2), h * 0.5f);
-  }
-  else {
-    float h0 = max(max(dot(V[0] - V[1], N[0]), dot(V[0] - V[2], N[0])), 0.0f);
-    float h1 = max(max(dot(V[1] - V[0], N[1]), dot(V[1] - V[2], N[1])), 0.0f);
-    float h2 = max(max(dot(V[2] - V[0], N[2]), dot(V[2] - V[1], N[2])), 0.0f);
-    h0 = max(dot(P - V[0], N[0]) + h0, 0.0f);
-    h1 = max(dot(P - V[1], N[1]) + h1, 0.0f);
-    h2 = max(dot(P - V[2], N[2]) + h2, 0.0f);
-    h = min(-min(min(h0, h1), h2), h * 0.5f);
-  }
-
-  return n * h;
-}
-
-/* Ray offset to avoid shadow terminator artifact. */
-
-ccl_device_inline float3 ray_offset_shadow(KernelGlobals *kg, ShaderData *sd, float3 L)
-{
-  float NL = dot(sd->N, L);
-  bool transmit = (NL < 0.0f);
-  float3 Ng = (transmit ? -sd->Ng : sd->Ng);
-  float3 P = ray_offset(sd->P, Ng);
-
-  if ((sd->type & PRIMITIVE_ALL_TRIANGLE) && (sd->shader & SHADER_SMOOTH_NORMAL)) {
-    const float offset_cutoff =
-        kernel_tex_fetch(__objects, sd->object).shadow_terminator_geometry_offset;
-    /* Do ray offset (heavy stuff) only for close to be terminated triangles:
-     * offset_cutoff = 0.1f means that 10-20% of rays will be affected. Also
-     * make a smooth transition near the threshold. */
-    if (offset_cutoff > 0.0f) {
-      float NgL = dot(Ng, L);
-      float offset_amount = 0.0f;
-      if (NL < offset_cutoff) {
-        offset_amount = clamp(2.0f - (NgL + NL) / offset_cutoff, 0.0f, 1.0f);
-      }
-      else {
-        offset_amount = clamp(1.0f - NgL / offset_cutoff, 0.0f, 1.0f);
-      }
-      if (offset_amount > 0.0f) {
-        P += smooth_surface_offset(kg, sd, Ng) * offset_amount;
-      }
-    }
-  }
-
-  return P;
-}
-
 #if defined(__VOLUME_RECORD_ALL__) || (defined(__SHADOW_RECORD_ALL__) && defined(__KERNEL_CPU__))
 /* ToDo: Move to another file? */
 ccl_device int intersections_compare(const void *a, const void *b)

intern/cycles/kernel/closure/bsdf.h

@@ -462,7 +462,7 @@ ccl_device_inline int bsdf_sample(KernelGlobals *kg,
   else {
     /* Shadow terminator offset. */
     const float frequency_multiplier =
-        kernel_tex_fetch(__objects, sd->object).shadow_terminator_shading_offset;
+        kernel_tex_fetch(__objects, sd->object).shadow_terminator_offset;
     if (frequency_multiplier > 1.0f) {
       *eval *= shift_cos_in(dot(*omega_in, sc->N), frequency_multiplier);
     }
@@ -488,9 +488,12 @@ ccl_device_inline
               const float3 omega_in,
               float *pdf)
 {
+  /* For curves use the smooth normal, particularly for ribbons the geometric
+   * normal gives too much darkening otherwise. */
+  const float3 Ng = (sd->type & PRIMITIVE_ALL_CURVE) ? sd->N : sd->Ng;
   float3 eval;
 
-  if (dot(sd->N, omega_in) >= 0.0f) {
+  if (dot(Ng, omega_in) >= 0.0f) {
     switch (sc->type) {
       case CLOSURE_BSDF_DIFFUSE_ID:
       case CLOSURE_BSDF_BSSRDF_ID:
@@ -586,7 +589,7 @@ ccl_device_inline
     }
     /* Shadow terminator offset. */
     const float frequency_multiplier =
-        kernel_tex_fetch(__objects, sd->object).shadow_terminator_shading_offset;
+        kernel_tex_fetch(__objects, sd->object).shadow_terminator_offset;
     if (frequency_multiplier > 1.0f) {
       eval *= shift_cos_in(dot(omega_in, sc->N), frequency_multiplier);
     }

intern/cycles/kernel/geom/geom_curve_intersect.h

@@ -237,7 +237,7 @@ ccl_device bool curve_intersect_iterative(const float3 ray_dir,
         return false; /* Rejects NaNs */
       }
 
-      /* Back-face culling. */
+      /* Backface culling. */
       const float3 R = normalize(Q - P);
       const float3 U = dradiusdu * R + dPdu;
       const float3 V = cross(dPdu, R);
@@ -458,12 +458,10 @@ ccl_device_inline bool cylinder_culling_test(const float2 p1, const float2 p2, c
   return num * num <= r * r * den2;
 }
 
-/**
- * Intersects a ray with a quad with back-face culling
- * enabled. The quad v0,v1,v2,v3 is split into two triangles
- * v0,v1,v3 and v2,v3,v1. The edge v1,v2 decides which of the two
- * triangles gets intersected.
- */
+/*! Intersects a ray with a quad with backface culling
+ *  enabled. The quad v0,v1,v2,v3 is split into two triangles
+ *  v0,v1,v3 and v2,v3,v1. The edge v1,v2 decides which of the two
+ *  triangles gets intersected. */
 ccl_device_inline bool ribbon_intersect_quad(const float ray_tfar,
                                              const float3 quad_v0,
                                              const float3 quad_v1,

intern/cycles/kernel/geom/geom_primitive.h

@@ -138,7 +138,7 @@ ccl_device_inline float4 primitive_surface_attribute_float4(KernelGlobals *kg,
 ccl_device_inline bool primitive_is_volume_attribute(const ShaderData *sd,
                                                      const AttributeDescriptor desc)
 {
-  return sd->type == PRIMITIVE_VOLUME;
+  return (sd->object != OBJECT_NONE && desc.element == ATTR_ELEMENT_VOXEL);
 }
 
 ccl_device_inline float primitive_volume_attribute_float(KernelGlobals *kg,

intern/cycles/kernel/geom/geom_triangle.h

@@ -75,22 +75,6 @@ ccl_device_inline void triangle_vertices(KernelGlobals *kg, int prim, float3 P[3
   P[2] = float4_to_float3(kernel_tex_fetch(__prim_tri_verts, tri_vindex.w + 2));
 }
 
-/* Triangle vertex locations and vertex normals */
-
-ccl_device_inline void triangle_vertices_and_normals(KernelGlobals *kg,
-                                                     int prim,
-                                                     float3 P[3],
-                                                     float3 N[3])
-{
-  const uint4 tri_vindex = kernel_tex_fetch(__tri_vindex, prim);
-  P[0] = float4_to_float3(kernel_tex_fetch(__prim_tri_verts, tri_vindex.w + 0));
-  P[1] = float4_to_float3(kernel_tex_fetch(__prim_tri_verts, tri_vindex.w + 1));
-  P[2] = float4_to_float3(kernel_tex_fetch(__prim_tri_verts, tri_vindex.w + 2));
-  N[0] = float4_to_float3(kernel_tex_fetch(__tri_vnormal, tri_vindex.x));
-  N[1] = float4_to_float3(kernel_tex_fetch(__tri_vnormal, tri_vindex.y));
-  N[2] = float4_to_float3(kernel_tex_fetch(__tri_vnormal, tri_vindex.z));
-}
-
 /* Interpolate smooth vertex normal from vertices */
 
 ccl_device_inline float3

intern/cycles/kernel/geom/geom_volume.h

@@ -72,22 +72,14 @@ ccl_device float4 volume_attribute_float4(KernelGlobals *kg,
                                           const ShaderData *sd,
                                           const AttributeDescriptor desc)
 {
-  if (desc.element & (ATTR_ELEMENT_OBJECT | ATTR_ELEMENT_MESH)) {
-    return kernel_tex_fetch(__attributes_float3, desc.offset);
-  }
-  else if (desc.element == ATTR_ELEMENT_VOXEL) {
-    /* todo: optimize this so we don't have to transform both here and in
-     * kernel_tex_image_interp_3d when possible. Also could optimize for the
-     * common case where transform is translation/scale only. */
-    float3 P = sd->P;
-    object_inverse_position_transform(kg, sd, &P);
-    InterpolationType interp = (sd->flag & SD_VOLUME_CUBIC) ? INTERPOLATION_CUBIC :
-                                                              INTERPOLATION_NONE;
-    return kernel_tex_image_interp_3d(kg, desc.offset, P, interp);
-  }
-  else {
-    return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
-  }
+  /* todo: optimize this so we don't have to transform both here and in
+   * kernel_tex_image_interp_3d when possible. Also could optimize for the
+   * common case where transform is translation/scale only. */
+  float3 P = sd->P;
+  object_inverse_position_transform(kg, sd, &P);
+  InterpolationType interp = (sd->flag & SD_VOLUME_CUBIC) ? INTERPOLATION_CUBIC :
+                                                            INTERPOLATION_NONE;
+  return kernel_tex_image_interp_3d(kg, desc.offset, P, interp);
 }
 
 #endif

intern/cycles/kernel/kernel_bake.h

@@ -40,7 +40,7 @@ ccl_device_noinline void compute_light_pass(
   /* Evaluate surface shader. */
   shader_eval_surface(kg, sd, &state, NULL, state.flag);
 
-  /* TODO: disable more closures we don't need besides transparent. */
+  /* TODO, disable more closures we don't need besides transparent */
   shader_bsdf_disable_transparency(kg, sd);
 
   /* Init ray. */

intern/cycles/kernel/kernel_emission.h

@@ -176,7 +176,8 @@ ccl_device_noinline_cpu bool direct_emission(KernelGlobals *kg,
 
   if (ls->shader & SHADER_CAST_SHADOW) {
     /* setup ray */
-    ray->P = ray_offset_shadow(kg, sd, ls->D);
+    bool transmit = (dot(sd->Ng, ls->D) < 0.0f);
+    ray->P = ray_offset(sd->P, (transmit) ? -sd->Ng : sd->Ng);
 
     if (ls->t == FLT_MAX) {
       /* distant light */

intern/cycles/kernel/kernel_shader.h

@@ -1268,7 +1268,6 @@ ccl_device_inline void shader_eval_volume(KernelGlobals *kg,
   sd->num_closure_left = max_closures;
   sd->flag = 0;
   sd->object_flag = 0;
-  sd->type = PRIMITIVE_VOLUME;
 
   for (int i = 0; stack[i].shader != SHADER_NONE; i++) {
     /* setup shaderdata from stack. it's mostly setup already in

intern/cycles/kernel/kernel_types.h

@@ -689,24 +689,22 @@ typedef enum PrimitiveType {
   PRIMITIVE_MOTION_CURVE_THICK = (1 << 3),
   PRIMITIVE_CURVE_RIBBON = (1 << 4),
   PRIMITIVE_MOTION_CURVE_RIBBON = (1 << 5),
-  PRIMITIVE_VOLUME = (1 << 6),
   /* Lamp primitive is not included below on purpose,
    * since it is no real traceable primitive.
    */
-  PRIMITIVE_LAMP = (1 << 7),
+  PRIMITIVE_LAMP = (1 << 6),
 
   PRIMITIVE_ALL_TRIANGLE = (PRIMITIVE_TRIANGLE | PRIMITIVE_MOTION_TRIANGLE),
   PRIMITIVE_ALL_CURVE = (PRIMITIVE_CURVE_THICK | PRIMITIVE_MOTION_CURVE_THICK |
                          PRIMITIVE_CURVE_RIBBON | PRIMITIVE_MOTION_CURVE_RIBBON),
-  PRIMITIVE_ALL_VOLUME = (PRIMITIVE_VOLUME),
   PRIMITIVE_ALL_MOTION = (PRIMITIVE_MOTION_TRIANGLE | PRIMITIVE_MOTION_CURVE_THICK |
                           PRIMITIVE_MOTION_CURVE_RIBBON),
-  PRIMITIVE_ALL = (PRIMITIVE_ALL_TRIANGLE | PRIMITIVE_ALL_CURVE | PRIMITIVE_ALL_VOLUME),
+  PRIMITIVE_ALL = (PRIMITIVE_ALL_TRIANGLE | PRIMITIVE_ALL_CURVE),
 
   /* Total number of different traceable primitives.
    * NOTE: This is an actual value, not a bitflag.
    */
-  PRIMITIVE_NUM_TOTAL = 7,
+  PRIMITIVE_NUM_TOTAL = 6,
 } PrimitiveType;
 
 #define PRIMITIVE_PACK_SEGMENT(type, segment) ((segment << PRIMITIVE_NUM_TOTAL) | (type))
@@ -1481,8 +1479,7 @@ typedef struct KernelObject {
   float cryptomatte_object;
   float cryptomatte_asset;
 
-  float shadow_terminator_shading_offset;
-  float shadow_terminator_geometry_offset;
+  float shadow_terminator_offset;
   float pad1, pad2, pad3;
 } KernelObject;
 static_assert_align(KernelObject, 16);

intern/cycles/kernel/svm/svm_vector_rotate.h

@@ -50,29 +50,24 @@ ccl_device void svm_node_vector_rotate(ShaderData *sd,
     }
     else {
       float3 axis;
-      float axis_length;
       switch (type) {
         case NODE_VECTOR_ROTATE_TYPE_AXIS_X:
           axis = make_float3(1.0f, 0.0f, 0.0f);
-          axis_length = 1.0f;
           break;
         case NODE_VECTOR_ROTATE_TYPE_AXIS_Y:
           axis = make_float3(0.0f, 1.0f, 0.0f);
-          axis_length = 1.0f;
           break;
         case NODE_VECTOR_ROTATE_TYPE_AXIS_Z:
           axis = make_float3(0.0f, 0.0f, 1.0f);
-          axis_length = 1.0f;
           break;
         default:
-          axis = stack_load_float3(stack, axis_stack_offset);
-          axis_length = len(axis);
+          axis = normalize(stack_load_float3(stack, axis_stack_offset));
           break;
       }
       float angle = stack_load_float(stack, angle_stack_offset);
       angle = invert ? -angle : angle;
-      result = (axis_length != 0.0f) ?
-                   rotate_around_axis(vector - center, axis / axis_length, angle) + center :
+      result = (len_squared(axis) != 0.0f) ?
+                   rotate_around_axis(vector - center, axis, angle) + center :
                    vector;
     }
 

intern/cycles/render/camera.h

@@ -81,7 +81,7 @@ class Camera : public Node {
   /* ** Rolling shutter effect. ** */
   /* Defines rolling shutter effect type. */
   NODE_SOCKET_API(RollingShutterType, rolling_shutter_type)
-  /* Specifies exposure time of scan-lines when using
+  /* Specifies exposure time of scanlines when using
    * rolling shutter effect.
    */
   NODE_SOCKET_API(float, rolling_shutter_duration)

intern/cycles/render/colorspace.cpp

@@ -385,7 +385,7 @@ void ColorSpaceManager::free_memory()
 {
 #ifdef WITH_OCIO
   map_free_memory(cached_colorspaces);
-  map_free_memory(cached_processors);
+  map_free_memory(cached_colorspaces);
 #endif
 }
 

intern/cycles/render/constant_fold.cpp

@@ -48,7 +48,6 @@ void ConstantFolder::make_constant(float value) const
 
   foreach (ShaderInput *sock, output->links) {
     sock->set(value);
-    sock->constant_folded_in = true;
   }
 
   graph->disconnect(output);
@@ -60,7 +59,6 @@ void ConstantFolder::make_constant(float3 value) const
 
   foreach (ShaderInput *sock, output->links) {
     sock->set(value);
-    sock->constant_folded_in = true;
   }
 
   graph->disconnect(output);

intern/cycles/render/graph.h

@@ -79,11 +79,7 @@ enum ShaderNodeSpecialType {
 class ShaderInput {
  public:
   ShaderInput(const SocketType &socket_type_, ShaderNode *parent_)
-      : socket_type(socket_type_),
-        parent(parent_),
-        link(NULL),
-        stack_offset(SVM_STACK_INVALID),
-        constant_folded_in(false)
+      : socket_type(socket_type_), parent(parent_), link(NULL), stack_offset(SVM_STACK_INVALID)
   {
   }
 
@@ -115,10 +111,6 @@ class ShaderInput {
   ShaderNode *parent;
   ShaderOutput *link;
   int stack_offset; /* for SVM compiler */
-
-  /* Keeps track of whether a constant was folded in this socket, to avoid over-optimizing when the
-   * link is null. */
-  bool constant_folded_in;
 };
 
 /* Output

intern/cycles/render/image_vdb.cpp

@@ -16,10 +16,8 @@
 
 #include "render/image_vdb.h"
 
-#include "util/util_logging.h"
-#include "util/util_openvdb.h"
-
 #ifdef WITH_OPENVDB
+#  include <openvdb/openvdb.h>
 #  include <openvdb/tools/Dense.h>
 #endif
 #ifdef WITH_NANOVDB
@@ -28,57 +26,6 @@
 
 CCL_NAMESPACE_BEGIN
 
-#ifdef WITH_OPENVDB
-struct NumChannelsOp {
-  int num_channels = 0;
-
-  template<typename GridType, typename FloatGridType, typename FloatDataType, int channels>
-  bool operator()(const openvdb::GridBase::ConstPtr &)
-  {
-    num_channels = channels;
-    return true;
-  }
-};
-
-struct ToDenseOp {
-  openvdb::CoordBBox bbox;
-  void *pixels;
-
-  template<typename GridType, typename FloatGridType, typename FloatDataType, int channels>
-  bool operator()(const openvdb::GridBase::ConstPtr &grid)
-  {
-    openvdb::tools::Dense<FloatDataType, openvdb::tools::LayoutXYZ> dense(bbox,
-                                                                          (FloatDataType *)pixels);
-    openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<GridType>(grid), dense);
-    return true;
-  }
-};
-
-#  ifdef WITH_NANOVDB
-struct ToNanoOp {
-  nanovdb::GridHandle<> nanogrid;
-
-  template<typename GridType, typename FloatGridType, typename FloatDataType, int channels>
-  bool operator()(const openvdb::GridBase::ConstPtr &grid)
-  {
-    if constexpr (!std::is_same_v<GridType, openvdb::MaskGrid>) {
-      try {
-        nanogrid = nanovdb::openToNanoVDB(
-            FloatGridType(*openvdb::gridConstPtrCast<GridType>(grid)));
-      }
-      catch (const std::exception &e) {
-        VLOG(1) << "Error converting OpenVDB to NanoVDB grid: " << e.what();
-      }
-      return true;
-    }
-    else {
-      return false;
-    }
-  }
-};
-#  endif
-#endif
-
 VDBImageLoader::VDBImageLoader(const string &grid_name) : grid_name(grid_name)
 {
 }
@@ -94,40 +41,98 @@ bool VDBImageLoader::load_metadata(const ImageDeviceFeatures &features, ImageMet
     return false;
   }
 
-  /* Get number of channels from type. */
-  NumChannelsOp op;
-  if (!openvdb::grid_type_operation(grid, op)) {
-    return false;
-  }
-
-  metadata.channels = op.num_channels;
-
-  /* Set data type. */
-#  ifdef WITH_NANOVDB
-  if (features.has_nanovdb) {
-    /* NanoVDB expects no inactive leaf nodes. */
-    /*openvdb::FloatGrid &pruned_grid = *openvdb::gridPtrCast<openvdb::FloatGrid>(grid);
-    openvdb::tools::pruneInactive(pruned_grid.tree());
-    nanogrid = nanovdb::openToNanoVDB(pruned_grid);*/
-    ToNanoOp op;
-    if (!openvdb::grid_type_operation(grid, op)) {
-      return false;
-    }
-    nanogrid = std::move(op.nanogrid);
-  }
-#  endif
-
-  /* Set dimensions. */
   bbox = grid->evalActiveVoxelBoundingBox();
   if (bbox.empty()) {
     return false;
   }
 
+  /* Set dimensions. */
   openvdb::Coord dim = bbox.dim();
   metadata.width = dim.x();
   metadata.height = dim.y();
   metadata.depth = dim.z();
 
+  /* Set data type. */
+  if (grid->isType<openvdb::FloatGrid>()) {
+    metadata.channels = 1;
+#  ifdef WITH_NANOVDB
+    if (features.has_nanovdb) {
+      nanogrid = nanovdb::openToNanoVDB(*openvdb::gridConstPtrCast<openvdb::FloatGrid>(grid));
+    }
+#  endif
+  }
+  else if (grid->isType<openvdb::Vec3fGrid>()) {
+    metadata.channels = 3;
+#  ifdef WITH_NANOVDB
+    if (features.has_nanovdb) {
+      nanogrid = nanovdb::openToNanoVDB(*openvdb::gridConstPtrCast<openvdb::Vec3fGrid>(grid));
+    }
+#  endif
+  }
+  else if (grid->isType<openvdb::BoolGrid>()) {
+    metadata.channels = 1;
+#  ifdef WITH_NANOVDB
+    if (features.has_nanovdb) {
+      nanogrid = nanovdb::openToNanoVDB(
+          openvdb::FloatGrid(*openvdb::gridConstPtrCast<openvdb::BoolGrid>(grid)));
+    }
+#  endif
+  }
+  else if (grid->isType<openvdb::DoubleGrid>()) {
+    metadata.channels = 1;
+#  ifdef WITH_NANOVDB
+    if (features.has_nanovdb) {
+      nanogrid = nanovdb::openToNanoVDB(
+          openvdb::FloatGrid(*openvdb::gridConstPtrCast<openvdb::DoubleGrid>(grid)));
+    }
+#  endif
+  }
+  else if (grid->isType<openvdb::Int32Grid>()) {
+    metadata.channels = 1;
+#  ifdef WITH_NANOVDB
+    if (features.has_nanovdb) {
+      nanogrid = nanovdb::openToNanoVDB(
+          openvdb::FloatGrid(*openvdb::gridConstPtrCast<openvdb::Int32Grid>(grid)));
+    }
+#  endif
+  }
+  else if (grid->isType<openvdb::Int64Grid>()) {
+    metadata.channels = 1;
+#  ifdef WITH_NANOVDB
+    if (features.has_nanovdb) {
+      nanogrid = nanovdb::openToNanoVDB(
+          openvdb::FloatGrid(*openvdb::gridConstPtrCast<openvdb::Int64Grid>(grid)));
+    }
+#  endif
+  }
+  else if (grid->isType<openvdb::Vec3IGrid>()) {
+    metadata.channels = 3;
+#  ifdef WITH_NANOVDB
+    if (features.has_nanovdb) {
+      nanogrid = nanovdb::openToNanoVDB(
+          openvdb::Vec3fGrid(*openvdb::gridConstPtrCast<openvdb::Vec3IGrid>(grid)));
+    }
+#  endif
+  }
+  else if (grid->isType<openvdb::Vec3dGrid>()) {
+    metadata.channels = 3;
+#  ifdef WITH_NANOVDB
+    if (features.has_nanovdb) {
+      nanogrid = nanovdb::openToNanoVDB(
+          openvdb::Vec3fGrid(*openvdb::gridConstPtrCast<openvdb::Vec3dGrid>(grid)));
+    }
+#  endif
+  }
+  else if (grid->isType<openvdb::MaskGrid>()) {
+    metadata.channels = 1;
+#  ifdef WITH_NANOVDB
+    return false;  // Unsupported
+#  endif
+  }
+  else {
+    return false;
+  }
+
 #  ifdef WITH_NANOVDB
   if (nanogrid) {
     metadata.byte_size = nanogrid.size();
@@ -195,10 +200,45 @@ bool VDBImageLoader::load_pixels(const ImageMetaData &, void *pixels, const size
   else
 #  endif
   {
-    ToDenseOp op;
-    op.pixels = pixels;
-    op.bbox = bbox;
-    openvdb::grid_type_operation(grid, op);
+    if (grid->isType<openvdb::FloatGrid>()) {
+      openvdb::tools::Dense<float, openvdb::tools::LayoutXYZ> dense(bbox, (float *)pixels);
+      openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<openvdb::FloatGrid>(grid), dense);
+    }
+    else if (grid->isType<openvdb::Vec3fGrid>()) {
+      openvdb::tools::Dense<openvdb::Vec3f, openvdb::tools::LayoutXYZ> dense(
+          bbox, (openvdb::Vec3f *)pixels);
+      openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<openvdb::Vec3fGrid>(grid), dense);
+    }
+    else if (grid->isType<openvdb::BoolGrid>()) {
+      openvdb::tools::Dense<float, openvdb::tools::LayoutXYZ> dense(bbox, (float *)pixels);
+      openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<openvdb::BoolGrid>(grid), dense);
+    }
+    else if (grid->isType<openvdb::DoubleGrid>()) {
+      openvdb::tools::Dense<float, openvdb::tools::LayoutXYZ> dense(bbox, (float *)pixels);
+      openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<openvdb::DoubleGrid>(grid), dense);
+    }
+    else if (grid->isType<openvdb::Int32Grid>()) {
+      openvdb::tools::Dense<float, openvdb::tools::LayoutXYZ> dense(bbox, (float *)pixels);
+      openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<openvdb::Int32Grid>(grid), dense);
+    }
+    else if (grid->isType<openvdb::Int64Grid>()) {
+      openvdb::tools::Dense<float, openvdb::tools::LayoutXYZ> dense(bbox, (float *)pixels);
+      openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<openvdb::Int64Grid>(grid), dense);
+    }
+    else if (grid->isType<openvdb::Vec3IGrid>()) {
+      openvdb::tools::Dense<openvdb::Vec3f, openvdb::tools::LayoutXYZ> dense(
+          bbox, (openvdb::Vec3f *)pixels);
+      openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<openvdb::Vec3IGrid>(grid), dense);
+    }
+    else if (grid->isType<openvdb::Vec3dGrid>()) {
+      openvdb::tools::Dense<openvdb::Vec3f, openvdb::tools::LayoutXYZ> dense(
+          bbox, (openvdb::Vec3f *)pixels);
+      openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<openvdb::Vec3dGrid>(grid), dense);
+    }
+    else if (grid->isType<openvdb::MaskGrid>()) {
+      openvdb::tools::Dense<float, openvdb::tools::LayoutXYZ> dense(bbox, (float *)pixels);
+      openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<openvdb::MaskGrid>(grid), dense);
+    }
   }
   return true;
 #else

intern/cycles/render/object.cpp

@@ -93,8 +93,7 @@ NODE_DEFINE(Object)
   SOCKET_POINT(dupli_generated, "Dupli Generated", zero_float3());
   SOCKET_POINT2(dupli_uv, "Dupli UV", zero_float2());
   SOCKET_TRANSFORM_ARRAY(motion, "Motion", array<Transform>());
-  SOCKET_FLOAT(shadow_terminator_shading_offset, "Shadow Terminator Shading Offset", 0.0f);
-  SOCKET_FLOAT(shadow_terminator_geometry_offset, "Shadow Terminator Geometry Offset", 0.1f);
+  SOCKET_FLOAT(shadow_terminator_offset, "Terminator Offset", 0.0f);
   SOCKET_STRING(asset_name, "Asset Name", ustring());
 
   SOCKET_BOOLEAN(is_shadow_catcher, "Shadow Catcher", false);
@@ -508,9 +507,7 @@ void ObjectManager::device_update_object_transform(UpdateObjectTransformState *s
     kobject.cryptomatte_asset = util_hash_to_float(hash_asset);
   }
 
-  kobject.shadow_terminator_shading_offset = 1.0f /
-                                             (1.0f - 0.5f * ob->shadow_terminator_shading_offset);
-  kobject.shadow_terminator_geometry_offset = ob->shadow_terminator_geometry_offset;
+  kobject.shadow_terminator_offset = 1.0f / (1.0f - 0.5f * ob->shadow_terminator_offset);
 
   /* Object flag. */
   if (ob->use_holdout) {

intern/cycles/render/object.h

@@ -64,8 +64,7 @@ class Object : public Node {
   NODE_SOCKET_API(bool, hide_on_missing_motion)
   NODE_SOCKET_API(bool, use_holdout)
   NODE_SOCKET_API(bool, is_shadow_catcher)
-  NODE_SOCKET_API(float, shadow_terminator_shading_offset)
-  NODE_SOCKET_API(float, shadow_terminator_geometry_offset)
+  NODE_SOCKET_API(float, shadow_terminator_offset)
 
   NODE_SOCKET_API(float3, dupli_generated)
   NODE_SOCKET_API(float2, dupli_uv)

intern/cycles/render/osl.cpp

@@ -993,7 +993,7 @@ void OSLCompiler::parameter_array(const char *name, const float f[], int arrayle
 
 void OSLCompiler::parameter_color_array(const char *name, const array<float3> &f)
 {
-  /* NOTE: cycles float3 type is actually 4 floats! need to use an explicit array. */
+  /* NB: cycles float3 type is actually 4 floats! need to use an explicit array */
   array<float[3]> table(f.size());
 
   for (int i = 0; i < f.size(); ++i) {

intern/cycles/render/scene.h

@@ -209,7 +209,7 @@ class SceneParams {
 
   int curve_subdivisions()
   {
-    /* Matching the tessellation rate limit in Embree. */
+    /* Matching the tesselation rate limit in Embree. */
     return clamp(1 << hair_subdivisions, 1, 16);
   }
 };

intern/cycles/render/session.cpp

@@ -227,25 +227,66 @@ void Session::run_gpu()
   progress.set_render_start_time();
 
   while (!progress.get_cancel()) {
-    const bool no_tiles = !run_update_for_next_iteration();
+    /* advance to next tile */
+    bool no_tiles = !tile_manager.next();
 
+    DeviceKernelStatus kernel_state = DEVICE_KERNEL_UNKNOWN;
     if (no_tiles) {
-      if (params.background) {
-        /* if no work left and in background mode, we can stop immediately */
+      kernel_state = device->get_active_kernel_switch_state();
+    }
+
+    if (params.background) {
+      /* if no work left and in background mode, we can stop immediately */
+      if (no_tiles) {
         progress.set_status("Finished");
         break;
       }
     }
 
-    if (run_wait_for_work(no_tiles)) {
-      continue;
+    else if (no_tiles && kernel_state == DEVICE_KERNEL_FEATURE_KERNEL_AVAILABLE) {
+      reset_gpu(tile_manager.params, params.samples);
     }
 
-    if (progress.get_cancel()) {
-      break;
+    else {
+      /* if in interactive mode, and we are either paused or done for now,
+       * wait for pause condition notify to wake up again */
+      thread_scoped_lock pause_lock(pause_mutex);
+
+      if (!pause && !tile_manager.done()) {
+        /* reset could have happened after no_tiles was set, before this lock.
+         * in this case we shall not wait for pause condition
+         */
+      }
+      else if (pause || no_tiles) {
+        update_status_time(pause, no_tiles);
+
+        while (1) {
+          scoped_timer pause_timer;
+          pause_cond.wait(pause_lock);
+          if (pause) {
+            progress.add_skip_time(pause_timer, params.background);
+          }
+
+          update_status_time(pause, no_tiles);
+          progress.set_update();
+
+          if (!pause)
+            break;
+        }
+      }
+
+      if (progress.get_cancel())
+        break;
     }
 
     if (!no_tiles) {
+      /* update scene */
+      scoped_timer update_timer;
+      if (update_scene()) {
+        profiler.reset(scene->shaders.size(), scene->objects.size());
+      }
+      progress.add_skip_time(update_timer, params.background);
+
       if (!device->error_message().empty())
         progress.set_error(device->error_message());
 
@@ -688,27 +729,82 @@ void Session::run_cpu()
   last_update_time = time_dt();
   last_display_time = last_update_time;
 
+  {
+    /* reset once to start */
+    thread_scoped_lock reset_lock(delayed_reset.mutex);
+    thread_scoped_lock buffers_lock(buffers_mutex);
+    thread_scoped_lock display_lock(display_mutex);
+
+    reset_(delayed_reset.params, delayed_reset.samples);
+    delayed_reset.do_reset = false;
+  }
+
   while (!progress.get_cancel()) {
-    const bool no_tiles = !run_update_for_next_iteration();
+    /* advance to next tile */
+    bool no_tiles = !tile_manager.next();
     bool need_copy_to_display_buffer = false;
 
+    DeviceKernelStatus kernel_state = DEVICE_KERNEL_UNKNOWN;
     if (no_tiles) {
-      if (params.background) {
-        /* if no work left and in background mode, we can stop immediately */
+      kernel_state = device->get_active_kernel_switch_state();
+    }
+
+    if (params.background) {
+      /* if no work left and in background mode, we can stop immediately */
+      if (no_tiles) {
         progress.set_status("Finished");
         break;
       }
     }
 
-    if (run_wait_for_work(no_tiles)) {
-      continue;
+    else if (no_tiles && kernel_state == DEVICE_KERNEL_FEATURE_KERNEL_AVAILABLE) {
+      reset_cpu(tile_manager.params, params.samples);
     }
 
-    if (progress.get_cancel()) {
-      break;
+    else {
+      /* if in interactive mode, and we are either paused or done for now,
+       * wait for pause condition notify to wake up again */
+      thread_scoped_lock pause_lock(pause_mutex);
+
+      if (!pause && delayed_reset.do_reset) {
+        /* reset once to start */
+        thread_scoped_lock reset_lock(delayed_reset.mutex);
+        thread_scoped_lock buffers_lock(buffers_mutex);
+        thread_scoped_lock display_lock(display_mutex);
+
+        reset_(delayed_reset.params, delayed_reset.samples);
+        delayed_reset.do_reset = false;
+      }
+      else if (pause || no_tiles) {
+        update_status_time(pause, no_tiles);
+
+        while (1) {
+          scoped_timer pause_timer;
+          pause_cond.wait(pause_lock);
+          if (pause) {
+            progress.add_skip_time(pause_timer, params.background);
+          }
+
+          update_status_time(pause, no_tiles);
+          progress.set_update();
+
+          if (!pause)
+            break;
+        }
+      }
+
+      if (progress.get_cancel())
+        break;
     }
 
     if (!no_tiles) {
+      /* update scene */
+      scoped_timer update_timer;
+      if (update_scene()) {
+        profiler.reset(scene->shaders.size(), scene->objects.size());
+      }
+      progress.add_skip_time(update_timer, params.background);
+
       if (!device->error_message().empty())
         progress.set_error(device->error_message());
 
@@ -798,63 +894,6 @@ void Session::run()
     progress.set_update();
 }
 
-bool Session::run_update_for_next_iteration()
-{
-  thread_scoped_lock scene_lock(scene->mutex);
-  thread_scoped_lock reset_lock(delayed_reset.mutex);
-
-  if (delayed_reset.do_reset) {
-    thread_scoped_lock buffers_lock(buffers_mutex);
-    reset_(delayed_reset.params, delayed_reset.samples);
-    delayed_reset.do_reset = false;
-  }
-
-  const bool have_tiles = tile_manager.next();
-
-  if (have_tiles) {
-    scoped_timer update_timer;
-    if (update_scene()) {
-      profiler.reset(scene->shaders.size(), scene->objects.size());
-    }
-    progress.add_skip_time(update_timer, params.background);
-  }
-
-  return have_tiles;
-}
-
-bool Session::run_wait_for_work(bool no_tiles)
-{
-  /* In an offline rendering there is no pause, and no tiles will mean the job is fully done. */
-  if (params.background) {
-    return false;
-  }
-
-  thread_scoped_lock pause_lock(pause_mutex);
-
-  if (!pause && !no_tiles) {
-    return false;
-  }
-
-  update_status_time(pause, no_tiles);
-
-  while (true) {
-    scoped_timer pause_timer;
-    pause_cond.wait(pause_lock);
-    if (pause) {
-      progress.add_skip_time(pause_timer, params.background);
-    }
-
-    update_status_time(pause, no_tiles);
-    progress.set_update();
-
-    if (!pause) {
-      break;
-    }
-  }
-
-  return no_tiles;
-}
-
 bool Session::draw(BufferParams &buffer_params, DeviceDrawParams &draw_params)
 {
   if (device_use_gl)
@@ -973,6 +1012,8 @@ void Session::wait()
 
 bool Session::update_scene()
 {
+  thread_scoped_lock scene_lock(scene->mutex);
+
   /* update camera if dimensions changed for progressive render. the camera
    * knows nothing about progressive or cropped rendering, it just gets the
    * image dimensions passed in */

intern/cycles/render/session.h

@@ -178,9 +178,6 @@ class Session {
 
   void run();
 
-  bool run_update_for_next_iteration();
-  bool run_wait_for_work(bool no_tiles);
-
   void update_status_time(bool show_pause = false, bool show_done = false);
 
   void render(bool use_denoise);

intern/cycles/render/svm.cpp

@@ -304,7 +304,7 @@ int SVMCompiler::stack_assign(ShaderOutput *output)
 
 int SVMCompiler::stack_assign_if_linked(ShaderInput *input)
 {
-  if (input->link || input->constant_folded_in)
+  if (input->link)
     return stack_assign(input);
 
   return SVM_STACK_INVALID;

intern/cycles/util/util_math_fast.h

@@ -103,7 +103,7 @@ ccl_device float fast_sinf(float x)
    * 1.19209e-07 max error
    */
   int q = fast_rint(x * M_1_PI_F);
-  float qf = (float)q;
+  float qf = q;
   x = madd(qf, -0.78515625f * 4, x);
   x = madd(qf, -0.00024187564849853515625f * 4, x);
   x = madd(qf, -3.7747668102383613586e-08f * 4, x);
@@ -132,7 +132,7 @@ ccl_device float fast_cosf(float x)
 {
   /* Same argument reduction as fast_sinf(). */
   int q = fast_rint(x * M_1_PI_F);
-  float qf = (float)q;
+  float qf = q;
   x = madd(qf, -0.78515625f * 4, x);
   x = madd(qf, -0.00024187564849853515625f * 4, x);
   x = madd(qf, -3.7747668102383613586e-08f * 4, x);
@@ -160,7 +160,7 @@ ccl_device void fast_sincosf(float x, float *sine, float *cosine)
 {
   /* Same argument reduction as fast_sin. */
   int q = fast_rint(x * M_1_PI_F);
-  float qf = (float)q;
+  float qf = q;
   x = madd(qf, -0.78515625f * 4, x);
   x = madd(qf, -0.00024187564849853515625f * 4, x);
   x = madd(qf, -3.7747668102383613586e-08f * 4, x);
@@ -207,7 +207,7 @@ ccl_device float fast_tanf(float x)
    * we sometimes need to take the reciprocal of the polynomial
    */
   int q = fast_rint(x * 2.0f * M_1_PI_F);
-  float qf = (float)q;
+  float qf = q;
   x = madd(qf, -0.78515625f * 2, x);
   x = madd(qf, -0.00024187564849853515625f * 2, x);
   x = madd(qf, -3.7747668102383613586e-08f * 2, x);
@@ -243,7 +243,7 @@ ccl_device float fast_sinpif(float x)
   const float P = 3.584135056f; /* P = 16-4*Q */
   return y * (Q + P * fabsf(y));
 
-  /* The original article used inferior constants for Q and P and
+  /* The original article used used inferior constants for Q and P and
    * so had max error 1.091e-3.
    *
    * The optimal value for Q was determined by exhaustive search, minimizing
@@ -407,7 +407,7 @@ ccl_device float fast_logb(float x)
   x = fabsf(x);
   x = clamp(x, FLT_MIN, FLT_MAX);
   unsigned bits = __float_as_uint(x);
-  return (float)((int)(bits >> 23) - 127);
+  return (int)(bits >> 23) - 127;
 }
 
 ccl_device float fast_exp2f(float x)

intern/cycles/util/util_openvdb.h

@@ -25,42 +25,6 @@ namespace openvdb {
 using Vec4fTree = tree::Tree4<Vec4f, 5, 4, 3>::Type;
 using Vec4fGrid = Grid<Vec4fTree>;
 
-/* Apply operation to known grid types. */
-template<typename OpType>
-bool grid_type_operation(const openvdb::GridBase::ConstPtr &grid, OpType &&op)
-{
-  if (grid->isType<openvdb::FloatGrid>()) {
-    return op.template operator()<openvdb::FloatGrid, openvdb::FloatGrid, float, 1>(grid);
-  }
-  else if (grid->isType<openvdb::Vec3fGrid>()) {
-    return op.template operator()<openvdb::Vec3fGrid, openvdb::Vec3fGrid, openvdb::Vec3f, 3>(grid);
-  }
-  else if (grid->isType<openvdb::BoolGrid>()) {
-    return op.template operator()<openvdb::BoolGrid, openvdb::FloatGrid, float, 1>(grid);
-  }
-  else if (grid->isType<openvdb::DoubleGrid>()) {
-    return op.template operator()<openvdb::DoubleGrid, openvdb::FloatGrid, float, 1>(grid);
-  }
-  else if (grid->isType<openvdb::Int32Grid>()) {
-    return op.template operator()<openvdb::Int32Grid, openvdb::FloatGrid, float, 1>(grid);
-  }
-  else if (grid->isType<openvdb::Int64Grid>()) {
-    return op.template operator()<openvdb::Int64Grid, openvdb::FloatGrid, float, 1>(grid);
-  }
-  else if (grid->isType<openvdb::Vec3IGrid>()) {
-    return op.template operator()<openvdb::Vec3IGrid, openvdb::Vec3fGrid, openvdb::Vec3f, 3>(grid);
-  }
-  else if (grid->isType<openvdb::Vec3dGrid>()) {
-    return op.template operator()<openvdb::Vec3dGrid, openvdb::Vec3fGrid, openvdb::Vec3f, 3>(grid);
-  }
-  else if (grid->isType<openvdb::MaskGrid>()) {
-    return op.template operator()<openvdb::MaskGrid, openvdb::FloatGrid, float, 1>(grid);
-  }
-  else {
-    return false;
-  }
-}
-
 };  // namespace openvdb
 
 #endif

intern/cycles/util/util_task.h

@@ -68,7 +68,7 @@ class TaskPool {
 
   /* ** Statistics ** */
 
-  /* Time stamp of first task pushed. */
+  /* Time time stamp of first task pushed. */
   double start_time;
 
   /* Number of all tasks pushed to the pool. Cleared after wait_work() and cancel(). */

intern/ghost/CMakeLists.txt

@@ -155,9 +155,6 @@ if(WITH_HEADLESS OR WITH_GHOST_SDL)
   endif()
 
 elseif(APPLE AND NOT WITH_GHOST_X11)
-  if(WITH_INPUT_IME)
-    add_definitions(-DWITH_INPUT_IME)
-  endif()
   list(APPEND SRC
     intern/GHOST_DisplayManagerCocoa.mm
     intern/GHOST_SystemCocoa.mm
@@ -288,37 +285,16 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
       ${dbus_INCLUDE_DIRS}
     )
 
-    include(CheckSymbolExists)
-    set(CMAKE_REQUIRED_DEFINITIONS "-D_GNU_SOURCE")
-    check_symbol_exists(memfd_create "sys/mman.h" HAVE_MEMFD_CREATE)
-    if (HAVE_MEMFD_CREATE)
-      add_definitions(-DHAVE_MEMFD_CREATE)
-    endif()
-
     list(APPEND SRC
       intern/GHOST_SystemWayland.cpp
       intern/GHOST_WindowWayland.cpp
 
       intern/GHOST_SystemWayland.h
-      intern/GHOST_WaylandCursorSettings.h
       intern/GHOST_WindowWayland.h
     )
 
     pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner)
-
-    pkg_check_modules(wayland-protocols wayland-protocols>=1.15)
-    if (${wayland-protocols_FOUND})
-      pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
-    else()
-      find_path(WAYLAND_PROTOCOLS_DIR
-        NAMES unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
-        PATH_SUFFIXES share/wayland-protocols
-      )
-    endif()
-
-    if (NOT EXISTS ${WAYLAND_PROTOCOLS_DIR})
-      message(FATAL_ERROR "path to wayland-protocols not found")
-    endif()
+    pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
 
     # Generate protocols bindings.
     macro(generate_protocol_bindings NAME PROT_DEF)

intern/ghost/GHOST_C-api.h

@@ -96,7 +96,7 @@ extern GHOST_TSuccess GHOST_DisposeEventConsumer(GHOST_EventConsumerHandle consu
  * \param systemhandle: The handle to the system.
  * \return The number of milliseconds.
  */
-extern uint64_t GHOST_GetMilliSeconds(GHOST_SystemHandle systemhandle);
+extern GHOST_TUns64 GHOST_GetMilliSeconds(GHOST_SystemHandle systemhandle);
 
 /**
  * Installs a timer.
@@ -110,8 +110,8 @@ extern uint64_t GHOST_GetMilliSeconds(GHOST_SystemHandle systemhandle);
  * \return A timer task (0 if timer task installation failed).
  */
 extern GHOST_TimerTaskHandle GHOST_InstallTimer(GHOST_SystemHandle systemhandle,
-                                                uint64_t delay,
-                                                uint64_t interval,
+                                                GHOST_TUns64 delay,
+                                                GHOST_TUns64 interval,
                                                 GHOST_TimerProcPtr timerProc,
                                                 GHOST_TUserDataPtr userData);
 
@@ -133,7 +133,7 @@ extern GHOST_TSuccess GHOST_RemoveTimer(GHOST_SystemHandle systemhandle,
  * \param systemhandle: The handle to the system.
  * \return The number of displays.
  */
-extern uint8_t GHOST_GetNumDisplays(GHOST_SystemHandle systemhandle);
+extern GHOST_TUns8 GHOST_GetNumDisplays(GHOST_SystemHandle systemhandle);
 
 /**
  * Returns the dimensions of the main display on this system.
@@ -142,8 +142,8 @@ extern uint8_t GHOST_GetNumDisplays(GHOST_SystemHandle systemhandle);
  * \param height: A pointer the height gets put in.
  */
 extern void GHOST_GetMainDisplayDimensions(GHOST_SystemHandle systemhandle,
-                                           uint32_t *width,
-                                           uint32_t *height);
+                                           GHOST_TUns32 *width,
+                                           GHOST_TUns32 *height);
 
 /**
  * Returns the dimensions of all displays combine
@@ -154,8 +154,8 @@ extern void GHOST_GetMainDisplayDimensions(GHOST_SystemHandle systemhandle,
  * \param height: A pointer the height gets put in.
  */
 extern void GHOST_GetAllDisplayDimensions(GHOST_SystemHandle systemhandle,
-                                          uint32_t *width,
-                                          uint32_t *height);
+                                          GHOST_TUns32 *width,
+                                          GHOST_TUns32 *height);
 
 /**
  * Create a new window.
@@ -178,18 +178,18 @@ extern void GHOST_GetAllDisplayDimensions(GHOST_SystemHandle systemhandle,
 extern GHOST_WindowHandle GHOST_CreateWindow(GHOST_SystemHandle systemhandle,
                                              GHOST_WindowHandle parent_windowhandle,
                                              const char *title,
-                                             int32_t left,
-                                             int32_t top,
-                                             uint32_t width,
-                                             uint32_t height,
+                                             GHOST_TInt32 left,
+                                             GHOST_TInt32 top,
+                                             GHOST_TUns32 width,
+                                             GHOST_TUns32 height,
                                              GHOST_TWindowState state,
                                              bool is_dialog,
                                              GHOST_TDrawingContextType type,
                                              GHOST_GLSettings glSettings);
 
 /**
- * Create a new off-screen context.
- * Never explicitly delete the context, use #disposeContext() instead.
+ * Create a new offscreen context.
+ * Never explicitly delete the context, use disposeContext() instead.
  * \param systemhandle: The handle to the system.
  * \param platform_support_callback: An optional callback to check platform support.
  * \return A handle to the new context ( == NULL if creation failed).
@@ -360,13 +360,13 @@ extern GHOST_TSuccess GHOST_HasCursorShape(GHOST_WindowHandle windowhandle,
  * \return Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetCustomCursorShape(GHOST_WindowHandle windowhandle,
-                                                 uint8_t *bitmap,
-                                                 uint8_t *mask,
+                                                 GHOST_TUns8 *bitmap,
+                                                 GHOST_TUns8 *mask,
                                                  int sizex,
                                                  int sizey,
                                                  int hotX,
                                                  int hotY,
-                                                 bool canInvertColor);
+                                                 GHOST_TUns8 canInvertColor);
 
 /**
  * Returns the visibility state of the cursor.
@@ -391,8 +391,8 @@ extern GHOST_TSuccess GHOST_SetCursorVisibility(GHOST_WindowHandle windowhandle,
  * \return Indication of success.
  */
 extern GHOST_TSuccess GHOST_GetCursorPosition(GHOST_SystemHandle systemhandle,
-                                              int32_t *x,
-                                              int32_t *y);
+                                              GHOST_TInt32 *x,
+                                              GHOST_TInt32 *y);
 
 /**
  * Updates the location of the cursor (location in screen coordinates).
@@ -403,8 +403,8 @@ extern GHOST_TSuccess GHOST_GetCursorPosition(GHOST_SystemHandle systemhandle,
  * \return Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetCursorPosition(GHOST_SystemHandle systemhandle,
-                                              int32_t x,
-                                              int32_t y);
+                                              GHOST_TInt32 x,
+                                              GHOST_TInt32 y);
 
 /**
  * Grabs the cursor for a modal operation, to keep receiving
@@ -467,7 +467,7 @@ extern void GHOST_setNDOFDeadZone(float deadzone);
 /**
  * Tells if the ongoing drag'n'drop object can be accepted upon mouse drop
  */
-extern void GHOST_setAcceptDragOperation(GHOST_WindowHandle windowhandle, bool canAccept);
+extern void GHOST_setAcceptDragOperation(GHOST_WindowHandle windowhandle, GHOST_TInt8 canAccept);
 
 /**
  * Returns the event type.
@@ -481,7 +481,7 @@ extern GHOST_TEventType GHOST_GetEventType(GHOST_EventHandle eventhandle);
  * \param eventhandle: The handle to the event.
  * \return The event generation time.
  */
-extern uint64_t GHOST_GetEventTime(GHOST_EventHandle eventhandle);
+extern GHOST_TUns64 GHOST_GetEventTime(GHOST_EventHandle eventhandle);
 
 /**
  * Returns the window this event was generated on,
@@ -507,7 +507,7 @@ extern GHOST_TimerProcPtr GHOST_GetTimerProc(GHOST_TimerTaskHandle timertaskhand
 
 /**
  * Changes the timer callback.
- * \param timertaskhandle: The handle to the timer-task.
+ * \param timertaskhandle: The handle to the timertask.
  * \param timerProc: The timer callback.
  */
 extern void GHOST_SetTimerProc(GHOST_TimerTaskHandle timertaskhandle,
@@ -515,14 +515,14 @@ extern void GHOST_SetTimerProc(GHOST_TimerTaskHandle timertaskhandle,
 
 /**
  * Returns the timer user data.
- * \param timertaskhandle: The handle to the timer-task.
+ * \param timertaskhandle: The handle to the timertask.
  * \return The timer user data.
  */
 extern GHOST_TUserDataPtr GHOST_GetTimerTaskUserData(GHOST_TimerTaskHandle timertaskhandle);
 
 /**
  * Changes the time user data.
- * \param timertaskhandle: The handle to the timer-task.
+ * \param timertaskhandle: The handle to the timertask.
  * \param userdata: The timer user data.
  */
 extern void GHOST_SetTimerTaskUserData(GHOST_TimerTaskHandle timertaskhandle,
@@ -595,7 +595,7 @@ void GHOST_DisposeRectangle(GHOST_RectangleHandle rectanglehandle);
  * \param width: The new width of the client area of the window.
  * \return Indication of success.
  */
-extern GHOST_TSuccess GHOST_SetClientWidth(GHOST_WindowHandle windowhandle, uint32_t width);
+extern GHOST_TSuccess GHOST_SetClientWidth(GHOST_WindowHandle windowhandle, GHOST_TUns32 width);
 
 /**
  * Resizes client rectangle height.
@@ -603,7 +603,7 @@ extern GHOST_TSuccess GHOST_SetClientWidth(GHOST_WindowHandle windowhandle, uint
  * \param height: The new height of the client area of the window.
  * \return Indication of success.
  */
-extern GHOST_TSuccess GHOST_SetClientHeight(GHOST_WindowHandle windowhandle, uint32_t height);
+extern GHOST_TSuccess GHOST_SetClientHeight(GHOST_WindowHandle windowhandle, GHOST_TUns32 height);
 
 /**
  * Resizes client rectangle.
@@ -613,8 +613,8 @@ extern GHOST_TSuccess GHOST_SetClientHeight(GHOST_WindowHandle windowhandle, uin
  * \return Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetClientSize(GHOST_WindowHandle windowhandle,
-                                          uint32_t width,
-                                          uint32_t height);
+                                          GHOST_TUns32 width,
+                                          GHOST_TUns32 height);
 
 /**
  * Converts a point in screen coordinates to client rectangle coordinates
@@ -624,19 +624,25 @@ extern GHOST_TSuccess GHOST_SetClientSize(GHOST_WindowHandle windowhandle,
  * \param outX: The x-coordinate in the client rectangle.
  * \param outY: The y-coordinate in the client rectangle.
  */
-extern void GHOST_ScreenToClient(
-    GHOST_WindowHandle windowhandle, int32_t inX, int32_t inY, int32_t *outX, int32_t *outY);
+extern void GHOST_ScreenToClient(GHOST_WindowHandle windowhandle,
+                                 GHOST_TInt32 inX,
+                                 GHOST_TInt32 inY,
+                                 GHOST_TInt32 *outX,
+                                 GHOST_TInt32 *outY);
 
 /**
- * Converts a point in client rectangle coordinates to screen coordinates.
+ * Converts a point in screen coordinates to client rectangle coordinates
  * \param windowhandle: The handle to the window.
  * \param inX: The x-coordinate in the client rectangle.
  * \param inY: The y-coordinate in the client rectangle.
  * \param outX: The x-coordinate on the screen.
  * \param outY: The y-coordinate on the screen.
  */
-extern void GHOST_ClientToScreen(
-    GHOST_WindowHandle windowhandle, int32_t inX, int32_t inY, int32_t *outX, int32_t *outY);
+extern void GHOST_ClientToScreen(GHOST_WindowHandle windowhandle,
+                                 GHOST_TInt32 inX,
+                                 GHOST_TInt32 inY,
+                                 GHOST_TInt32 *outX,
+                                 GHOST_TInt32 *outY);
 
 /**
  * Returns the state of the window (normal, minimized, maximized).
@@ -661,7 +667,7 @@ extern GHOST_TSuccess GHOST_SetWindowState(GHOST_WindowHandle windowhandle,
  * \return Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetWindowModifiedState(GHOST_WindowHandle windowhandle,
-                                                   bool isUnsavedChanges);
+                                                   GHOST_TUns8 isUnsavedChanges);
 
 /**
  * Sets the order of the window (bottom, top).
@@ -752,14 +758,14 @@ extern void GHOST_SetTabletAPI(GHOST_SystemHandle systemhandle, GHOST_TTabletAPI
  * \param rectanglehandle: The handle to the rectangle.
  * \return width of the rectangle
  */
-extern int32_t GHOST_GetWidthRectangle(GHOST_RectangleHandle rectanglehandle);
+extern GHOST_TInt32 GHOST_GetWidthRectangle(GHOST_RectangleHandle rectanglehandle);
 
 /**
  * Access to rectangle height.
  * \param rectanglehandle: The handle to the rectangle.
  * \return height of the rectangle
  */
-extern int32_t GHOST_GetHeightRectangle(GHOST_RectangleHandle rectanglehandle);
+extern GHOST_TInt32 GHOST_GetHeightRectangle(GHOST_RectangleHandle rectanglehandle);
 
 /**
  * Gets all members of the rectangle.
@@ -769,8 +775,11 @@ extern int32_t GHOST_GetHeightRectangle(GHOST_RectangleHandle rectanglehandle);
  * \param r: Pointer to return right coordinate in.
  * \param b: Pointer to return bottom coordinate in.
  */
-extern void GHOST_GetRectangle(
-    GHOST_RectangleHandle rectanglehandle, int32_t *l, int32_t *t, int32_t *r, int32_t *b);
+extern void GHOST_GetRectangle(GHOST_RectangleHandle rectanglehandle,
+                               GHOST_TInt32 *l,
+                               GHOST_TInt32 *t,
+                               GHOST_TInt32 *r,
+                               GHOST_TInt32 *b);
 
 /**
  * Sets all members of the rectangle.
@@ -780,8 +789,11 @@ extern void GHOST_GetRectangle(
  * \param r: requested right coordinate of the rectangle.
  * \param b: requested bottom coordinate of the rectangle.
  */
-extern void GHOST_SetRectangle(
-    GHOST_RectangleHandle rectanglehandle, int32_t l, int32_t t, int32_t r, int32_t b);
+extern void GHOST_SetRectangle(GHOST_RectangleHandle rectanglehandle,
+                               GHOST_TInt32 l,
+                               GHOST_TInt32 t,
+                               GHOST_TInt32 r,
+                               GHOST_TInt32 b);
 
 /**
  * Returns whether this rectangle is empty.
@@ -806,7 +818,7 @@ extern GHOST_TSuccess GHOST_IsValidRectangle(GHOST_RectangleHandle rectanglehand
  * \param rectanglehandle: The handle to the rectangle.
  * \param i: The amount of offset given to each extreme (negative values shrink the rectangle).
  */
-extern void GHOST_InsetRectangle(GHOST_RectangleHandle rectanglehandle, int32_t i);
+extern void GHOST_InsetRectangle(GHOST_RectangleHandle rectanglehandle, GHOST_TInt32 i);
 
 /**
  * Does a union of the rectangle given and this rectangle.
@@ -823,7 +835,9 @@ extern void GHOST_UnionRectangle(GHOST_RectangleHandle rectanglehandle,
  * \param x: The x-coordinate of the point.
  * \param y: The y-coordinate of the point.
  */
-extern void GHOST_UnionPointRectangle(GHOST_RectangleHandle rectanglehandle, int32_t x, int32_t y);
+extern void GHOST_UnionPointRectangle(GHOST_RectangleHandle rectanglehandle,
+                                      GHOST_TInt32 x,
+                                      GHOST_TInt32 y);
 
 /**
  * Returns whether the point is inside this rectangle.
@@ -834,8 +848,8 @@ extern void GHOST_UnionPointRectangle(GHOST_RectangleHandle rectanglehandle, int
  * \return Success value (true if point is inside).
  */
 extern GHOST_TSuccess GHOST_IsInsideRectangle(GHOST_RectangleHandle rectanglehandle,
-                                              int32_t x,
-                                              int32_t y);
+                                              GHOST_TInt32 x,
+                                              GHOST_TInt32 y);
 
 /**
  * Returns whether the rectangle is inside this rectangle.
@@ -854,8 +868,8 @@ extern GHOST_TVisibility GHOST_GetRectangleVisibility(
  * \param cy: Requested center y-coordinate of the rectangle.
  */
 extern void GHOST_SetCenterRectangle(GHOST_RectangleHandle rectanglehandle,
-                                     int32_t cx,
-                                     int32_t cy);
+                                     GHOST_TInt32 cx,
+                                     GHOST_TInt32 cy);
 
 /**
  * Sets rectangle members.
@@ -867,8 +881,11 @@ extern void GHOST_SetCenterRectangle(GHOST_RectangleHandle rectanglehandle,
  * \param w: requested width of the rectangle.
  * \param h: requested height of the rectangle.
  */
-extern void GHOST_SetRectangleCenter(
-    GHOST_RectangleHandle rectanglehandle, int32_t cx, int32_t cy, int32_t w, int32_t h);
+extern void GHOST_SetRectangleCenter(GHOST_RectangleHandle rectanglehandle,
+                                     GHOST_TInt32 cx,
+                                     GHOST_TInt32 cy,
+                                     GHOST_TInt32 w,
+                                     GHOST_TInt32 h);
 
 /**
  * Clips a rectangle.
@@ -886,14 +903,14 @@ extern GHOST_TSuccess GHOST_ClipRectangle(GHOST_RectangleHandle rectanglehandle,
  * \param selection: Boolean to return the selection instead, X11 only feature.
  * \return clipboard data
  */
-extern char *GHOST_getClipboard(bool selection);
+extern GHOST_TUns8 *GHOST_getClipboard(int selection);
 
 /**
  * Put data to the Clipboard
  * \param buffer: the string buffer to set.
  * \param selection: Set the selection instead, X11 only feature.
  */
-extern void GHOST_putClipboard(const char *buffer, bool selection);
+extern void GHOST_putClipboard(GHOST_TInt8 *buffer, int selection);
 
 /**
  * Toggles console
@@ -925,7 +942,7 @@ extern float GHOST_GetNativePixelSize(GHOST_WindowHandle windowhandle);
 /**
  * Returns the suggested DPI for this window.
  */
-extern uint16_t GHOST_GetDPIHint(GHOST_WindowHandle windowhandle);
+extern GHOST_TUns16 GHOST_GetDPIHint(GHOST_WindowHandle windowhandle);
 
 /**
  * Enable IME attached to the given window, i.e. allows user-input
@@ -939,8 +956,12 @@ extern uint16_t GHOST_GetDPIHint(GHOST_WindowHandle windowhandle);
  * - true:  Start a new composition.
  * - false: Move the IME windows to the given position without finishing it.
  */
-extern void GHOST_BeginIME(
-    GHOST_WindowHandle windowhandle, int32_t x, int32_t y, int32_t w, int32_t h, bool complete);
+extern void GHOST_BeginIME(GHOST_WindowHandle windowhandle,
+                           GHOST_TInt32 x,
+                           GHOST_TInt32 y,
+                           GHOST_TInt32 w,
+                           GHOST_TInt32 h,
+                           int complete);
 /**
  * Disable the IME attached to the given window, i.e. prohibits any user-input
  * events from being dispatched to the IME.
@@ -1055,7 +1076,7 @@ void GHOST_XrDestroyActionSet(GHOST_XrContextHandle xr_context, const char *acti
  */
 int GHOST_XrCreateActions(GHOST_XrContextHandle xr_context,
                           const char *action_set_name,
-                          uint32_t count,
+                          GHOST_TUns32 count,
                           const GHOST_XrActionInfo *infos);
 
 /**
@@ -1063,7 +1084,7 @@ int GHOST_XrCreateActions(GHOST_XrContextHandle xr_context,
  */
 void GHOST_XrDestroyActions(GHOST_XrContextHandle xr_context,
                             const char *action_set_name,
-                            uint32_t count,
+                            GHOST_TUns32 count,
                             const char *const *action_names);
 
 /**
@@ -1071,7 +1092,7 @@ void GHOST_XrDestroyActions(GHOST_XrContextHandle xr_context,
  */
 int GHOST_XrCreateActionSpaces(GHOST_XrContextHandle xr_context,
                                const char *action_set_name,
-                               uint32_t count,
+                               GHOST_TUns32 count,
                                const GHOST_XrActionSpaceInfo *infos);
 
 /**
@@ -1079,7 +1100,7 @@ int GHOST_XrCreateActionSpaces(GHOST_XrContextHandle xr_context,
  */
 void GHOST_XrDestroyActionSpaces(GHOST_XrContextHandle xr_context,
                                  const char *action_set_name,
-                                 uint32_t count,
+                                 GHOST_TUns32 count,
                                  const GHOST_XrActionSpaceInfo *infos);
 
 /**
@@ -1087,7 +1108,7 @@ void GHOST_XrDestroyActionSpaces(GHOST_XrContextHandle xr_context,
  */
 int GHOST_XrCreateActionBindings(GHOST_XrContextHandle xr_context,
                                  const char *action_set_name,
-                                 uint32_t count,
+                                 GHOST_TUns32 count,
                                  const GHOST_XrActionProfileInfo *infos);
 
 /**
@@ -1095,7 +1116,7 @@ int GHOST_XrCreateActionBindings(GHOST_XrContextHandle xr_context,
  */
 void GHOST_XrDestroyActionBindings(GHOST_XrContextHandle xr_context,
                                    const char *action_set_name,
-                                   uint32_t count,
+                                   GHOST_TUns32 count,
                                    const GHOST_XrActionProfileInfo *infos);
 
 /**
@@ -1117,7 +1138,7 @@ int GHOST_XrSyncActions(GHOST_XrContextHandle xr_context, const char *action_set
 int GHOST_XrApplyHapticAction(GHOST_XrContextHandle xr_context,
                               const char *action_set_name,
                               const char *action_name,
-                              const int64_t *duration,
+                              const GHOST_TInt64 *duration,
                               const float *frequency,
                               const float *amplitude);
 

intern/ghost/GHOST_IContext.h

@@ -29,8 +29,8 @@
 /**
  * Interface for GHOST context.
  *
- * You can create a off-screen context (windowless) with the system's
- * #GHOST_ISystem::createOffscreenContext method.
+ * You can create a offscreen context (windowless) with the system's
+ * GHOST_ISystem::createOffscreenContext method.
  * \see GHOST_ISystem#createOffscreenContext
  */
 class GHOST_IContext {

intern/ghost/GHOST_IEvent.h

@@ -58,7 +58,7 @@ class GHOST_IEvent {
    * Returns the time this event was generated.
    * \return The event generation time.
    */
-  virtual uint64_t getTime() = 0;
+  virtual GHOST_TUns64 getTime() = 0;
 
   /**
    * Returns the window this event was generated on,

intern/ghost/GHOST_ISystem.h

@@ -177,7 +177,7 @@ class GHOST_ISystem {
    * Based on ANSI clock() routine.
    * \return The number of milliseconds.
    */
-  virtual uint64_t getMilliSeconds() const = 0;
+  virtual GHOST_TUns64 getMilliSeconds() const = 0;
 
   /**
    * Installs a timer.
@@ -189,8 +189,8 @@ class GHOST_ISystem {
    * \param userData: Placeholder for user data.
    * \return A timer task (0 if timer task installation failed).
    */
-  virtual GHOST_ITimerTask *installTimer(uint64_t delay,
-                                         uint64_t interval,
+  virtual GHOST_ITimerTask *installTimer(GHOST_TUns64 delay,
+                                         GHOST_TUns64 interval,
                                          GHOST_TimerProcPtr timerProc,
                                          GHOST_TUserDataPtr userData = NULL) = 0;
 
@@ -209,19 +209,19 @@ class GHOST_ISystem {
    * Returns the number of displays on this system.
    * \return The number of displays.
    */
-  virtual uint8_t getNumDisplays() const = 0;
+  virtual GHOST_TUns8 getNumDisplays() const = 0;
 
   /**
    * Returns the dimensions of the main display on this system.
    * \return The dimension of the main display.
    */
-  virtual void getMainDisplayDimensions(uint32_t &width, uint32_t &height) const = 0;
+  virtual void getMainDisplayDimensions(GHOST_TUns32 &width, GHOST_TUns32 &height) const = 0;
 
   /**
    * Returns the combine dimensions of all monitors.
    * \return The dimension of the workspace.
    */
-  virtual void getAllDisplayDimensions(uint32_t &width, uint32_t &height) const = 0;
+  virtual void getAllDisplayDimensions(GHOST_TUns32 &width, GHOST_TUns32 &height) const = 0;
 
   /**
    * Create a new window.
@@ -242,10 +242,10 @@ class GHOST_ISystem {
    * \return The new window (or 0 if creation failed).
    */
   virtual GHOST_IWindow *createWindow(const char *title,
-                                      int32_t left,
-                                      int32_t top,
-                                      uint32_t width,
-                                      uint32_t height,
+                                      GHOST_TInt32 left,
+                                      GHOST_TInt32 top,
+                                      GHOST_TUns32 width,
+                                      GHOST_TUns32 height,
                                       GHOST_TWindowState state,
                                       GHOST_TDrawingContextType type,
                                       GHOST_GLSettings glSettings,
@@ -261,8 +261,8 @@ class GHOST_ISystem {
   virtual GHOST_TSuccess disposeWindow(GHOST_IWindow *window) = 0;
 
   /**
-   * Create a new off-screen context.
-   * Never explicitly delete the context, use #disposeContext() instead.
+   * Create a new offscreen context.
+   * Never explicitly delete the context, use disposeContext() instead.
    * \return The new context (or 0 if creation failed).
    */
   virtual GHOST_IContext *createOffscreenContext(GHOST_GLSettings glSettings) = 0;
@@ -365,7 +365,7 @@ class GHOST_ISystem {
    * \param y: The y-coordinate of the cursor.
    * \return Indication of success.
    */
-  virtual GHOST_TSuccess getCursorPosition(int32_t &x, int32_t &y) const = 0;
+  virtual GHOST_TSuccess getCursorPosition(GHOST_TInt32 &x, GHOST_TInt32 &y) const = 0;
 
   /**
    * Updates the location of the cursor (location in screen coordinates).
@@ -374,7 +374,7 @@ class GHOST_ISystem {
    * \param y: The y-coordinate of the cursor.
    * \return Indication of success.
    */
-  virtual GHOST_TSuccess setCursorPosition(int32_t x, int32_t y) = 0;
+  virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) = 0;
 
   /***************************************************************************************
    * Access to mouse button and keyboard states.
@@ -431,12 +431,12 @@ class GHOST_ISystem {
    * \return "unsigned char" from X11 XA_CUT_BUFFER0 buffer
    *
    */
-  virtual char *getClipboard(bool selection) const = 0;
+  virtual GHOST_TUns8 *getClipboard(bool selection) const = 0;
 
   /**
    * Put data to the Clipboard
    */
-  virtual void putClipboard(const char *buffer, bool selection) const = 0;
+  virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const = 0;
 
   /***************************************************************************************
    * System Message Box.

intern/ghost/GHOST_ISystemPaths.h

@@ -68,26 +68,26 @@ class GHOST_ISystemPaths {
    * "unpack and run" path, then look for properly installed path, including versioning.
    * \return Unsigned char string pointing to system dir (eg /usr/share/blender/).
    */
-  virtual const char *getSystemDir(int version, const char *versionstr) const = 0;
+  virtual const GHOST_TUns8 *getSystemDir(int version, const char *versionstr) const = 0;
 
   /**
    * Determine the base dir in which user configuration is stored, including versioning.
    * If needed, it will create the base directory.
    * \return Unsigned char string pointing to user dir (eg ~/.blender/).
    */
-  virtual const char *getUserDir(int version, const char *versionstr) const = 0;
+  virtual const GHOST_TUns8 *getUserDir(int version, const char *versionstr) const = 0;
 
   /**
    * Determine a special ("well known") and easy to reach user directory.
    * \return Unsigned char string pointing to user dir (eg `~/Documents/`).
    */
-  virtual const char *getUserSpecialDir(GHOST_TUserSpecialDirTypes type) const = 0;
+  virtual const GHOST_TUns8 *getUserSpecialDir(GHOST_TUserSpecialDirTypes type) const = 0;
 
   /**
    * Determine the directory of the current binary
    * \return Unsigned char string pointing to the binary dir
    */
-  virtual const char *getBinaryDir() const = 0;
+  virtual const GHOST_TUns8 *getBinaryDir() const = 0;
 
   /**
    * Add the file to the operating system most recently used files

intern/ghost/GHOST_IWindow.h

@@ -108,20 +108,20 @@ class GHOST_IWindow {
    * Resizes client rectangle width.
    * \param width: The new width of the client area of the window.
    */
-  virtual GHOST_TSuccess setClientWidth(uint32_t width) = 0;
+  virtual GHOST_TSuccess setClientWidth(GHOST_TUns32 width) = 0;
 
   /**
    * Resizes client rectangle height.
    * \param height: The new height of the client area of the window.
    */
-  virtual GHOST_TSuccess setClientHeight(uint32_t height) = 0;
+  virtual GHOST_TSuccess setClientHeight(GHOST_TUns32 height) = 0;
 
   /**
    * Resizes client rectangle.
    * \param width: The new width of the client area of the window.
    * \param height: The new height of the client area of the window.
    */
-  virtual GHOST_TSuccess setClientSize(uint32_t width, uint32_t height) = 0;
+  virtual GHOST_TSuccess setClientSize(GHOST_TUns32 width, GHOST_TUns32 height) = 0;
 
   /**
    * Converts a point in screen coordinates to client rectangle coordinates
@@ -130,16 +130,22 @@ class GHOST_IWindow {
    * \param outX: The x-coordinate in the client rectangle.
    * \param outY: The y-coordinate in the client rectangle.
    */
-  virtual void screenToClient(int32_t inX, int32_t inY, int32_t &outX, int32_t &outY) const = 0;
+  virtual void screenToClient(GHOST_TInt32 inX,
+                              GHOST_TInt32 inY,
+                              GHOST_TInt32 &outX,
+                              GHOST_TInt32 &outY) const = 0;
 
   /**
-   * Converts a point in client rectangle coordinates to screen coordinates.
+   * Converts a point in screen coordinates to client rectangle coordinates
    * \param inX: The x-coordinate in the client rectangle.
    * \param inY: The y-coordinate in the client rectangle.
    * \param outX: The x-coordinate on the screen.
    * \param outY: The y-coordinate on the screen.
    */
-  virtual void clientToScreen(int32_t inX, int32_t inY, int32_t &outX, int32_t &outY) const = 0;
+  virtual void clientToScreen(GHOST_TInt32 inX,
+                              GHOST_TInt32 inY,
+                              GHOST_TInt32 &outX,
+                              GHOST_TInt32 &outY) const = 0;
 
   /**
    * Tells if the ongoing drag'n'drop object can be accepted upon mouse drop
@@ -284,8 +290,8 @@ class GHOST_IWindow {
    * \param hotY: The Y coordinate of the cursor hot-spot.
    * \return Indication of success.
    */
-  virtual GHOST_TSuccess setCustomCursorShape(uint8_t *bitmap,
-                                              uint8_t *mask,
+  virtual GHOST_TSuccess setCustomCursorShape(GHOST_TUns8 *bitmap,
+                                              GHOST_TUns8 *mask,
                                               int sizex,
                                               int sizey,
                                               int hotX,
@@ -313,7 +319,7 @@ class GHOST_IWindow {
   virtual GHOST_TSuccess setCursorGrab(GHOST_TGrabCursorMode /*mode*/,
                                        GHOST_TAxisFlag /*wrap_axis*/,
                                        GHOST_Rect * /*bounds*/,
-                                       int32_t /*mouse_ungrab_xy*/[2])
+                                       GHOST_TInt32 /*mouse_ungrab_xy*/[2])
   {
     return GHOST_kSuccess;
   }
@@ -328,7 +334,7 @@ class GHOST_IWindow {
    * Returns the recommended DPI for this window.
    * \return The recommended DPI for this window.
    */
-  virtual uint16_t getDPIHint() = 0;
+  virtual GHOST_TUns16 getDPIHint() = 0;
 
 #ifdef WITH_INPUT_IME
   /**
@@ -342,7 +348,8 @@ class GHOST_IWindow {
    * - true:  Start a new composition
    * - false: Move the IME windows to the given position without finishing it.
    */
-  virtual void beginIME(int32_t x, int32_t y, int32_t w, int32_t h, bool completed) = 0;
+  virtual void beginIME(
+      GHOST_TInt32 x, GHOST_TInt32 y, GHOST_TInt32 w, GHOST_TInt32 h, int completed) = 0;
 
   /**
    * Disable the IME attached to the given window, i.e. prohibits any user-input

intern/ghost/GHOST_Path-api.h

@@ -48,25 +48,25 @@ extern GHOST_TSuccess GHOST_DisposeSystemPaths(void);
  * "unpack and run" path, then look for properly installed path, including versioning.
  * \return Unsigned char string pointing to system dir (eg /usr/share/blender/).
  */
-extern const char *GHOST_getSystemDir(int version, const char *versionstr);
+extern const GHOST_TUns8 *GHOST_getSystemDir(int version, const char *versionstr);
 
 /**
  * Determine the base dir in which user configuration is stored, including versioning.
  * \return Unsigned char string pointing to user dir (eg ~).
  */
-extern const char *GHOST_getUserDir(int version, const char *versionstr);
+extern const GHOST_TUns8 *GHOST_getUserDir(int version, const char *versionstr);
 
 /**
  * Determine a special ("well known") and easy to reach user directory.
  * \return Unsigned char string pointing to user dir (eg `~/Documents/`).
  */
-extern const char *GHOST_getUserSpecialDir(GHOST_TUserSpecialDirTypes type);
+extern const GHOST_TUns8 *GHOST_getUserSpecialDir(GHOST_TUserSpecialDirTypes type);
 
 /**
  * Determine the dir in which the binary file is found.
  * \return Unsigned char string pointing to binary dir (eg ~/usr/local/bin/).
  */
-extern const char *GHOST_getBinaryDir(void);
+extern const GHOST_TUns8 *GHOST_getBinaryDir(void);
 
 /**
  * Add the file to the operating system most recently used files

intern/ghost/GHOST_Rect.h

@@ -42,7 +42,7 @@ class GHOST_Rect {
    * \param r: requested right coordinate of the rectangle.
    * \param b: requested bottom coordinate of the rectangle.
    */
-  GHOST_Rect(int32_t l = 0, int32_t t = 0, int32_t r = 0, int32_t b = 0)
+  GHOST_Rect(GHOST_TInt32 l = 0, GHOST_TInt32 t = 0, GHOST_TInt32 r = 0, GHOST_TInt32 b = 0)
       : m_l(l), m_t(t), m_r(r), m_b(b)
   {
   }
@@ -58,13 +58,13 @@ class GHOST_Rect {
    * Access to rectangle width.
    * \return width of the rectangle.
    */
-  virtual inline int32_t getWidth() const;
+  virtual inline GHOST_TInt32 getWidth() const;
 
   /**
    * Access to rectangle height.
    * \return height of the rectangle.
    */
-  virtual inline int32_t getHeight() const;
+  virtual inline GHOST_TInt32 getHeight() const;
 
   /**
    * Sets all members of the rectangle.
@@ -73,7 +73,7 @@ class GHOST_Rect {
    * \param r: requested right coordinate of the rectangle.
    * \param b: requested bottom coordinate of the rectangle.
    */
-  virtual inline void set(int32_t l, int32_t t, int32_t r, int32_t b);
+  virtual inline void set(GHOST_TInt32 l, GHOST_TInt32 t, GHOST_TInt32 r, GHOST_TInt32 b);
 
   /**
    * Returns whether this rectangle is empty.
@@ -95,7 +95,7 @@ class GHOST_Rect {
    * The method avoids negative insets making the rectangle invalid
    * \param i: The amount of offset given to each extreme (negative values shrink the rectangle).
    */
-  virtual void inset(int32_t i);
+  virtual void inset(GHOST_TInt32 i);
 
   /**
    * Does a union of the rectangle given and this rectangle.
@@ -109,14 +109,17 @@ class GHOST_Rect {
    * \param x: The x-coordinate of the point.
    * \param y: The y-coordinate of the point.
    */
-  virtual inline void unionPoint(int32_t x, int32_t y);
+  virtual inline void unionPoint(GHOST_TInt32 x, GHOST_TInt32 y);
 
   /**
    * Grows the rectangle to included a point.
    * \param x: The x-coordinate of the point.
    * \param y: The y-coordinate of the point.
    */
-  virtual inline void wrapPoint(int32_t &x, int32_t &y, int32_t ofs, GHOST_TAxisFlag axis);
+  virtual inline void wrapPoint(GHOST_TInt32 &x,
+                                GHOST_TInt32 &y,
+                                GHOST_TInt32 ofs,
+                                GHOST_TAxisFlag axis);
 
   /**
    * Returns whether the point is inside this rectangle.
@@ -125,7 +128,7 @@ class GHOST_Rect {
    * \param y: y-coordinate of point to test.
    * \return boolean value (true if point is inside).
    */
-  virtual inline bool isInside(int32_t x, int32_t y) const;
+  virtual inline bool isInside(GHOST_TInt32 x, GHOST_TInt32 y) const;
 
   /**
    * Returns whether the rectangle is inside this rectangle.
@@ -140,7 +143,7 @@ class GHOST_Rect {
    * \param cx: requested center x-coordinate of the rectangle.
    * \param cy: requested center y-coordinate of the rectangle.
    */
-  virtual void setCenter(int32_t cx, int32_t cy);
+  virtual void setCenter(GHOST_TInt32 cx, GHOST_TInt32 cy);
 
   /**
    * Sets rectangle members.
@@ -151,7 +154,7 @@ class GHOST_Rect {
    * \param w: requested width of the rectangle.
    * \param h: requested height of the rectangle.
    */
-  virtual void setCenter(int32_t cx, int32_t cy, int32_t w, int32_t h);
+  virtual void setCenter(GHOST_TInt32 cx, GHOST_TInt32 cy, GHOST_TInt32 w, GHOST_TInt32 h);
 
   /**
    * Clips a rectangle.
@@ -163,30 +166,30 @@ class GHOST_Rect {
   virtual bool clip(GHOST_Rect &r) const;
 
   /** Left coordinate of the rectangle */
-  int32_t m_l;
+  GHOST_TInt32 m_l;
   /** Top coordinate of the rectangle */
-  int32_t m_t;
+  GHOST_TInt32 m_t;
   /** Right coordinate of the rectangle */
-  int32_t m_r;
+  GHOST_TInt32 m_r;
   /** Bottom coordinate of the rectangle */
-  int32_t m_b;
+  GHOST_TInt32 m_b;
 
 #ifdef WITH_CXX_GUARDEDALLOC
   MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_Rect")
 #endif
 };
 
-inline int32_t GHOST_Rect::getWidth() const
+inline GHOST_TInt32 GHOST_Rect::getWidth() const
 {
   return m_r - m_l;
 }
 
-inline int32_t GHOST_Rect::getHeight() const
+inline GHOST_TInt32 GHOST_Rect::getHeight() const
 {
   return m_b - m_t;
 }
 
-inline void GHOST_Rect::set(int32_t l, int32_t t, int32_t r, int32_t b)
+inline void GHOST_Rect::set(GHOST_TInt32 l, GHOST_TInt32 t, GHOST_TInt32 r, GHOST_TInt32 b)
 {
   m_l = l;
   m_t = t;
@@ -216,7 +219,7 @@ inline void GHOST_Rect::unionRect(const GHOST_Rect &r)
     m_b = r.m_b;
 }
 
-inline void GHOST_Rect::unionPoint(int32_t x, int32_t y)
+inline void GHOST_Rect::unionPoint(GHOST_TInt32 x, GHOST_TInt32 y)
 {
   if (x < m_l)
     m_l = x;
@@ -228,10 +231,13 @@ inline void GHOST_Rect::unionPoint(int32_t x, int32_t y)
     m_b = y;
 }
 
-inline void GHOST_Rect::wrapPoint(int32_t &x, int32_t &y, int32_t ofs, GHOST_TAxisFlag axis)
+inline void GHOST_Rect::wrapPoint(GHOST_TInt32 &x,
+                                  GHOST_TInt32 &y,
+                                  GHOST_TInt32 ofs,
+                                  GHOST_TAxisFlag axis)
 {
-  int32_t w = getWidth();
-  int32_t h = getHeight();
+  GHOST_TInt32 w = getWidth();
+  GHOST_TInt32 h = getHeight();
 
   /* highly unlikely but avoid eternal loop */
   if (w - ofs * 2 <= 0 || h - ofs * 2 <= 0) {
@@ -252,7 +258,7 @@ inline void GHOST_Rect::wrapPoint(int32_t &x, int32_t &y, int32_t ofs, GHOST_TAx
   }
 }
 
-inline bool GHOST_Rect::isInside(int32_t x, int32_t y) const
+inline bool GHOST_Rect::isInside(GHOST_TInt32 x, GHOST_TInt32 y) const
 {
   return (x >= m_l) && (x <= m_r) && (y >= m_t) && (y <= m_b);
 }

intern/ghost/GHOST_Types.h

@@ -23,8 +23,6 @@
 
 #pragma once
 
-#include <stdint.h>
-
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
@@ -58,6 +56,13 @@ GHOST_DECLARE_HANDLE(GHOST_EventConsumerHandle);
 GHOST_DECLARE_HANDLE(GHOST_ContextHandle);
 GHOST_DECLARE_HANDLE(GHOST_XrContextHandle);
 
+typedef char GHOST_TInt8;
+typedef unsigned char GHOST_TUns8;
+typedef short GHOST_TInt16;
+typedef unsigned short GHOST_TUns16;
+typedef int GHOST_TInt32;
+typedef unsigned int GHOST_TUns32;
+
 typedef struct {
   int flags;
 } GHOST_GLSettings;
@@ -73,6 +78,14 @@ typedef enum GHOST_DialogOptions {
   GHOST_DialogError = (1 << 1),
 } GHOST_DialogOptions;
 
+#ifdef _MSC_VER
+typedef __int64 GHOST_TInt64;
+typedef unsigned __int64 GHOST_TUns64;
+#else
+typedef long long GHOST_TInt64;
+typedef unsigned long long GHOST_TUns64;
+#endif
+
 typedef void *GHOST_TUserDataPtr;
 
 typedef enum { GHOST_kFailure = 0, GHOST_kSuccess } GHOST_TSuccess;
@@ -423,9 +436,9 @@ typedef void *GHOST_TEventDataPtr;
 
 typedef struct {
   /** The x-coordinate of the cursor position. */
-  int32_t x;
+  GHOST_TInt32 x;
   /** The y-coordinate of the cursor position. */
-  int32_t y;
+  GHOST_TInt32 y;
   /** Associated tablet data. */
   GHOST_TabletData tablet;
 } GHOST_TEventCursorData;
@@ -439,7 +452,7 @@ typedef struct {
 
 typedef struct {
   /** Displacement of a mouse wheel. */
-  int32_t z;
+  GHOST_TInt32 z;
 } GHOST_TEventWheelData;
 
 typedef enum {
@@ -455,13 +468,13 @@ typedef struct {
   /** The event subtype */
   GHOST_TTrackpadEventSubTypes subtype;
   /** The x-location of the trackpad event */
-  int32_t x;
+  GHOST_TInt32 x;
   /** The y-location of the trackpad event */
-  int32_t y;
+  GHOST_TInt32 y;
   /** The x-delta or value of the trackpad event */
-  int32_t deltaX;
+  GHOST_TInt32 deltaX;
   /** The y-delta (currently only for scroll subtype) of the trackpad event */
-  int32_t deltaY;
+  GHOST_TInt32 deltaY;
   /** The delta is inverted from the device due to system preferences. */
   char isDirectionInverted;
 } GHOST_TEventTrackpadData;
@@ -475,9 +488,9 @@ typedef enum {
 
 typedef struct {
   /** The x-coordinate of the cursor position. */
-  int32_t x;
+  GHOST_TInt32 x;
   /** The y-coordinate of the cursor position. */
-  int32_t y;
+  GHOST_TInt32 y;
   /** The dropped item type */
   GHOST_TDragnDropTypes dataType;
   /** The "dropped content" */
@@ -502,7 +515,7 @@ typedef struct {
 
 typedef struct {
   int count;
-  uint8_t **strings;
+  GHOST_TUns8 **strings;
 } GHOST_TStringArray;
 
 typedef enum {
@@ -574,13 +587,13 @@ typedef enum {
 
 typedef struct {
   /** Number of pixels on a line. */
-  uint32_t xPixels;
+  GHOST_TUns32 xPixels;
   /** Number of lines. */
-  uint32_t yPixels;
+  GHOST_TUns32 yPixels;
   /** Number of bits per pixel. */
-  uint32_t bpp;
+  GHOST_TUns32 bpp;
   /** Refresh rate (in Hertz). */
-  uint32_t frequency;
+  GHOST_TUns32 frequency;
 } GHOST_DisplaySetting;
 
 #ifdef _WIN32
@@ -600,10 +613,10 @@ typedef int GHOST_TEmbedderWindowID;
  */
 #ifdef __cplusplus
 class GHOST_ITimerTask;
-typedef void (*GHOST_TimerProcPtr)(GHOST_ITimerTask *task, uint64_t time);
+typedef void (*GHOST_TimerProcPtr)(GHOST_ITimerTask *task, GHOST_TUns64 time);
 #else
 struct GHOST_TimerTaskHandle__;
-typedef void (*GHOST_TimerProcPtr)(struct GHOST_TimerTaskHandle__ *task, uint64_t time);
+typedef void (*GHOST_TimerProcPtr)(struct GHOST_TimerTaskHandle__ *task, GHOST_TUns64 time);
 #endif
 
 #ifdef WITH_XR_OPENXR
@@ -611,9 +624,9 @@ typedef void (*GHOST_TimerProcPtr)(struct GHOST_TimerTaskHandle__ *task, uint64_
 struct GHOST_XrDrawViewInfo;
 struct GHOST_XrError;
 /**
- * The XR view (i.e. the OpenXR runtime) may require a different graphics library than OpenGL.
- * An off-screen texture of the viewport will then be drawn into using OpenGL,
- * but the final texture draw call will happen through another library (say DirectX).
+ * The XR view (i.e. the OpenXR runtime) may require a different graphics library than OpenGL. An
+ * offscreen texture of the viewport will then be drawn into using OpenGL, but the final texture
+ * draw call will happen through another lib (say DirectX).
  *
  * This enum defines the possible graphics bindings to attempt to enable.
  */
@@ -683,10 +696,6 @@ typedef struct GHOST_XrDrawViewInfo {
 
   /** Set if the buffer should be submitted with a SRGB transfer applied. */
   char expects_srgb_buffer;
-
-  /** The view that this info represents. Not necessarily the "eye index" (e.g. for quad view
-   * systems, etc). */
-  char view_idx;
 } GHOST_XrDrawViewInfo;
 
 typedef struct GHOST_XrError {
@@ -715,7 +724,7 @@ typedef enum GHOST_XrActionType {
 typedef struct GHOST_XrActionInfo {
   const char *name;
   GHOST_XrActionType type;
-  uint32_t count_subaction_paths;
+  GHOST_TUns32 count_subaction_paths;
   const char **subaction_paths;
   /** States for each subaction path. */
   void *states;
@@ -726,7 +735,7 @@ typedef struct GHOST_XrActionInfo {
 
 typedef struct GHOST_XrActionSpaceInfo {
   const char *action_name;
-  uint32_t count_subaction_paths;
+  GHOST_TUns32 count_subaction_paths;
   const char **subaction_paths;
   /** Poses for each subaction path. */
   const GHOST_XrPose *poses;
@@ -734,14 +743,14 @@ typedef struct GHOST_XrActionSpaceInfo {
 
 typedef struct GHOST_XrActionBindingInfo {
   const char *action_name;
-  uint32_t count_interaction_paths;
+  GHOST_TUns32 count_interaction_paths;
   /** Interaction path: User (sub-action) path + component path. */
   const char **interaction_paths;
 } GHOST_XrActionBindingInfo;
 
 typedef struct GHOST_XrActionProfileInfo {
   const char *profile_path;
-  uint32_t count_bindings;
+  GHOST_TUns32 count_bindings;
   const GHOST_XrActionBindingInfo *bindings;
 } GHOST_XrActionProfileInfo;
 

intern/ghost/intern/GHOST_Buttons.h

@@ -57,7 +57,7 @@ struct GHOST_Buttons {
    */
   void clear();
 
-  uint8_t m_ButtonLeft : 1;
-  uint8_t m_ButtonMiddle : 1;
-  uint8_t m_ButtonRight : 1;
+  GHOST_TUns8 m_ButtonLeft : 1;
+  GHOST_TUns8 m_ButtonMiddle : 1;
+  GHOST_TUns8 m_ButtonRight : 1;
 };

intern/ghost/intern/GHOST_C-api.cpp

@@ -84,7 +84,7 @@ GHOST_TSuccess GHOST_DisposeEventConsumer(GHOST_EventConsumerHandle consumerhand
   return GHOST_kSuccess;
 }
 
-uint64_t GHOST_GetMilliSeconds(GHOST_SystemHandle systemhandle)
+GHOST_TUns64 GHOST_GetMilliSeconds(GHOST_SystemHandle systemhandle)
 {
   GHOST_ISystem *system = (GHOST_ISystem *)systemhandle;
 
@@ -92,8 +92,8 @@ uint64_t GHOST_GetMilliSeconds(GHOST_SystemHandle systemhandle)
 }
 
 GHOST_TimerTaskHandle GHOST_InstallTimer(GHOST_SystemHandle systemhandle,
-                                         uint64_t delay,
-                                         uint64_t interval,
+                                         GHOST_TUns64 delay,
+                                         GHOST_TUns64 interval,
                                          GHOST_TimerProcPtr timerproc,
                                          GHOST_TUserDataPtr userdata)
 {
@@ -111,7 +111,7 @@ GHOST_TSuccess GHOST_RemoveTimer(GHOST_SystemHandle systemhandle,
   return system->removeTimer(timertask);
 }
 
-uint8_t GHOST_GetNumDisplays(GHOST_SystemHandle systemhandle)
+GHOST_TUns8 GHOST_GetNumDisplays(GHOST_SystemHandle systemhandle)
 {
   GHOST_ISystem *system = (GHOST_ISystem *)systemhandle;
 
@@ -119,8 +119,8 @@ uint8_t GHOST_GetNumDisplays(GHOST_SystemHandle systemhandle)
 }
 
 void GHOST_GetMainDisplayDimensions(GHOST_SystemHandle systemhandle,
-                                    uint32_t *width,
-                                    uint32_t *height)
+                                    GHOST_TUns32 *width,
+                                    GHOST_TUns32 *height)
 {
   GHOST_ISystem *system = (GHOST_ISystem *)systemhandle;
 
@@ -128,8 +128,8 @@ void GHOST_GetMainDisplayDimensions(GHOST_SystemHandle systemhandle,
 }
 
 void GHOST_GetAllDisplayDimensions(GHOST_SystemHandle systemhandle,
-                                   uint32_t *width,
-                                   uint32_t *height)
+                                   GHOST_TUns32 *width,
+                                   GHOST_TUns32 *height)
 {
   GHOST_ISystem *system = (GHOST_ISystem *)systemhandle;
 
@@ -156,10 +156,10 @@ GHOST_TSuccess GHOST_DisposeOpenGLContext(GHOST_SystemHandle systemhandle,
 GHOST_WindowHandle GHOST_CreateWindow(GHOST_SystemHandle systemhandle,
                                       GHOST_WindowHandle parent_windowhandle,
                                       const char *title,
-                                      int32_t left,
-                                      int32_t top,
-                                      uint32_t width,
-                                      uint32_t height,
+                                      GHOST_TInt32 left,
+                                      GHOST_TInt32 top,
+                                      GHOST_TUns32 width,
+                                      GHOST_TUns32 height,
                                       GHOST_TWindowState state,
                                       bool is_dialog,
                                       GHOST_TDrawingContextType type,
@@ -317,13 +317,13 @@ GHOST_TSuccess GHOST_HasCursorShape(GHOST_WindowHandle windowhandle,
 }
 
 GHOST_TSuccess GHOST_SetCustomCursorShape(GHOST_WindowHandle windowhandle,
-                                          uint8_t *bitmap,
-                                          uint8_t *mask,
+                                          GHOST_TUns8 *bitmap,
+                                          GHOST_TUns8 *mask,
                                           int sizex,
                                           int sizey,
                                           int hotX,
                                           int hotY,
-                                          bool canInvertColor)
+                                          GHOST_TUns8 canInvertColor)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
 
@@ -344,14 +344,18 @@ GHOST_TSuccess GHOST_SetCursorVisibility(GHOST_WindowHandle windowhandle, int vi
   return window->setCursorVisibility(visible ? true : false);
 }
 
-GHOST_TSuccess GHOST_GetCursorPosition(GHOST_SystemHandle systemhandle, int32_t *x, int32_t *y)
+GHOST_TSuccess GHOST_GetCursorPosition(GHOST_SystemHandle systemhandle,
+                                       GHOST_TInt32 *x,
+                                       GHOST_TInt32 *y)
 {
   GHOST_ISystem *system = (GHOST_ISystem *)systemhandle;
 
   return system->getCursorPosition(*x, *y);
 }
 
-GHOST_TSuccess GHOST_SetCursorPosition(GHOST_SystemHandle systemhandle, int32_t x, int32_t y)
+GHOST_TSuccess GHOST_SetCursorPosition(GHOST_SystemHandle systemhandle,
+                                       GHOST_TInt32 x,
+                                       GHOST_TInt32 y)
 {
   GHOST_ISystem *system = (GHOST_ISystem *)systemhandle;
 
@@ -366,7 +370,7 @@ GHOST_TSuccess GHOST_SetCursorGrab(GHOST_WindowHandle windowhandle,
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
   GHOST_Rect bounds_rect;
-  int32_t mouse_xy[2];
+  GHOST_TInt32 mouse_xy[2];
 
   if (bounds) {
     bounds_rect = GHOST_Rect(bounds[0], bounds[1], bounds[2], bounds[3]);
@@ -416,7 +420,7 @@ void GHOST_setNDOFDeadZone(float deadzone)
 }
 #endif
 
-void GHOST_setAcceptDragOperation(GHOST_WindowHandle windowhandle, bool canAccept)
+void GHOST_setAcceptDragOperation(GHOST_WindowHandle windowhandle, GHOST_TInt8 canAccept)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
 
@@ -430,7 +434,7 @@ GHOST_TEventType GHOST_GetEventType(GHOST_EventHandle eventhandle)
   return event->getType();
 }
 
-uint64_t GHOST_GetEventTime(GHOST_EventHandle eventhandle)
+GHOST_TUns64 GHOST_GetEventTime(GHOST_EventHandle eventhandle)
 {
   GHOST_IEvent *event = (GHOST_IEvent *)eventhandle;
 
@@ -551,14 +555,14 @@ void GHOST_DisposeRectangle(GHOST_RectangleHandle rectanglehandle)
   delete (GHOST_Rect *)rectanglehandle;
 }
 
-GHOST_TSuccess GHOST_SetClientWidth(GHOST_WindowHandle windowhandle, uint32_t width)
+GHOST_TSuccess GHOST_SetClientWidth(GHOST_WindowHandle windowhandle, GHOST_TUns32 width)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
 
   return window->setClientWidth(width);
 }
 
-GHOST_TSuccess GHOST_SetClientHeight(GHOST_WindowHandle windowhandle, uint32_t height)
+GHOST_TSuccess GHOST_SetClientHeight(GHOST_WindowHandle windowhandle, GHOST_TUns32 height)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
 
@@ -566,24 +570,30 @@ GHOST_TSuccess GHOST_SetClientHeight(GHOST_WindowHandle windowhandle, uint32_t h
 }
 
 GHOST_TSuccess GHOST_SetClientSize(GHOST_WindowHandle windowhandle,
-                                   uint32_t width,
-                                   uint32_t height)
+                                   GHOST_TUns32 width,
+                                   GHOST_TUns32 height)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
 
   return window->setClientSize(width, height);
 }
 
-void GHOST_ScreenToClient(
-    GHOST_WindowHandle windowhandle, int32_t inX, int32_t inY, int32_t *outX, int32_t *outY)
+void GHOST_ScreenToClient(GHOST_WindowHandle windowhandle,
+                          GHOST_TInt32 inX,
+                          GHOST_TInt32 inY,
+                          GHOST_TInt32 *outX,
+                          GHOST_TInt32 *outY)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
 
   window->screenToClient(inX, inY, *outX, *outY);
 }
 
-void GHOST_ClientToScreen(
-    GHOST_WindowHandle windowhandle, int32_t inX, int32_t inY, int32_t *outX, int32_t *outY)
+void GHOST_ClientToScreen(GHOST_WindowHandle windowhandle,
+                          GHOST_TInt32 inX,
+                          GHOST_TInt32 inY,
+                          GHOST_TInt32 *outX,
+                          GHOST_TInt32 *outY)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
 
@@ -604,7 +614,8 @@ GHOST_TSuccess GHOST_SetWindowState(GHOST_WindowHandle windowhandle, GHOST_TWind
   return window->setState(state);
 }
 
-GHOST_TSuccess GHOST_SetWindowModifiedState(GHOST_WindowHandle windowhandle, bool isUnsavedChanges)
+GHOST_TSuccess GHOST_SetWindowModifiedState(GHOST_WindowHandle windowhandle,
+                                            GHOST_TUns8 isUnsavedChanges)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
 
@@ -692,18 +703,21 @@ void GHOST_SetTabletAPI(GHOST_SystemHandle systemhandle, GHOST_TTabletAPI api)
   system->setTabletAPI(api);
 }
 
-int32_t GHOST_GetWidthRectangle(GHOST_RectangleHandle rectanglehandle)
+GHOST_TInt32 GHOST_GetWidthRectangle(GHOST_RectangleHandle rectanglehandle)
 {
   return ((GHOST_Rect *)rectanglehandle)->getWidth();
 }
 
-int32_t GHOST_GetHeightRectangle(GHOST_RectangleHandle rectanglehandle)
+GHOST_TInt32 GHOST_GetHeightRectangle(GHOST_RectangleHandle rectanglehandle)
 {
   return ((GHOST_Rect *)rectanglehandle)->getHeight();
 }
 
-void GHOST_GetRectangle(
-    GHOST_RectangleHandle rectanglehandle, int32_t *l, int32_t *t, int32_t *r, int32_t *b)
+void GHOST_GetRectangle(GHOST_RectangleHandle rectanglehandle,
+                        GHOST_TInt32 *l,
+                        GHOST_TInt32 *t,
+                        GHOST_TInt32 *r,
+                        GHOST_TInt32 *b)
 {
   GHOST_Rect *rect = (GHOST_Rect *)rectanglehandle;
 
@@ -713,8 +727,11 @@ void GHOST_GetRectangle(
   *b = rect->m_b;
 }
 
-void GHOST_SetRectangle(
-    GHOST_RectangleHandle rectanglehandle, int32_t l, int32_t t, int32_t r, int32_t b)
+void GHOST_SetRectangle(GHOST_RectangleHandle rectanglehandle,
+                        GHOST_TInt32 l,
+                        GHOST_TInt32 t,
+                        GHOST_TInt32 r,
+                        GHOST_TInt32 b)
 {
   ((GHOST_Rect *)rectanglehandle)->set(l, t, r, b);
 }
@@ -739,7 +756,7 @@ GHOST_TSuccess GHOST_IsValidRectangle(GHOST_RectangleHandle rectanglehandle)
   return result;
 }
 
-void GHOST_InsetRectangle(GHOST_RectangleHandle rectanglehandle, int32_t i)
+void GHOST_InsetRectangle(GHOST_RectangleHandle rectanglehandle, GHOST_TInt32 i)
 {
   ((GHOST_Rect *)rectanglehandle)->inset(i);
 }
@@ -750,12 +767,16 @@ void GHOST_UnionRectangle(GHOST_RectangleHandle rectanglehandle,
   ((GHOST_Rect *)rectanglehandle)->unionRect(*(GHOST_Rect *)anotherrectanglehandle);
 }
 
-void GHOST_UnionPointRectangle(GHOST_RectangleHandle rectanglehandle, int32_t x, int32_t y)
+void GHOST_UnionPointRectangle(GHOST_RectangleHandle rectanglehandle,
+                               GHOST_TInt32 x,
+                               GHOST_TInt32 y)
 {
   ((GHOST_Rect *)rectanglehandle)->unionPoint(x, y);
 }
 
-GHOST_TSuccess GHOST_IsInsideRectangle(GHOST_RectangleHandle rectanglehandle, int32_t x, int32_t y)
+GHOST_TSuccess GHOST_IsInsideRectangle(GHOST_RectangleHandle rectanglehandle,
+                                       GHOST_TInt32 x,
+                                       GHOST_TInt32 y)
 {
   GHOST_TSuccess result = GHOST_kFailure;
 
@@ -775,13 +796,18 @@ GHOST_TVisibility GHOST_GetRectangleVisibility(GHOST_RectangleHandle rectangleha
   return visible;
 }
 
-void GHOST_SetCenterRectangle(GHOST_RectangleHandle rectanglehandle, int32_t cx, int32_t cy)
+void GHOST_SetCenterRectangle(GHOST_RectangleHandle rectanglehandle,
+                              GHOST_TInt32 cx,
+                              GHOST_TInt32 cy)
 {
   ((GHOST_Rect *)rectanglehandle)->setCenter(cx, cy);
 }
 
-void GHOST_SetRectangleCenter(
-    GHOST_RectangleHandle rectanglehandle, int32_t cx, int32_t cy, int32_t w, int32_t h)
+void GHOST_SetRectangleCenter(GHOST_RectangleHandle rectanglehandle,
+                              GHOST_TInt32 cx,
+                              GHOST_TInt32 cy,
+                              GHOST_TInt32 w,
+                              GHOST_TInt32 h)
 {
   ((GHOST_Rect *)rectanglehandle)->setCenter(cx, cy, w, h);
 }
@@ -797,13 +823,13 @@ GHOST_TSuccess GHOST_ClipRectangle(GHOST_RectangleHandle rectanglehandle,
   return result;
 }
 
-char *GHOST_getClipboard(bool selection)
+GHOST_TUns8 *GHOST_getClipboard(int selection)
 {
   GHOST_ISystem *system = GHOST_ISystem::getSystem();
   return system->getClipboard(selection);
 }
 
-void GHOST_putClipboard(const char *buffer, bool selection)
+void GHOST_putClipboard(GHOST_TInt8 *buffer, int selection)
 {
   GHOST_ISystem *system = GHOST_ISystem::getSystem();
   system->putClipboard(buffer, selection);
@@ -835,7 +861,7 @@ float GHOST_GetNativePixelSize(GHOST_WindowHandle windowhandle)
   return 1.0f;
 }
 
-uint16_t GHOST_GetDPIHint(GHOST_WindowHandle windowhandle)
+GHOST_TUns16 GHOST_GetDPIHint(GHOST_WindowHandle windowhandle)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
   return window->getDPIHint();
@@ -843,8 +869,12 @@ uint16_t GHOST_GetDPIHint(GHOST_WindowHandle windowhandle)
 
 #ifdef WITH_INPUT_IME
 
-void GHOST_BeginIME(
-    GHOST_WindowHandle windowhandle, int32_t x, int32_t y, int32_t w, int32_t h, bool complete)
+void GHOST_BeginIME(GHOST_WindowHandle windowhandle,
+                    GHOST_TInt32 x,
+                    GHOST_TInt32 y,
+                    GHOST_TInt32 w,
+                    GHOST_TInt32 h,
+                    int complete)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
   window->beginIME(x, y, w, h, complete);
@@ -942,7 +972,7 @@ void GHOST_XrDestroyActionSet(GHOST_XrContextHandle xr_contexthandle, const char
 
 int GHOST_XrCreateActions(GHOST_XrContextHandle xr_contexthandle,
                           const char *action_set_name,
-                          uint32_t count,
+                          GHOST_TUns32 count,
                           const GHOST_XrActionInfo *infos)
 {
   GHOST_IXrContext *xr_context = (GHOST_IXrContext *)xr_contexthandle;
@@ -953,7 +983,7 @@ int GHOST_XrCreateActions(GHOST_XrContextHandle xr_contexthandle,
 
 void GHOST_XrDestroyActions(GHOST_XrContextHandle xr_contexthandle,
                             const char *action_set_name,
-                            uint32_t count,
+                            GHOST_TUns32 count,
                             const char *const *action_names)
 {
   GHOST_IXrContext *xr_context = (GHOST_IXrContext *)xr_contexthandle;
@@ -963,7 +993,7 @@ void GHOST_XrDestroyActions(GHOST_XrContextHandle xr_contexthandle,
 
 int GHOST_XrCreateActionSpaces(GHOST_XrContextHandle xr_contexthandle,
                                const char *action_set_name,
-                               uint32_t count,
+                               GHOST_TUns32 count,
                                const GHOST_XrActionSpaceInfo *infos)
 {
   GHOST_IXrContext *xr_context = (GHOST_IXrContext *)xr_contexthandle;
@@ -975,7 +1005,7 @@ int GHOST_XrCreateActionSpaces(GHOST_XrContextHandle xr_contexthandle,
 
 void GHOST_XrDestroyActionSpaces(GHOST_XrContextHandle xr_contexthandle,
                                  const char *action_set_name,
-                                 uint32_t count,
+                                 GHOST_TUns32 count,
                                  const GHOST_XrActionSpaceInfo *infos)
 {
   GHOST_IXrContext *xr_context = (GHOST_IXrContext *)xr_contexthandle;
@@ -985,7 +1015,7 @@ void GHOST_XrDestroyActionSpaces(GHOST_XrContextHandle xr_contexthandle,
 
 int GHOST_XrCreateActionBindings(GHOST_XrContextHandle xr_contexthandle,
                                  const char *action_set_name,
-                                 uint32_t count,
+                                 GHOST_TUns32 count,
                                  const GHOST_XrActionProfileInfo *infos)
 {
   GHOST_IXrContext *xr_context = (GHOST_IXrContext *)xr_contexthandle;
@@ -997,7 +1027,7 @@ int GHOST_XrCreateActionBindings(GHOST_XrContextHandle xr_contexthandle,
 
 void GHOST_XrDestroyActionBindings(GHOST_XrContextHandle xr_contexthandle,
                                    const char *action_set_name,
-                                   uint32_t count,
+                                   GHOST_TUns32 count,
                                    const GHOST_XrActionProfileInfo *infos)
 {
   GHOST_IXrContext *xr_context = (GHOST_IXrContext *)xr_contexthandle;
@@ -1024,7 +1054,7 @@ int GHOST_XrSyncActions(GHOST_XrContextHandle xr_contexthandle, const char *acti
 int GHOST_XrApplyHapticAction(GHOST_XrContextHandle xr_contexthandle,
                               const char *action_set_name,
                               const char *action_name,
-                              const int64_t *duration,
+                              const GHOST_TInt64 *duration,
                               const float *frequency,
                               const float *amplitude)
 {

intern/ghost/intern/GHOST_ContextCGL.mm

@@ -217,7 +217,7 @@ static void makeAttribList(std::vector<NSOpenGLPixelFormatAttribute> &attribs,
   attribs.push_back(NSOpenGLPFAOpenGLProfile);
   attribs.push_back(coreProfile ? NSOpenGLProfileVersion3_2Core : NSOpenGLProfileVersionLegacy);
 
-  /* Pixel Format Attributes for the windowed NSOpenGLContext. */
+  // Pixel Format Attributes for the windowed NSOpenGLContext
   attribs.push_back(NSOpenGLPFADoubleBuffer);
 
   if (softwareGL) {
@@ -250,8 +250,7 @@ GHOST_TSuccess GHOST_ContextCGL::initializeDrawingContext()
   static const bool needAlpha = false;
 #endif
 
-  /* Command-line argument would be better. */
-  static bool softwareGL = getenv("BLENDER_SOFTWAREGL");
+  static bool softwareGL = getenv("BLENDER_SOFTWAREGL");  // command-line argument would be better
 
   std::vector<NSOpenGLPixelFormatAttribute> attribs;
   attribs.reserve(40);
@@ -288,7 +287,7 @@ GHOST_TSuccess GHOST_ContextCGL::initializeDrawingContext()
 
   if (m_metalView) {
     if (m_defaultFramebuffer == 0) {
-      /* Create a virtual frame-buffer. */
+      // Create a virtual framebuffer
       [m_openGLContext makeCurrentContext];
       metalInitFramebuffer();
       initClearGL();
@@ -343,11 +342,11 @@ void GHOST_ContextCGL::metalInit()
     /* clang-format on */
     id<MTLDevice> device = m_metalLayer.device;
 
-    /* Create a command queue for blit/present operation. */
+    // Create a command queue for blit/present operation
     m_metalCmdQueue = (MTLCommandQueue *)[device newCommandQueue];
     [m_metalCmdQueue retain];
 
-    /* Create shaders for blit operation. */
+    // Create shaders for blit operation
     NSString *source = @R"msl(
       using namespace metal;
 
@@ -388,7 +387,7 @@ void GHOST_ContextCGL::metalInit()
           "GHOST_ContextCGL::metalInit: newLibraryWithSource:options:error: failed!");
     }
 
-    /* Create a render pipeline for blit operation. */
+    // Create a render pipeline for blit operation
     MTLRenderPipelineDescriptor *desc = [[[MTLRenderPipelineDescriptor alloc] init] autorelease];
 
     desc.fragmentFunction = [library newFunctionWithName:@"fragment_shader"];
@@ -461,7 +460,7 @@ void GHOST_ContextCGL::metalUpdateFramebuffer()
         "GHOST_ContextCGL::metalUpdateFramebuffer: CVPixelBufferCreate failed!");
   }
 
-  /* Create an OpenGL texture. */
+  // Create an OpenGL texture
   CVOpenGLTextureCacheRef cvGLTexCache = nil;
   cvret = CVOpenGLTextureCacheCreate(kCFAllocatorDefault,
                                      nil,
@@ -486,7 +485,7 @@ void GHOST_ContextCGL::metalUpdateFramebuffer()
   unsigned int glTex;
   glTex = CVOpenGLTextureGetName(cvGLTex);
 
-  /* Create a Metal texture. */
+  // Create a Metal texture
   CVMetalTextureCacheRef cvMetalTexCache = nil;
   cvret = CVMetalTextureCacheCreate(
       kCFAllocatorDefault, nil, m_metalLayer.device, nil, &cvMetalTexCache);

intern/ghost/intern/GHOST_ContextEGL.cpp

@@ -283,8 +283,8 @@ GHOST_TSuccess GHOST_ContextEGL::setSwapInterval(int interval)
 
 GHOST_TSuccess GHOST_ContextEGL::getSwapInterval(int &intervalOut)
 {
-  /* This is a bit of a kludge because there does not seem to
-   * be a way to query the swap interval with EGL. */
+  // This is a bit of a kludge because there does not seem to
+  // be a way to query the swap interval with EGL.
   intervalOut = m_swap_interval;
 
   return GHOST_kSuccess;
@@ -365,21 +365,21 @@ static const std::string &api_string(EGLenum api)
 
 GHOST_TSuccess GHOST_ContextEGL::initializeDrawingContext()
 {
-  /* Objects have to be declared here due to the use of `goto`. */
+  // objects have to be declared here due to the use of goto
   std::vector<EGLint> attrib_list;
   EGLint num_config = 0;
 
   if (m_stereoVisual)
     fprintf(stderr, "Warning! Stereo OpenGL ES contexts are not supported.\n");
 
-  m_stereoVisual = false; /* It doesn't matter what the Window wants. */
+  m_stereoVisual = false;  // It doesn't matter what the Window wants.
 
   if (!initContextEGLEW()) {
     return GHOST_kFailure;
   }
 
 #ifdef WITH_GL_ANGLE
-  /* `d3dcompiler_XX.dll` needs to be loaded before ANGLE will work. */
+  // d3dcompiler_XX.dll needs to be loaded before ANGLE will work
   if (s_d3dcompiler == NULL) {
     s_d3dcompiler = LoadLibrary(D3DCOMPILER);
 
@@ -410,13 +410,13 @@ GHOST_TSuccess GHOST_ContextEGL::initializeDrawingContext()
   if (!bindAPI(m_api))
     goto error;
 
-  /* Build attribute list. */
+  // build attribute list
 
   attrib_list.reserve(20);
 
   if (m_api == EGL_OPENGL_ES_API && EGLEW_VERSION_1_2) {
-    /* According to the spec it seems that you are required to set EGL_RENDERABLE_TYPE,
-     * but some implementations (ANGLE) do not seem to care. */
+    // According to the spec it seems that you are required to set EGL_RENDERABLE_TYPE,
+    // but some implementations (ANGLE) do not seem to care.
 
     if (m_contextMajorVersion == 1) {
       attrib_list.push_back(EGL_RENDERABLE_TYPE);
@@ -469,7 +469,7 @@ GHOST_TSuccess GHOST_ContextEGL::initializeDrawingContext()
 #endif
 
   if (m_nativeWindow == 0) {
-    /* Off-screen surface. */
+    // off-screen surface
     attrib_list.push_back(EGL_SURFACE_TYPE);
     attrib_list.push_back(EGL_PBUFFER_BIT);
   }
@@ -479,8 +479,8 @@ GHOST_TSuccess GHOST_ContextEGL::initializeDrawingContext()
   if (!EGL_CHK(::eglChooseConfig(m_display, &(attrib_list[0]), &m_config, 1, &num_config)))
     goto error;
 
-  /* A common error is to assume that ChooseConfig worked because it returned EGL_TRUE. */
-  if (num_config != 1) /* `num_config` should be exactly 1. */
+  // A common error is to assume that ChooseConfig worked because it returned EGL_TRUE
+  if (num_config != 1)  // num_config should be exactly 1
     goto error;
 
   if (m_nativeWindow != 0) {

intern/ghost/intern/GHOST_ContextGLX.cpp

@@ -239,7 +239,7 @@ GHOST_TSuccess GHOST_ContextGLX::initializeDrawingContext()
     }
     attribs[i++] = 0;
 
-    /* Some drivers don't like having a true off-screen context.
+    /* Some drivers don't like having a true offscreen context.
      * Create a pixel buffer instead of a window to render to.
      * even if it will never be used for drawing. */
     int pbuffer_attribs[] = {GLX_PBUFFER_WIDTH, 1, GLX_PBUFFER_HEIGHT, 1, None};

intern/ghost/intern/GHOST_ContextWGL.cpp

@@ -335,11 +335,10 @@ void GHOST_ContextWGL::initContextWGLEW(PIXELFORMATDESCRIPTOR &preferredPFD)
   if (!WIN32_CHK(::wglMakeCurrent(dummyHDC, dummyHGLRC)))
     goto finalize;
 
-  if (GLEW_CHK(glewInit()) != GLEW_OK) {
+  if (GLEW_CHK(glewInit()) != GLEW_OK)
     fprintf(stderr, "Warning! Dummy GLEW/WGLEW failed to initialize properly.\n");
-  }
 
-  /* The following are not technically WGLEW, but they also require a context to work. */
+    // the following are not technially WGLEW, but they also require a context to work
 
 #ifndef NDEBUG
   free((void *)m_dummyRenderer);

intern/ghost/intern/GHOST_DisplayManager.cpp

@@ -49,20 +49,20 @@ GHOST_TSuccess GHOST_DisplayManager::initialize(void)
   return success;
 }
 
-GHOST_TSuccess GHOST_DisplayManager::getNumDisplays(uint8_t & /*numDisplays*/) const
+GHOST_TSuccess GHOST_DisplayManager::getNumDisplays(GHOST_TUns8 & /*numDisplays*/) const
 {
-  /* Don't know if we have a display. */
+  // Don't know if we have a display...
   return GHOST_kFailure;
 }
 
-GHOST_TSuccess GHOST_DisplayManager::getNumDisplaySettings(uint8_t display,
-                                                           int32_t &numSettings) const
+GHOST_TSuccess GHOST_DisplayManager::getNumDisplaySettings(GHOST_TUns8 display,
+                                                           GHOST_TInt32 &numSettings) const
 {
   GHOST_TSuccess success;
 
   GHOST_ASSERT(m_settingsInitialized,
                "GHOST_DisplayManager::getNumDisplaySettings(): m_settingsInitialized=false");
-  uint8_t numDisplays;
+  GHOST_TUns8 numDisplays;
   success = getNumDisplays(numDisplays);
   if (success == GHOST_kSuccess) {
     if (display < numDisplays) {
@@ -75,18 +75,18 @@ GHOST_TSuccess GHOST_DisplayManager::getNumDisplaySettings(uint8_t display,
   return success;
 }
 
-GHOST_TSuccess GHOST_DisplayManager::getDisplaySetting(uint8_t display,
-                                                       int32_t index,
+GHOST_TSuccess GHOST_DisplayManager::getDisplaySetting(GHOST_TUns8 display,
+                                                       GHOST_TInt32 index,
                                                        GHOST_DisplaySetting &setting) const
 {
   GHOST_TSuccess success;
 
   GHOST_ASSERT(m_settingsInitialized,
                "GHOST_DisplayManager::getNumDisplaySettings(): m_settingsInitialized=false");
-  uint8_t numDisplays;
+  GHOST_TUns8 numDisplays;
   success = getNumDisplays(numDisplays);
   if (success == GHOST_kSuccess) {
-    if (display < numDisplays && ((uint8_t)index < m_settings[display].size())) {
+    if (display < numDisplays && ((GHOST_TUns8)index < m_settings[display].size())) {
       setting = m_settings[display][index];
     }
     else {
@@ -97,18 +97,18 @@ GHOST_TSuccess GHOST_DisplayManager::getDisplaySetting(uint8_t display,
 }
 
 GHOST_TSuccess GHOST_DisplayManager::getCurrentDisplaySetting(
-    uint8_t /*display*/, GHOST_DisplaySetting & /*setting*/) const
+    GHOST_TUns8 /*display*/, GHOST_DisplaySetting & /*setting*/) const
 {
   return GHOST_kFailure;
 }
 
 GHOST_TSuccess GHOST_DisplayManager::setCurrentDisplaySetting(
-    uint8_t /*display*/, const GHOST_DisplaySetting & /*setting*/)
+    GHOST_TUns8 /*display*/, const GHOST_DisplaySetting & /*setting*/)
 {
   return GHOST_kFailure;
 }
 
-GHOST_TSuccess GHOST_DisplayManager::findMatch(uint8_t display,
+GHOST_TSuccess GHOST_DisplayManager::findMatch(GHOST_TUns8 display,
                                                const GHOST_DisplaySetting &setting,
                                                GHOST_DisplaySetting &match) const
 {
@@ -120,18 +120,18 @@ GHOST_TSuccess GHOST_DisplayManager::findMatch(uint8_t display,
       (int)setting.xPixels, (int)setting.yPixels, (int)setting.bpp, (int)setting.frequency};
   int capabilities[4];
   double field, score;
-  double best = 1e12; /* A big number. */
+  double best = 1e12;  // A big number
   int found = 0;
 
-  /* Look at all the display modes. */
+  // Look at all the display modes
   for (int i = 0; (i < (int)m_settings[display].size()); i++) {
-    /* Store the capabilities of the display device. */
+    // Store the capabilities of the display device
     capabilities[0] = m_settings[display][i].xPixels;
     capabilities[1] = m_settings[display][i].yPixels;
     capabilities[2] = m_settings[display][i].bpp;
     capabilities[3] = m_settings[display][i].frequency;
 
-    /* Match against all the fields of the display settings. */
+    // Match against all the fields of the display settings
     score = 0;
     for (int j = 0; j < 4; j++) {
       field = capabilities[j] - criteria[j];
@@ -157,16 +157,17 @@ GHOST_TSuccess GHOST_DisplayManager::findMatch(uint8_t display,
 
 GHOST_TSuccess GHOST_DisplayManager::initializeSettings(void)
 {
-  uint8_t numDisplays;
+  GHOST_TUns8 numDisplays;
   GHOST_TSuccess success = getNumDisplays(numDisplays);
   if (success == GHOST_kSuccess) {
-    for (uint8_t display = 0; (display < numDisplays) && (success == GHOST_kSuccess); display++) {
+    for (GHOST_TUns8 display = 0; (display < numDisplays) && (success == GHOST_kSuccess);
+         display++) {
       GHOST_DisplaySettings displaySettings;
       m_settings.push_back(displaySettings);
-      int32_t numSettings;
+      GHOST_TInt32 numSettings;
       success = getNumDisplaySettings(display, numSettings);
       if (success == GHOST_kSuccess) {
-        int32_t index;
+        GHOST_TInt32 index;
         GHOST_DisplaySetting setting;
         for (index = 0; (index < numSettings) && (success == GHOST_kSuccess); index++) {
           success = getDisplaySetting(display, index, setting);

intern/ghost/intern/GHOST_DisplayManager.h

@@ -55,7 +55,7 @@ class GHOST_DisplayManager {
    * \param numDisplays: The number of displays on this system.
    * \return Indication of success.
    */
-  virtual GHOST_TSuccess getNumDisplays(uint8_t &numDisplays) const;
+  virtual GHOST_TSuccess getNumDisplays(GHOST_TUns8 &numDisplays) const;
 
   /**
    * Returns the number of display settings for this display device.
@@ -63,7 +63,8 @@ class GHOST_DisplayManager {
    * \param numSettings: The number of settings of the display device with this index.
    * \return Indication of success.
    */
-  virtual GHOST_TSuccess getNumDisplaySettings(uint8_t display, int32_t &numSettings) const;
+  virtual GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display,
+                                               GHOST_TInt32 &numSettings) const;
 
   /**
    * Returns the current setting for this display device.
@@ -72,8 +73,8 @@ class GHOST_DisplayManager {
    * \param setting: The setting of the display device with this index.
    * \return Indication of success.
    */
-  virtual GHOST_TSuccess getDisplaySetting(uint8_t display,
-                                           int32_t index,
+  virtual GHOST_TSuccess getDisplaySetting(GHOST_TUns8 display,
+                                           GHOST_TInt32 index,
                                            GHOST_DisplaySetting &setting) const;
 
   /**
@@ -82,7 +83,7 @@ class GHOST_DisplayManager {
    * \param setting: The current setting of the display device with this index.
    * \return Indication of success.
    */
-  virtual GHOST_TSuccess getCurrentDisplaySetting(uint8_t display,
+  virtual GHOST_TSuccess getCurrentDisplaySetting(GHOST_TUns8 display,
                                                   GHOST_DisplaySetting &setting) const;
 
   /**
@@ -93,7 +94,7 @@ class GHOST_DisplayManager {
    * \param setting: The setting of the display device to be matched and activated.
    * \return Indication of success.
    */
-  virtual GHOST_TSuccess setCurrentDisplaySetting(uint8_t display,
+  virtual GHOST_TSuccess setCurrentDisplaySetting(GHOST_TUns8 display,
                                                   const GHOST_DisplaySetting &setting);
 
  protected:
@@ -106,7 +107,7 @@ class GHOST_DisplayManager {
    * \param match: The optimal display setting.
    * \return Indication of success.
    */
-  GHOST_TSuccess findMatch(uint8_t display,
+  GHOST_TSuccess findMatch(GHOST_TUns8 display,
                            const GHOST_DisplaySetting &setting,
                            GHOST_DisplaySetting &match) const;
 

intern/ghost/intern/GHOST_DisplayManagerCocoa.h

@@ -46,7 +46,7 @@ class GHOST_DisplayManagerCocoa : public GHOST_DisplayManager {
    * \param numDisplays: The number of displays on this system.
    * \return Indication of success.
    */
-  GHOST_TSuccess getNumDisplays(uint8_t &numDisplays) const;
+  GHOST_TSuccess getNumDisplays(GHOST_TUns8 &numDisplays) const;
 
   /**
    * Returns the number of display settings for this display device.
@@ -54,7 +54,7 @@ class GHOST_DisplayManagerCocoa : public GHOST_DisplayManager {
    * \param numSetting: The number of settings of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess getNumDisplaySettings(uint8_t display, int32_t &numSettings) const;
+  GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32 &numSettings) const;
 
   /**
    * Returns the current setting for this display device.
@@ -63,8 +63,8 @@ class GHOST_DisplayManagerCocoa : public GHOST_DisplayManager {
    * \param setting: The setting of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess getDisplaySetting(uint8_t display,
-                                   int32_t index,
+  GHOST_TSuccess getDisplaySetting(GHOST_TUns8 display,
+                                   GHOST_TInt32 index,
                                    GHOST_DisplaySetting &setting) const;
 
   /**
@@ -73,7 +73,8 @@ class GHOST_DisplayManagerCocoa : public GHOST_DisplayManager {
    * \param setting: The current setting of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess getCurrentDisplaySetting(uint8_t display, GHOST_DisplaySetting &setting) const;
+  GHOST_TSuccess getCurrentDisplaySetting(GHOST_TUns8 display,
+                                          GHOST_DisplaySetting &setting) const;
 
   /**
    * Changes the current setting for this display device.
@@ -81,7 +82,8 @@ class GHOST_DisplayManagerCocoa : public GHOST_DisplayManager {
    * \param setting: The current setting of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess setCurrentDisplaySetting(uint8_t display, const GHOST_DisplaySetting &setting);
+  GHOST_TSuccess setCurrentDisplaySetting(GHOST_TUns8 display,
+                                          const GHOST_DisplaySetting &setting);
 
  protected:
   // Do not cache values as OS X supports screen hot plug