More changes for new Linux libs

* Remove unnecessary check for Blosc, this is part of OpenVDB lib now
* Remove WITH_CXX11_ABI, always use new C++11 ABI now
* Replace centos7 by glibc_228 everywhere

CMakeLists.txt

@@ -749,11 +749,6 @@ if("${CMAKE_GENERATOR}" MATCHES "Ninja")
   mark_as_advanced(WITH_NINJA_POOL_JOBS)
 endif()
 
-if(UNIX AND NOT APPLE)
-  option(WITH_CXX11_ABI "Use native C++11 ABI of compiler" ON)
-  mark_as_advanced(WITH_CXX11_ABI)
-endif()
-
 # Installation process.
 set(POSTINSTALL_SCRIPT "" CACHE FILEPATH "Run given CMake script after installation process")
 mark_as_advanced(POSTINSTALL_SCRIPT)
@@ -1721,12 +1716,6 @@ if(
   string(APPEND CMAKE_C_FLAGS " -std=gnu11")
 endif()
 
-if(UNIX AND NOT APPLE)
-  if(NOT WITH_CXX11_ABI)
-    string(APPEND PLATFORM_CFLAGS " -D_GLIBCXX_USE_CXX11_ABI=0")
-  endif()
-endif()
-
 if(WITH_COMPILER_SHORT_FILE_MACRO)
   # Use '-fmacro-prefix-map' for Clang and GCC (MSVC doesn't support this).
   add_check_c_compiler_flag(C_PREFIX_MAP_FLAGS C_MACRO_PREFIX_MAP -fmacro-prefix-map=foo=bar)

GNUmakefile

@@ -211,7 +211,7 @@ endif
 # Set the LIBDIR, an empty string when not found.
 LIBDIR:=$(wildcard ../lib/${OS_NCASE}_${CPU})
 ifeq (, $(LIBDIR))
-	LIBDIR:=$(wildcard ../lib/${OS_NCASE}_centos7_${CPU})
+	LIBDIR:=$(wildcard ../lib/${OS_NCASE}_${CPU}_glibc_228)
 endif
 ifeq (, $(LIBDIR))
 	LIBDIR:=$(wildcard ../lib/${OS_NCASE})

build_files/build_environment/cmake/check_software.cmake

@@ -12,7 +12,6 @@ if(UNIX)
     automake
     bison
     ${_libtoolize_name}
-    meson
     ninja
     pkg-config
     tclsh

build_files/build_environment/cmake/download.cmake

@@ -32,7 +32,8 @@ function(download_source dep)
   message("Checking source : ${dep} (${TARGET_FILE})")
   if(NOT EXISTS ${TARGET_FILE})
     message("Checking source : ${dep} - source not found downloading from ${TARGET_URI}")
-    file(DOWNLOAD ${TARGET_URI} ${TARGET_FILE}
+    file(
+      DOWNLOAD ${TARGET_URI} ${TARGET_FILE}
       TIMEOUT 1800  # seconds
       EXPECTED_HASH ${TARGET_HASH_TYPE}=${TARGET_HASH}
       TLS_VERIFY ON

build_files/build_environment/cmake/epoxy.cmake

@@ -26,5 +26,6 @@ endif()
 
 add_dependencies(
   external_epoxy
+  # Needed for `MESON`.
   external_python_site_packages
 )

build_files/build_environment/cmake/ffmpeg.cmake

@@ -1,9 +1,55 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-set(FFMPEG_CFLAGS "-I${mingw_LIBDIR}/lame/include -I${mingw_LIBDIR}/openjpeg/include/ -I${mingw_LIBDIR}/ogg/include -I${mingw_LIBDIR}/vorbis/include -I${mingw_LIBDIR}/theora/include -I${mingw_LIBDIR}/opus/include -I${mingw_LIBDIR}/vpx/include -I${mingw_LIBDIR}/x264/include -I${mingw_LIBDIR}/xvidcore/include -I${mingw_LIBDIR}/zlib/include -I${mingw_LIBDIR}/aom/include")
-set(FFMPEG_LDFLAGS "-L${mingw_LIBDIR}/lame/lib -L${mingw_LIBDIR}/openjpeg/lib -L${mingw_LIBDIR}/ogg/lib -L${mingw_LIBDIR}/vorbis/lib -L${mingw_LIBDIR}/theora/lib -L${mingw_LIBDIR}/opus/lib -L${mingw_LIBDIR}/vpx/lib -L${mingw_LIBDIR}/x264/lib -L${mingw_LIBDIR}/xvidcore/lib -L${mingw_LIBDIR}/zlib/lib -L${mingw_LIBDIR}/aom/lib")
-set(FFMPEG_EXTRA_FLAGS --pkg-config-flags=--static --extra-cflags=${FFMPEG_CFLAGS} --extra-ldflags=${FFMPEG_LDFLAGS})
-set(FFMPEG_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/x264/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}:${mingw_LIBDIR}/vpx/lib/pkgconfig:${mingw_LIBDIR}/theora/lib/pkgconfig:${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/opus/lib/pkgconfig:${mingw_LIBDIR}/aom/lib/pkgconfig:)
+if(WIN32)
+  set(temp_LIBDIR ${mingw_LIBDIR})
+else()
+  set(temp_LIBDIR ${LIBDIR})
+endif()
+
+set(FFMPEG_CFLAGS "\
+-I${temp_LIBDIR}/lame/include \
+-I${temp_LIBDIR}/openjpeg/include/ \
+-I${temp_LIBDIR}/ogg/include \
+-I${temp_LIBDIR}/vorbis/include \
+-I${temp_LIBDIR}/theora/include \
+-I${temp_LIBDIR}/opus/include \
+-I${temp_LIBDIR}/vpx/include \
+-I${temp_LIBDIR}/x264/include \
+-I${temp_LIBDIR}/xvidcore/include \
+-I${temp_LIBDIR}/zlib/include \
+-I${temp_LIBDIR}/aom/include"
+)
+set(FFMPEG_LDFLAGS "\
+-L${temp_LIBDIR}/lame/lib \
+-L${temp_LIBDIR}/openjpeg/lib \
+-L${temp_LIBDIR}/ogg/lib \
+-L${temp_LIBDIR}/vorbis/lib \
+-L${temp_LIBDIR}/theora/lib \
+-L${temp_LIBDIR}/opus/lib \
+-L${temp_LIBDIR}/vpx/lib \
+-L${temp_LIBDIR}/x264/lib \
+-L${temp_LIBDIR}/xvidcore/lib \
+-L${temp_LIBDIR}/zlib/lib \
+-L${temp_LIBDIR}/aom/lib"
+)
+set(FFMPEG_EXTRA_FLAGS
+  --pkg-config-flags=--static
+  --extra-cflags=${FFMPEG_CFLAGS}
+  --extra-ldflags=${FFMPEG_LDFLAGS}
+)
+set(FFMPEG_ENV "PKG_CONFIG_PATH=\
+${temp_LIBDIR}/openjpeg/lib/pkgconfig:\
+${temp_LIBDIR}/x264/lib/pkgconfig:\
+${temp_LIBDIR}/vorbis/lib/pkgconfig:\
+${temp_LIBDIR}/ogg/lib/pkgconfig:\
+${temp_LIBDIR}/vpx/lib/pkgconfig:\
+${temp_LIBDIR}/theora/lib/pkgconfig:\
+${temp_LIBDIR}/openjpeg/lib/pkgconfig:\
+${temp_LIBDIR}/opus/lib/pkgconfig:\
+${temp_LIBDIR}/aom/lib/pkgconfig"
+)
+
+unset(temp_LIBDIR)
 
 if(WIN32)
   set(FFMPEG_ENV set ${FFMPEG_ENV} &&)

build_files/build_environment/cmake/freetype.cmake

@@ -35,6 +35,7 @@ if(BUILD_MODE STREQUAL Release AND WIN32)
 	  # harfbuzz *NEEDS* to find freetype.lib and will not be conviced to take alternative names so just give it
 	  # what it wants.
 	  COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/freetype/lib/freetype2st.lib ${LIBDIR}/freetype/lib/freetype.lib
+
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/fribidi.cmake

@@ -18,6 +18,7 @@ ExternalProject_Add(external_fribidi
 add_dependencies(
   external_fribidi
   external_python
+  # Needed for `MESON`.
   external_python_site_packages
 )
 

build_files/build_environment/cmake/gmp.cmake

@@ -45,14 +45,16 @@ if(BUILD_MODE STREQUAL Release AND WIN32)
     COMMAND  ${CMAKE_COMMAND} -E copy ${LIBDIR}/gmp/bin/libgmp-10.dll ${HARVEST_TARGET}/gmp/lib/libgmp-10.dll
     COMMAND  ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib ${HARVEST_TARGET}/gmp/lib/libgmp-10.lib
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/gmp/include ${HARVEST_TARGET}/gmp/include
+
     DEPENDEES install
   )
 endif()
 
 if(BUILD_MODE STREQUAL Debug AND WIN32)
-ExternalProject_Add_Step(external_gmp after_install
+  ExternalProject_Add_Step(external_gmp after_install
     COMMAND  ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-3.dll.def ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def
     COMMAND  lib /def:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def /machine:x64 /out:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib
+
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/harfbuzz.cmake

@@ -5,7 +5,12 @@ if(WIN32)
   set(HARFBUZZ_PKG_ENV FREETYPE_DIR=${LIBDIR}/freetype)
 else()
   set(HARFBUZZ_CONFIGURE_ENV ${CONFIGURE_ENV})
-  set(HARFBUZZ_PKG_ENV PKG_CONFIG_PATH=${LIBDIR}/freetype/lib/pkgconfig:${LIBDIR}/brotli/lib/pkgconfig:$PKG_CONFIG_PATH)
+  set(HARFBUZZ_PKG_ENV "PKG_CONFIG_PATH=\
+${LIBDIR}/freetype/lib/pkgconfig:\
+${LIBDIR}/brotli/lib/pkgconfig:\
+${LIBDIR}/lib/python3.10/pkgconfig:\
+$PKG_CONFIG_PATH"
+  )
 endif()
 
 set(HARFBUZZ_EXTRA_OPTIONS
@@ -13,6 +18,9 @@ set(HARFBUZZ_EXTRA_OPTIONS
   -Dfreetype=enabled
   -Dglib=disabled
   -Dgobject=disabled
+  # Only used for command line utilities,
+  # disable as this would add an addition & unnecessary build-dependency.
+  -Dcairo=disabled
 )
 
 ExternalProject_Add(external_harfbuzz
@@ -20,8 +28,16 @@ ExternalProject_Add(external_harfbuzz
   URL_HASH ${HARFBUZZ_HASH_TYPE}=${HARFBUZZ_HASH}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/harfbuzz
+
   CONFIGURE_COMMAND ${HARFBUZZ_CONFIGURE_ENV} &&
-    ${CMAKE_COMMAND} -E env ${HARFBUZZ_PKG_ENV} ${MESON} setup --prefix ${LIBDIR}/harfbuzz ${HARFBUZZ_EXTRA_OPTIONS} --default-library static --libdir lib ${BUILD_DIR}/harfbuzz/src/external_harfbuzz-build ${BUILD_DIR}/harfbuzz/src/external_harfbuzz
+  ${CMAKE_COMMAND} -E env ${HARFBUZZ_PKG_ENV}
+  ${MESON} setup
+  --prefix ${LIBDIR}/harfbuzz ${HARFBUZZ_EXTRA_OPTIONS}
+  --default-library static
+  --libdir lib
+  ${BUILD_DIR}/harfbuzz/src/external_harfbuzz-build
+  ${BUILD_DIR}/harfbuzz/src/external_harfbuzz
+
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
   INSTALL_DIR ${LIBDIR}/harfbuzz
@@ -30,6 +46,8 @@ ExternalProject_Add(external_harfbuzz
 add_dependencies(
   external_harfbuzz
   external_python
+  external_freetype
+  # Needed for `MESON`.
   external_python_site_packages
 )
 
@@ -41,4 +59,3 @@ if(BUILD_MODE STREQUAL Release AND WIN32)
     DEPENDEES install
   )
 endif()
-

build_files/build_environment/cmake/harvest.cmake

@@ -268,6 +268,10 @@ harvest(haru/include haru/include "*.h")
 harvest(haru/lib haru/lib "*.a")
 harvest(zstd/include zstd/include "*.h")
 harvest(zstd/lib zstd/lib "*.a")
+harvest(shaderc shaderc "*")
+harvest(vulkan_headers vulkan "*")
+harvest_rpath_lib(vulkan_loader/lib vulkan/lib "*${SHAREDLIBEXT}*")
+harvest(vulkan_loader/loader vulkan/loader "*")
 
 if(UNIX AND NOT APPLE)
   harvest(libglu/lib mesa/lib "*${SHAREDLIBEXT}*")

build_files/build_environment/cmake/mesa.cmake

@@ -33,6 +33,8 @@ set(MESA_EXTRA_FLAGS
   # At some point we will likely want to support Wayland.
   # Disable for now since it's not officially supported.
   -Dplatforms=x11
+  # Needed to find the local expat.
+  --pkg-config-path=${LIBDIR}/expat/lib/pkgconfig
   --native-file ${BUILD_DIR}/mesa/tmp/native-file.ini
 )
 
@@ -53,4 +55,8 @@ add_dependencies(
   external_mesa
   ll
   external_zlib
+  # Run-time dependency.
+  external_expat
+  # Needed for `MESON`.
+  external_python_site_packages
 )

build_files/build_environment/cmake/openjpeg.cmake

@@ -39,8 +39,10 @@ if(MSVC)
   )
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_openjpeg_msvc after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/lib ${HARVEST_TARGET}/openjpeg/lib &&
+      COMMAND
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/lib ${HARVEST_TARGET}/openjpeg/lib &&
       ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/include ${HARVEST_TARGET}/openjpeg/include
+
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/options.cmake

@@ -117,7 +117,7 @@ else()
   set(LIBEXT ".a")
   set(LIBPREFIX "lib")
   set(MESON ${LIBDIR}/python/bin/meson)
-if(APPLE)
+  if(APPLE)
     set(SHAREDLIBEXT ".dylib")
 
     # Use same Xcode detection as Blender itself.

build_files/build_environment/cmake/pthreads.cmake

@@ -34,5 +34,4 @@ if(WIN32)
       DEPENDEES install
     )
   endif()
-
 endif()

build_files/build_environment/cmake/python_site_packages.cmake

@@ -5,7 +5,11 @@ if(WIN32 AND BUILD_MODE STREQUAL Debug)
   # zstandard is determined to build and link release mode libs in a debug
   # configuration, the only way to make it happy is to bend to its will
   # and give it a library to link with.
-  set(PIP_CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/python/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.lib ${LIBDIR}/python/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib)
+  set(
+    PIP_CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy
+    ${LIBDIR}/python/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.lib
+    ${LIBDIR}/python/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib
+  )
 else()
   set(PIP_CONFIGURE_COMMAND echo ".")
 endif()
@@ -15,9 +19,23 @@ ExternalProject_Add(external_python_site_packages
   CONFIGURE_COMMAND ${PIP_CONFIGURE_COMMAND}
   BUILD_COMMAND ""
   PREFIX ${BUILD_DIR}/site_packages
+
   # setuptools is downgraded to 63.2.0 (same as python 3.10.8) since numpy 1.23.x seemingly has
   # issues building on windows with the newer versions that ships with python 3.10.9+
-  INSTALL_COMMAND ${PYTHON_BINARY} -m pip install --no-cache-dir ${SITE_PACKAGES_EXTRA} setuptools==63.2.0 cython==${CYTHON_VERSION} idna==${IDNA_VERSION} charset-normalizer==${CHARSET_NORMALIZER_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} zstandard==${ZSTANDARD_VERSION} autopep8==${AUTOPEP8_VERSION} pycodestyle==${PYCODESTYLE_VERSION} toml==${TOML_VERSION} meson==${MESON_VERSION} --no-binary :all:
+  INSTALL_COMMAND ${PYTHON_BINARY} -m pip install --no-cache-dir ${SITE_PACKAGES_EXTRA}
+  setuptools==63.2.0
+  cython==${CYTHON_VERSION}
+  idna==${IDNA_VERSION}
+  charset-normalizer==${CHARSET_NORMALIZER_VERSION}
+  urllib3==${URLLIB3_VERSION}
+  certifi==${CERTIFI_VERSION}
+  requests==${REQUESTS_VERSION}
+  zstandard==${ZSTANDARD_VERSION}
+  autopep8==${AUTOPEP8_VERSION}
+  pycodestyle==${PYCODESTYLE_VERSION}
+  toml==${TOML_VERSION}
+  meson==${MESON_VERSION}
+  --no-binary :all:
 )
 
 if(USE_PIP_NUMPY)

build_files/build_environment/cmake/sndfile.cmake

@@ -1,9 +1,15 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 set(SNDFILE_EXTRA_ARGS)
-set(SNDFILE_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/flac/lib/pkgconfig:${mingw_LIBDIR}/opus/lib/pkgconfig:${mingw_LIBDIR})
+set(SNDFILE_ENV)
 
 if(WIN32)
+  set(SNDFILE_ENV "PKG_CONFIG_PATH=\
+${mingw_LIBDIR}/ogg/lib/pkgconfig:\
+${mingw_LIBDIR}/vorbis/lib/pkgconfig:\
+${mingw_LIBDIR}/flac/lib/pkgconfig:\
+${mingw_LIBDIR}/opus/lib/pkgconfig"
+)
   set(SNDFILE_ENV set ${SNDFILE_ENV} &&)
   # Shared for windows because static libs will drag in a libgcc dependency.
   set(SNDFILE_OPTIONS --disable-static --enable-shared )
@@ -11,6 +17,19 @@ else()
   set(SNDFILE_OPTIONS --enable-static --disable-shared )
 endif()
 
+if(UNIX AND NOT APPLE)
+  # NOTE(@campbellbarton): For some reason OPUS is alone in referencing the sub-directory,
+  # manipulate the package-config file to prevent this from happening.
+  # There is no problem with applying this change multiple times.
+  #
+  # Replace: Cflags: -I${includedir}/opus
+  # With:    Cflags: -I${includedir}
+  set(SNDFILE_ENV
+    sed -i s/{includedir}\\/opus/{includedir}/g ${LIBDIR}/opus/lib/pkgconfig/opus.pc &&
+    ${SNDFILE_ENV}
+  )
+endif()
+
 ExternalProject_Add(external_sndfile
   URL file://${PACKAGE_DIR}/${SNDFILE_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}

build_files/build_environment/cmake/spnav.cmake

@@ -5,7 +5,20 @@ ExternalProject_Add(external_spnav
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${SPNAV_HASH_TYPE}=${SPNAV_HASH}
   PREFIX ${BUILD_DIR}/spnav
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/spnav --disable-shared --enable-static --with-pic
+
+  CONFIGURE_COMMAND
+  ${CONFIGURE_ENV} &&
+  cd ${BUILD_DIR}/spnav/src/external_spnav/ &&
+  ${CONFIGURE_COMMAND}
+  --prefix=${LIBDIR}/spnav
+  # X11 is not needed as Blender polls the device as part of the GHOST event loop.
+  # This is used to support `3dxserv`, however this is no longer supported by 3DCONNEXION.
+  # Disable so building without X11 is supported (WAYLAND only).
+  --disable-x11
+  --disable-shared
+  --enable-static
+  --with-pic
+
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && make -j${MAKE_THREADS}
   INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && make install
   INSTALL_DIR ${LIBDIR}/spnav

build_files/build_environment/cmake/versions.cmake

@@ -195,9 +195,12 @@ set(TIFF_HASH_TYPE MD5)
 set(TIFF_FILE tiff-${TIFF_VERSION}.tar.gz)
 set(TIFF_CPE "cpe:2.3:a:libtiff:libtiff:${TIFF_VERSION}:*:*:*:*:*:*:*")
 
-set(OSL_VERSION 1.12.7.1)
-set(OSL_URI https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${OSL_VERSION}.tar.gz)
-set(OSL_HASH 53211da86c34ba6e0344998c1a6d219c)
+# Recent commit from 1.13.0.2 under development, which includes string table
+# changes that make the Cycles OptiX implementation work. Official 1.12 OSL
+# releases should also build but without OptiX support.
+set(OSL_VERSION 1a7670600c8b08c2443a78d03c8c27e9a1149140)
+set(OSL_URI https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/${OSL_VERSION}.tar.gz)
+set(OSL_HASH 7b6d6716b05d1addb92a8f47280bf77f)
 set(OSL_HASH_TYPE MD5)
 set(OSL_FILE OpenShadingLanguage-${OSL_VERSION}.tar.gz)
 
@@ -229,20 +232,34 @@ set(OPENVDB_HASH 64301c737e16b26c8f3085a31e6397e9)
 set(OPENVDB_HASH_TYPE MD5)
 set(OPENVDB_FILE openvdb-${OPENVDB_VERSION}.tar.gz)
 
+# ------------------------------------------------------------------------------
+# Python Modules
+
+# Needed by: `requests` module (so the version doesn't change on rebuild).
 set(IDNA_VERSION 3.3)
+# Needed by: `requests` module (so the version doesn't change on rebuild).
 set(CHARSET_NORMALIZER_VERSION 2.0.10)
+# Needed by: `requests` module (so the version doesn't change on rebuild).
 set(URLLIB3_VERSION 1.26.8)
 set(URLLIB3_CPE "cpe:2.3:a:urllib3:urllib3:${URLLIB3_VERSION}:*:*:*:*:*:*:*")
+# Needed by: Python's `requests` module (so add-ons can authenticate against trusted certificates).
 set(CERTIFI_VERSION 2021.10.8)
+# Needed by: Some of Blender's add-ons (to support convenient interaction with online services).
 set(REQUESTS_VERSION 2.27.1)
+# Needed by: Python's `numpy` module (used by some add-ons).
 set(CYTHON_VERSION 0.29.30)
-# The version of the zstd library used to build the Python package should match ZSTD_VERSION
+# Needed by: Python scripts that read `.blend` files, as files may use Z-standard compression.
+# The version of the ZSTD library used to build the Python package should match ZSTD_VERSION
 # defined below. At this time of writing, 0.17.0 was already released,
-# but built against zstd 1.5.1, while we use 1.5.0.
+# but built against ZSTD 1.5.1, while we use 1.5.0.
 set(ZSTANDARD_VERSION 0.16.0)
+# Auto-format Python source (developer tool, not used by Blender at run-time).
 set(AUTOPEP8_VERSION 1.6.0)
+# Needed by: `autopep8` (so the version doesn't change on rebuild).
 set(PYCODESTYLE_VERSION 2.8.0)
+# Needed by: `autopep8` (so the version doesn't change on rebuild).
 set(TOML_VERSION 0.10.2)
+# Build system for other packages (not used by Blender at run-time).
 set(MESON_VERSION 0.63.0)
 
 set(NUMPY_VERSION 1.23.5)
@@ -352,9 +369,9 @@ set(WEBP_HASH_TYPE MD5)
 set(WEBP_FILE libwebp-${WEBP_VERSION}.tar.gz)
 set(WEBP_CPE "cpe:2.3:a:webmproject:libwebp:${WEBP_VERSION}:*:*:*:*:*:*:*")
 
-set(SPNAV_VERSION 0.2.3)
-set(SPNAV_URI http://downloads.sourceforge.net/project/spacenav/spacenav%20library%20%28SDK%29/libspnav%20${SPNAV_VERSION}/libspnav-${SPNAV_VERSION}.tar.gz)
-set(SPNAV_HASH 44d840540d53326d4a119c0f1aa7bf0a)
+set(SPNAV_VERSION 1.1)
+set(SPNAV_URI https://github.com/FreeSpacenav/libspnav/releases/download/v${SPNAV_VERSION}/libspnav-${SPNAV_VERSION}.tar.gz)
+set(SPNAV_HASH 7c0032034672dfba3c4bb9b49a440e70)
 set(SPNAV_HASH_TYPE MD5)
 set(SPNAV_FILE libspnav-${SPNAV_VERSION}.tar.gz)
 

build_files/build_environment/cmake/vulkan.cmake

@@ -30,6 +30,17 @@ set(VULKAN_LOADER_EXTRA_ARGS
   -DVULKAN_HEADERS_INSTALL_DIR=${LIBDIR}/vulkan_headers
 )
 
+if(UNIX AND NOT APPLE)
+  # These are used in `cmake/FindWayland.cmake` from `external_vulkan_loader`.
+  # NOTE: When upgrading to CMAKE 3.22 we it would be cleaner to use: `PKG_CONFIG_ARGN`,
+  # so `pkgconfig` would find wayland.
+  set(VULKAN_LOADER_EXTRA_ARGS
+    ${VULKAN_LOADER_EXTRA_ARGS}
+    -DPKG_WAYLAND_INCLUDE_DIRS=${LIBDIR}/wayland/include
+    -DPKG_WAYLAND_LIBRARY_DIRS=${LIBDIR}/wayland/lib64
+  )
+endif()
+
 ExternalProject_Add(external_vulkan_loader
   URL file://${PACKAGE_DIR}/${VULKAN_LOADER_FILE}
   URL_HASH ${VULKAN_LOADER_HASH_TYPE}=${VULKAN_LOADER_HASH}
@@ -43,7 +54,12 @@ add_dependencies(
   external_vulkan_headers
 )
 
-if(WIN32)
+if(UNIX AND NOT APPLE)
+  add_dependencies(
+    external_vulkan_loader
+    external_wayland
+  )
+elseif(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_vulkan_loader after_install
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/vulkan_loader/ ${HARVEST_TARGET}/vulkan

build_files/build_environment/cmake/wayland.cmake

@@ -5,7 +5,6 @@ ExternalProject_Add(external_wayland
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${WAYLAND_HASH_TYPE}=${WAYLAND_HASH}
   PREFIX ${BUILD_DIR}/wayland
-  PATCH_COMMAND ${PATCH_CMD} -d ${BUILD_DIR}/wayland/src/external_wayland < ${PATCH_DIR}/wayland.diff
   # Use `-E` so the `PKG_CONFIG_PATH` can be defined to link against our own LIBEXPAT & LIBXML2.
   #
   # NOTE: passing link args "ffi/lib" should not be needed, but
@@ -24,4 +23,7 @@ add_dependencies(
   external_expat
   external_xml2
   external_ffi
+
+  # Needed for `MESON`.
+  external_python_site_packages
 )

build_files/build_environment/cmake/wayland_protocols.cmake

@@ -15,4 +15,6 @@ ExternalProject_Add(external_wayland_protocols
 add_dependencies(
   external_wayland_protocols
   external_wayland
+  # Needed for `MESON`.
+  external_python_site_packages
 )

build_files/build_environment/cmake/yamlcpp.cmake

@@ -10,7 +10,8 @@ if(WIN32)
   set(YAMLCPP_EXTRA_ARGS
     ${YAMLCPP_EXTRA_ARGS}
     -DBUILD_GMOCK=OFF
-    -DYAML_MSVC_SHARED_RT=ON)
+    -DYAML_MSVC_SHARED_RT=ON
+  )
 endif()
 
 ExternalProject_Add(external_yamlcpp

build_files/build_environment/darwin/set_rpath.py

@@ -6,6 +6,7 @@ import re
 import subprocess
 import sys
 
+
 # Strip version numbers from dependenciesm macOS notarizatiom fails
 # with version symlinks.
 def strip_lib_version(name):
@@ -14,6 +15,7 @@ def strip_lib_version(name):
     name = re.sub(r'(\.[0-9]+)+.cpython', '.cpython', name)
     return name
 
+
 rpath = sys.argv[1]
 file = sys.argv[2]
 

build_files/build_environment/linux/linux_rocky8_setup.sh

@@ -11,19 +11,31 @@ if [ `id -u` -ne 0 ]; then
    exit 1
 fi
 
-# yum-config-manager does not come in the default minimal install,
+# Required by: config manager command below to enable powertools.
+dnf install 'dnf-command(config-manager)'
+
+# Packages `ninja-build` and `meson` are not available unless CBR or PowerTools repositories are enabled.
+# See: https://wiki.rockylinux.org/rocky/repo/#notes-on-unlisted-repositories
+dnf config-manager --set-enabled powertools
+
+# Required by: epel-release has the patchelf and rubygem-asciidoctor packages
+dnf install epel-release
+
+# `yum-config-manager` does not come in the default minimal install,
 # so make sure it is installed and available.
 yum -y update
 yum -y install yum-utils
 
-# Install all the packages needed for a new toolchain.
+# Install all the packages needed for a new tool-chain.
 #
 # NOTE: Keep this separate from the packages install, since otherwise
-# older toolchain will be installed.
+# older tool-chain will be installed.
 yum -y update
-yum -y install epel-release
-yum -y install centos-release-scl
-yum -y install devtoolset-9
+yum -y install scl-utils
+yum -y install scl-utils-build
+
+# Currently this is defined by the VFX platform (CY2023), see: https://vfxplatform.com
+yum -y install gcc-toolset-11
 
 # Install packages needed for Blender's dependencies.
 PACKAGES_FOR_LIBS=(
@@ -47,19 +59,12 @@ PACKAGES_FOR_LIBS=(
     automake
     libtool
 
-    # Meta-build system used by various packages.
-    meson
+    # TODO: why is this needed?
+    patchelf
+
     # Builds generated by meson use Ninja for the actual build.
     ninja-build
 
-    # Required by Blender build option: `WITH_GHOST_X11`.
-    libXrandr-devel
-    libXinerama-devel
-    libXcursor-devel
-    libXi-devel
-    libX11-devel
-    libXt-devel
-
     # Required by Blender build option: `WITH_GHOST_WAYLAND`.
     mesa-libEGL-devel
     # Required by: Blender & `external_opensubdiv` (probably others).
@@ -79,52 +84,47 @@ PACKAGES_FOR_LIBS=(
     # Why are both needed?
     yasm
 
-    # Required by: `meson` (Python based build system).
-    python36
-    # Required by: `mako` (Python module used for building `external_mesa`)
-    python-setuptools
+    # NOTE(@campbellbarton): while `python39` is available, the default Python version is 3.6.
+    # This is used for the `python3-mako` package for e.g.
+    # So use the "default" system Python since it means it's most compatible with other packages.
+    python3
+    # Required by: `external_mesa`.
+    python3-mako
+
+    # Required by: `external_mesa`.
+    expat-devel
 
     # Required by: `external_igc` & `external_osl` as a build-time dependency.
     bison
     # Required by: `external_osl` as a build-time dependency.
     flex
-    # TODO: dependencies build without this, consider removal.
+
+    # Required by: `external_ispc`.
     ncurses-devel
+    # Required by: `external_ispc` (when building with CLANG).
+    libstdc++-static
 )
 
 # Additional packages needed for building Blender.
 PACKAGES_FOR_BLENDER=(
     # Required by Blender build option: `WITH_GHOST_WAYLAND`.
     libxkbcommon-devel
+
+    # Required by Blender build option: `WITH_GHOST_X11`.
+    libX11-devel
+    libXcursor-devel
+    libXi-devel
+    libXinerama-devel
+    libXrandr-devel
+    libXt-devel
+    libXxf86vm-devel
 )
 
 yum -y install -y ${PACKAGES_FOR_LIBS[@]} ${PACKAGES_FOR_BLENDER[@]}
 
-# Dependencies for Mesa
-yum -y install expat-devel
-python3 -m pip install mako
-
-# Dependencies for pip (needed for buildbot-worker).
-yum -y install python36-pip python36-devel
+# Dependencies for pip (needed for `buildbot-worker`), uses Python3.6.
+yum -y install python3 python3-pip python3-devel
 
 # Dependencies for asound.
 yum -y install -y  \
     alsa-lib-devel pulseaudio-libs-devel
-
-alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake 10  \
-    --slave /usr/local/bin/ctest ctest /usr/bin/ctest  \
-    --slave /usr/local/bin/cpack cpack /usr/bin/cpack  \
-    --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake  \
-    --family cmake
-
-alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20  \
-    --slave /usr/local/bin/ctest ctest /usr/bin/ctest3  \
-    --slave /usr/local/bin/cpack cpack /usr/bin/cpack3  \
-    --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3  \
-    --family cmake
-
-alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20  \
-    --slave /usr/local/bin/ctest ctest /usr/bin/ctest3  \
-    --slave /usr/local/bin/cpack cpack /usr/bin/cpack3  \
-    --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3  \
-    --family cmake

build_files/build_environment/patches/wayland.diff

@@ -1,11 +0,0 @@
---- meson.build.orig	2022-06-30 22:59:11.000000000 +0100
-+++ meson.build	2022-09-27 13:21:26.428517668 +0100
-@@ -2,7 +2,7 @@
- 	'wayland', 'c',
- 	version: '1.21.0',
- 	license: 'MIT',
--	meson_version: '>= 0.56.0',
-+	meson_version: '>= 0.55.1',
- 	default_options: [
- 		'warning_level=2',
- 		'buildtype=debugoptimized',

build_files/buildbot/config/blender_linux.cmake

@@ -4,10 +4,9 @@
 
 include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_release.cmake")
 
-message(STATUS "Building in CentOS 7 64bit environment")
+message(STATUS "Building in Rocky 8 Linux 64bit environment")
 
-set(LIBDIR_NAME "linux_centos7_x86_64")
-set(WITH_CXX11_ABI           OFF CACHE BOOL "" FORCE)
+set(LIBDIR_NAME "linux_x86_64_glibc_228")
 
 # ######## Linux-specific build options ########
 # Options which are specific to Linux-only platforms

build_files/cmake/platform/platform_unix.cmake

@@ -10,16 +10,15 @@ if(NOT DEFINED LIBDIR)
   string(TOLOWER ${LIBDIR_NAME} LIBDIR_NAME)
   set(LIBDIR_NATIVE_ABI ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_NAME})
 
-  # Path to precompiled libraries with known CentOS 7 ABI.
-  set(LIBDIR_CENTOS7_ABI ${CMAKE_SOURCE_DIR}/../lib/linux_centos7_x86_64)
+  # Path to precompiled libraries with known glibc 2.28 ABI.
+  set(LIBDIR_GLIBC228_ABI ${CMAKE_SOURCE_DIR}/../lib/linux_x86_64_glibc_228)
 
   # Choose the best suitable libraries.
   if(EXISTS ${LIBDIR_NATIVE_ABI})
     set(LIBDIR ${LIBDIR_NATIVE_ABI})
     set(WITH_LIBC_MALLOC_HOOK_WORKAROUND True)
-  elseif(EXISTS ${LIBDIR_CENTOS7_ABI})
-    set(LIBDIR ${LIBDIR_CENTOS7_ABI})
-    set(WITH_CXX11_ABI OFF)
+  elseif(EXISTS ${LIBDIR_GLIBC228_ABI})
+    set(LIBDIR ${LIBDIR_GLIBC228_ABI})
     if(WITH_MEM_JEMALLOC)
       # jemalloc provides malloc hooks.
       set(WITH_LIBC_MALLOC_HOOK_WORKAROUND False)
@@ -30,7 +29,7 @@ if(NOT DEFINED LIBDIR)
 
   # Avoid namespace pollustion.
   unset(LIBDIR_NATIVE_ABI)
-  unset(LIBDIR_CENTOS7_ABI)
+  unset(LIBDIR_GLIBC228_ABI)
 endif()
 
 # Support restoring this value once pre-compiled libraries have been handled.
@@ -330,10 +329,8 @@ if(WITH_OPENVDB)
   find_package(OpenVDB)
   set_and_warn_library_found("OpenVDB" OPENVDB_FOUND WITH_OPENVDB)
 
-  if(OPENVDB_FOUND)
+  if(WITH_OPENVDB)
     add_bundled_libraries(openvdb/lib)
-  find_package_wrapper(Blosc)
-    set_and_warn_library_found("Blosc" BLOSC_FOUND WITH_OPENVDB_BLOSC)
   endif()
 endif()
 

build_files/config/pipeline_config.yaml

@@ -30,7 +30,7 @@ update-code:
             linux-x86_64:
                 branch: trunk
                 commit_id: HEAD
-                path: lib/linux_centos7_x86_64
+                path: lib/linux_x86_64_glibc_228
             windows-amd64:
                 branch: trunk
                 commit_id: HEAD

build_files/utils/make_update.py

@@ -41,7 +41,7 @@ def parse_arguments() -> argparse.Namespace:
     parser.add_argument("--svn-command", default="svn")
     parser.add_argument("--svn-branch", default=None)
     parser.add_argument("--git-command", default="git")
-    parser.add_argument("--use-centos-libraries", action="store_true")
+    parser.add_argument("--use-linux-libraries", action="store_true")
     return parser.parse_args()
 
 
@@ -71,8 +71,8 @@ def svn_update(args: argparse.Namespace, release_version: Optional[str]) -> None
         # this script is bundled as part of the precompiled libraries. However it
         # is used by the buildbot.
         lib_platform = "win64_vc15"
-    elif args.use_centos_libraries:
-        lib_platform = "linux_centos7_x86_64"
+    elif args.use_linux_libraries:
+        lib_platform = "linux_x86_64_glibc_228"
     else:
         # No precompiled libraries for Linux.
         lib_platform = None

doc/python_api/rst_from_bmesh_opdefines.py

@@ -370,7 +370,7 @@ def main():
 
         args_in_wash = get_args_wash(args_in, args_in_index, False)
 
-        fw(".. function:: %s(bm, %s)\n\n" % (b[0], ", ".join([print_arg_in(arg) for arg in args_in_wash])))
+        fw(".. function:: %s(bm, %s)\n\n" % (b[0], ", ".join([arg_name_with_default(arg) for arg in args_in_wash])))
 
         # -- wash the comment
         comment_washed = []
@@ -423,8 +423,8 @@ def main():
     print(OUT_RST)
 
 
-def print_arg_in(arg):
-    (name, default_value, _, _) = arg
+def arg_name_with_default(arg):
+    name, default_value, _, _ = arg
     if default_value is None:
         return name
     return name + '=' + default_value

intern/cycles/blender/addon/presets.py

@@ -92,7 +92,7 @@ class AddPresetPerformance(AddPresetBase, Operator):
 
     preset_defines = [
         "render = bpy.context.scene.render",
-        "cycles = bpy.context.scene.cycles"
+        "cycles = bpy.context.scene.cycles",
     ]
 
     preset_values = [

intern/cycles/blender/addon/properties.py

@@ -82,8 +82,8 @@ enum_use_layer_samples = (
 )
 
 enum_sampling_pattern = (
-    ('SOBOL', "Sobol-Burley", "Use Sobol-Burley random sampling pattern", 0),
-    ('PROGRESSIVE_MULTI_JITTER', "Progressive Multi-Jitter", "Use Progressive Multi-Jitter random sampling pattern", 1),
+    ('SOBOL_BURLEY', "Sobol-Burley", "Use on-the-fly computed Owen-scrambled Sobol for random sampling", 0),
+    ('TABULATED_SOBOL', "Tabulated Sobol", "Use precomputed tables of Owen-scrambled Sobol for random sampling", 1),
 )
 
 enum_emission_sampling = (
@@ -412,9 +412,9 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
 
     sampling_pattern: EnumProperty(
         name="Sampling Pattern",
-        description="Random sampling pattern used by the integrator. When adaptive sampling is enabled, Progressive Multi-Jitter is always used instead of Sobol-Burley",
+        description="Random sampling pattern used by the integrator",
         items=enum_sampling_pattern,
-        default='PROGRESSIVE_MULTI_JITTER',
+        default='TABULATED_SOBOL',
     )
 
     scrambling_distance: FloatProperty(

intern/cycles/blender/addon/ui.py

@@ -364,16 +364,13 @@ class CYCLES_RENDER_PT_sampling_advanced(CyclesButtonsPanel, Panel):
         row.prop(cscene, "seed")
         row.prop(cscene, "use_animated_seed", text="", icon='TIME')
 
-        col = layout.column(align=True)
-        col.prop(cscene, "sampling_pattern", text="Pattern")
-
         col = layout.column(align=True)
         col.prop(cscene, "sample_offset")
 
         layout.separator()
 
         heading = layout.column(align=True, heading="Scrambling Distance")
-        heading.active = cscene.sampling_pattern != 'SOBOL'
+        heading.active = cscene.sampling_pattern != 'TABULATED_SOBOL'
         heading.prop(cscene, "auto_scrambling_distance", text="Automatic")
         heading.prop(cscene, "preview_scrambling_distance", text="Viewport")
         heading.prop(cscene, "scrambling_distance", text="Multiplier")
@@ -396,11 +393,22 @@ class CYCLES_RENDER_PT_sampling_lights(CyclesButtonsPanel, Panel):
     bl_parent_id = "CYCLES_RENDER_PT_sampling"
     bl_options = {'DEFAULT_CLOSED'}
 
-    def draw_header(self, context):
+    def draw(self, context):
         layout = self.layout
         scene = context.scene
         cscene = scene.cycles
 
+        col.prop(cscene, "use_light_tree")
+        sub = col.row()
+        sub.prop(cscene, "light_sampling_threshold", text="Light Threshold")
+        sub.active = not cscene.use_light_tree
+
+
+class CYCLES_RENDER_PT_sampling_debug(CyclesDebugButtonsPanel, Panel):
+    bl_label = "Debug"
+    bl_parent_id = "CYCLES_RENDER_PT_sampling"
+    bl_options = {'DEFAULT_CLOSED'}
+
     def draw(self, context):
         layout = self.layout
         layout.use_property_split = True
@@ -410,10 +418,7 @@ class CYCLES_RENDER_PT_sampling_lights(CyclesButtonsPanel, Panel):
         cscene = scene.cycles
 
         col = layout.column(align=True)
-        col.prop(cscene, "use_light_tree")
-        sub = col.row()
-        sub.prop(cscene, "light_sampling_threshold", text="Light Threshold")
-        sub.active = not cscene.use_light_tree
+        col.prop(cscene, "sampling_pattern", text="Pattern")
 
 
 class CYCLES_RENDER_PT_subdivision(CyclesButtonsPanel, Panel):
@@ -2391,6 +2396,7 @@ classes = (
     CYCLES_RENDER_PT_sampling_path_guiding_debug,
     CYCLES_RENDER_PT_sampling_lights,
     CYCLES_RENDER_PT_sampling_advanced,
+    CYCLES_RENDER_PT_sampling_debug,
     CYCLES_RENDER_PT_light_paths,
     CYCLES_RENDER_PT_light_paths_max_bounces,
     CYCLES_RENDER_PT_light_paths_clamping,

intern/cycles/blender/addon/version_update.py

@@ -228,7 +228,7 @@ def do_versions(self):
                     cscene.use_preview_denoising = False
                 if not cscene.is_property_set("sampling_pattern") or \
                    cscene.get('sampling_pattern') >= 2:
-                    cscene.sampling_pattern = 'PROGRESSIVE_MULTI_JITTER'
+                    cscene.sampling_pattern = 'TABULATED_SOBOL'
 
                 # Removal of square samples.
                 cscene = scene.cycles
@@ -241,6 +241,12 @@ def do_versions(self):
                         layer.samples *= layer.samples
                     cscene["use_square_samples"] = False
 
+            # Disable light tree for existing scenes.
+            if version <= (3, 5, 3):
+                cscene = scene.cycles
+                if not cscene.is_property_set("use_light_tree"):
+                    cscene.use_light_tree = False
+
         # Lamps
         for light in bpy.data.lights:
             if light.library not in libraries:

intern/cycles/blender/display_driver.cpp

@@ -57,7 +57,6 @@ int BlenderDisplayShader::get_tex_coord_attrib_location()
 
 /* TODO move shaders to standalone .glsl file. */
 static const char *FALLBACK_VERTEX_SHADER =
-    "#version 330\n"
     "uniform vec2 fullscreen;\n"
     "in vec2 texCoord;\n"
     "in vec2 pos;\n"
@@ -75,7 +74,6 @@ static const char *FALLBACK_VERTEX_SHADER =
     "}\n\0";
 
 static const char *FALLBACK_FRAGMENT_SHADER =
-    "#version 330\n"
     "uniform sampler2D image_texture;\n"
     "in vec2 texCoord_interp;\n"
     "out vec4 fragColor;\n"

intern/cycles/blender/mesh.cpp

@@ -367,13 +367,11 @@ static void attr_create_generic(Scene *scene,
 {
   AttributeSet &attributes = (subdivision) ? mesh->subd_attributes : mesh->attributes;
   static const ustring u_velocity("velocity");
-
-  int attribute_index = 0;
-  int render_color_index = b_mesh.attributes.render_color_index();
+  const ustring default_color_name{b_mesh.attributes.default_color_name().c_str()};
 
   for (BL::Attribute &b_attribute : b_mesh.attributes) {
     const ustring name{b_attribute.name().c_str()};
-    const bool is_render_color = (attribute_index++ == render_color_index);
+    const bool is_render_color = name == default_color_name;
 
     if (need_motion && name == u_velocity) {
       attr_create_motion(mesh, b_attribute, motion_scale);

intern/cycles/blender/sync.cpp

@@ -357,7 +357,7 @@ void BlenderSync::sync_integrator(BL::ViewLayer &b_view_layer, bool background)
   }
 
   SamplingPattern sampling_pattern = (SamplingPattern)get_enum(
-      cscene, "sampling_pattern", SAMPLING_NUM_PATTERNS, SAMPLING_PATTERN_PMJ);
+      cscene, "sampling_pattern", SAMPLING_NUM_PATTERNS, SAMPLING_PATTERN_TABULATED_SOBOL);
   integrator->set_sampling_pattern(sampling_pattern);
 
   int samples = 1;

intern/cycles/blender/util.h

@@ -113,6 +113,7 @@ static inline BL::Mesh object_to_mesh(BL::BlendData & /*data*/,
 
   if ((bool)mesh && subdivision_type == Mesh::SUBDIVISION_NONE) {
     if (mesh.use_auto_smooth()) {
+      mesh.calc_normals_split();
       mesh.split_faces(false);
     }
 

intern/cycles/device/cuda/device_impl.cpp

@@ -952,6 +952,9 @@ void CUDADevice::tex_alloc(device_texture &mem)
     case EXTENSION_CLIP:
       address_mode = CU_TR_ADDRESS_MODE_BORDER;
       break;
+    case EXTENSION_MIRROR:
+      address_mode = CU_TR_ADDRESS_MODE_MIRROR;
+      break;
     default:
       assert(0);
       break;

intern/cycles/device/hip/device.cpp

@@ -163,10 +163,10 @@ void device_hip_info(vector<DeviceInfo> &devices)
     /* If device has a kernel timeout and no compute preemption, we assume
      * it is connected to a display and will freeze the display while doing
      * computations. */
-    int timeout_attr = 0, preempt_attr = 0;
+    int timeout_attr = 0;
     hipDeviceGetAttribute(&timeout_attr, hipDeviceAttributeKernelExecTimeout, num);
 
-    if (timeout_attr && !preempt_attr) {
+    if (timeout_attr) {
       VLOG_INFO << "Device is recognized as display.";
       info.description += " (Display)";
       info.display_device = true;

intern/cycles/device/hip/device_impl.cpp

@@ -909,6 +909,9 @@ void HIPDevice::tex_alloc(device_texture &mem)
        * because it's unsupported in HIP. */
       address_mode = hipAddressModeClamp;
       break;
+    case EXTENSION_MIRROR:
+      address_mode = hipAddressModeMirror;
+      break;
     default:
       assert(0);
       break;

intern/cycles/device/metal/device_impl.mm

@@ -856,7 +856,7 @@ void MetalDevice::tex_alloc(device_texture &mem)
   /* sampler_index maps into the GPU's constant 'metal_samplers' array */
   uint64_t sampler_index = mem.info.extension;
   if (mem.info.interpolation != INTERPOLATION_CLOSEST) {
-    sampler_index += 3;
+    sampler_index += 4;
   }
 
   /* Image Texture Storage */

intern/cycles/hydra/field.cpp

@@ -26,9 +26,12 @@ class HdCyclesVolumeLoader : public VDBImageLoader {
   HdCyclesVolumeLoader(const std::string &filePath, const std::string &gridName)
       : VDBImageLoader(gridName)
   {
+    /* Disably delay loading and file copying, this has poor performance
+     * on network drivers. */
+    const bool delay_load = false;
     openvdb::io::File file(filePath);
     file.setCopyMaxBytes(0);
-    if (file.open()) {
+    if (file.open(delay_load)) {
       grid = file.readGrid(gridName);
     }
   }

intern/cycles/kernel/CMakeLists.txt

@@ -299,12 +299,12 @@ set(SRC_KERNEL_LIGHT_HEADERS
 )
 
 set(SRC_KERNEL_SAMPLE_HEADERS
-  sample/jitter.h
   sample/lcg.h
   sample/mapping.h
   sample/mis.h
   sample/pattern.h
   sample/sobol_burley.h
+  sample/tabulated_sobol.h
   sample/util.h
 )
 

intern/cycles/kernel/data_arrays.h

@@ -77,7 +77,7 @@ KERNEL_DATA_ARRAY(KernelShader, shaders)
 /* lookup tables */
 KERNEL_DATA_ARRAY(float, lookup_table)
 
-/* PMJ sample pattern */
+/* tabulated Sobol sample pattern */
 KERNEL_DATA_ARRAY(float, sample_pattern_lut)
 
 /* image textures */

intern/cycles/kernel/data_template.h

@@ -179,7 +179,8 @@ KERNEL_STRUCT_MEMBER(integrator, float, sample_clamp_indirect)
 KERNEL_STRUCT_MEMBER(integrator, int, use_caustics)
 /* Sampling pattern. */
 KERNEL_STRUCT_MEMBER(integrator, int, sampling_pattern)
-KERNEL_STRUCT_MEMBER(integrator, int, pmj_sequence_size)
+KERNEL_STRUCT_MEMBER(integrator, int, tabulated_sobol_sequence_size)
+KERNEL_STRUCT_MEMBER(integrator, int, sobol_index_mask)
 KERNEL_STRUCT_MEMBER(integrator, float, scrambling_distance)
 /* Volume render. */
 KERNEL_STRUCT_MEMBER(integrator, int, use_volumes)
@@ -204,7 +205,6 @@ KERNEL_STRUCT_MEMBER(integrator, int, use_guiding_mis_weights)
 
 /* Padding. */
 KERNEL_STRUCT_MEMBER(integrator, int, pad1)
-KERNEL_STRUCT_MEMBER(integrator, int, pad2)
 KERNEL_STRUCT_END(KernelIntegrator)
 
 /* SVM. For shader specialization. */

intern/cycles/kernel/device/cpu/image.h

@@ -202,6 +202,14 @@ template<typename TexT, typename OutT = float4> struct TextureInterpolator {
     return clamp(x, 0, width - 1);
   }
 
+  static ccl_always_inline int wrap_mirror(int x, int width)
+  {
+    const int m = abs(x + (x < 0)) % (2 * width);
+    if (m >= width)
+      return 2 * width - m - 1;
+    return m;
+  }
+
   /* ********  2D interpolation ******** */
 
   static ccl_always_inline OutT interp_closest(const TextureInfo &info, float x, float y)
@@ -226,6 +234,10 @@ template<typename TexT, typename OutT = float4> struct TextureInterpolator {
         ix = wrap_clamp(ix, width);
         iy = wrap_clamp(iy, height);
         break;
+      case EXTENSION_MIRROR:
+        ix = wrap_mirror(ix, width);
+        iy = wrap_mirror(iy, height);
+        break;
       default:
         kernel_assert(0);
         return zero();
@@ -268,6 +280,12 @@ template<typename TexT, typename OutT = float4> struct TextureInterpolator {
         niy = wrap_clamp(iy + 1, height);
         iy = wrap_clamp(iy, height);
         break;
+      case EXTENSION_MIRROR:
+        nix = wrap_mirror(ix + 1, width);
+        ix = wrap_mirror(ix, width);
+        niy = wrap_mirror(iy + 1, height);
+        iy = wrap_mirror(iy, height);
+        break;
       default:
         kernel_assert(0);
         return zero();
@@ -331,6 +349,17 @@ template<typename TexT, typename OutT = float4> struct TextureInterpolator {
         nniy = wrap_clamp(iy + 2, height);
         iy = wrap_clamp(iy, height);
         break;
+      case EXTENSION_MIRROR:
+        pix = wrap_mirror(ix - 1, width);
+        nix = wrap_mirror(ix + 1, width);
+        nnix = wrap_mirror(ix + 2, width);
+        ix = wrap_mirror(ix, width);
+
+        piy = wrap_mirror(iy - 1, height);
+        niy = wrap_mirror(iy + 1, height);
+        nniy = wrap_mirror(iy + 2, height);
+        iy = wrap_mirror(iy, height);
+        break;
       default:
         kernel_assert(0);
         return zero();
@@ -403,6 +432,11 @@ template<typename TexT, typename OutT = float4> struct TextureInterpolator {
         iy = wrap_clamp(iy, height);
         iz = wrap_clamp(iz, depth);
         break;
+      case EXTENSION_MIRROR:
+        ix = wrap_mirror(ix, width);
+        iy = wrap_mirror(iy, height);
+        iz = wrap_mirror(iz, depth);
+        break;
       default:
         kernel_assert(0);
         return zero();
@@ -480,6 +514,16 @@ template<typename TexT, typename OutT = float4> struct TextureInterpolator {
         niz = wrap_clamp(iz + 1, depth);
         iz = wrap_clamp(iz, depth);
         break;
+      case EXTENSION_MIRROR:
+        nix = wrap_mirror(ix + 1, width);
+        ix = wrap_mirror(ix, width);
+
+        niy = wrap_mirror(iy + 1, height);
+        iy = wrap_mirror(iy, height);
+
+        niz = wrap_mirror(iz + 1, depth);
+        iz = wrap_mirror(iz, depth);
+        break;
       default:
         kernel_assert(0);
         return zero();
@@ -595,6 +639,22 @@ template<typename TexT, typename OutT = float4> struct TextureInterpolator {
         nniz = wrap_clamp(iz + 2, depth);
         iz = wrap_clamp(iz, depth);
         break;
+      case EXTENSION_MIRROR:
+        pix = wrap_mirror(ix - 1, width);
+        nix = wrap_mirror(ix + 1, width);
+        nnix = wrap_mirror(ix + 2, width);
+        ix = wrap_mirror(ix, width);
+
+        piy = wrap_mirror(iy - 1, height);
+        niy = wrap_mirror(iy + 1, height);
+        nniy = wrap_mirror(iy + 2, height);
+        iy = wrap_mirror(iy, height);
+
+        piz = wrap_mirror(iz - 1, depth);
+        niz = wrap_mirror(iz + 1, depth);
+        nniz = wrap_mirror(iz + 2, depth);
+        iz = wrap_mirror(iz, depth);
+        break;
       default:
         kernel_assert(0);
         return zero();

intern/cycles/kernel/device/metal/compat.h

@@ -301,10 +301,12 @@ enum SamplerType {
   SamplerFilterNearest_AddressRepeat,
   SamplerFilterNearest_AddressClampEdge,
   SamplerFilterNearest_AddressClampZero,
+  SamplerFilterNearest_AddressMirroredRepeat,
 
   SamplerFilterLinear_AddressRepeat,
   SamplerFilterLinear_AddressClampEdge,
   SamplerFilterLinear_AddressClampZero,
+  SamplerFilterLinear_AddressMirroredRepeat,
 
   SamplerCount
 };
@@ -313,7 +315,9 @@ constant constexpr array<sampler, SamplerCount> metal_samplers = {
     sampler(address::repeat, filter::nearest),
     sampler(address::clamp_to_edge, filter::nearest),
     sampler(address::clamp_to_zero, filter::nearest),
+    sampler(address::mirrored_repeat, filter::nearest),
     sampler(address::repeat, filter::linear),
     sampler(address::clamp_to_edge, filter::linear),
     sampler(address::clamp_to_zero, filter::linear),
+    sampler(address::mirrored_repeat, filter::linear),
 };

intern/cycles/kernel/device/metal/context_begin.h

@@ -47,9 +47,11 @@ class MetalKernelContext {
         case 0: return texture_array[tid].tex.sample(sampler(address::repeat, filter::nearest), coords);
         case 1: return texture_array[tid].tex.sample(sampler(address::clamp_to_edge, filter::nearest), coords);
         case 2: return texture_array[tid].tex.sample(sampler(address::clamp_to_zero, filter::nearest), coords);
-        case 3: return texture_array[tid].tex.sample(sampler(address::repeat, filter::linear), coords);
-        case 4: return texture_array[tid].tex.sample(sampler(address::clamp_to_edge, filter::linear), coords);
-        case 5: return texture_array[tid].tex.sample(sampler(address::clamp_to_zero, filter::linear), coords);
+        case 3: return texture_array[tid].tex.sample(sampler(address::mirrored_repeat, filter::nearest), coords);
+        case 4: return texture_array[tid].tex.sample(sampler(address::repeat, filter::linear), coords);
+        case 5: return texture_array[tid].tex.sample(sampler(address::clamp_to_edge, filter::linear), coords);
+        case 6: return texture_array[tid].tex.sample(sampler(address::clamp_to_zero, filter::linear), coords);
+        case 7: return texture_array[tid].tex.sample(sampler(address::mirrored_repeat, filter::linear), coords);
       }
     }
 #endif

intern/cycles/kernel/device/oneapi/image.h

@@ -24,6 +24,14 @@ ccl_device_inline int svm_image_texture_wrap_clamp(int x, int width)
   return clamp(x, 0, width - 1);
 }
 
+ccl_device_inline int svm_image_texture_wrap_mirror(int x, int width)
+{
+  const int m = abs(x + (x < 0)) % (2 * width);
+  if (m >= width)
+    return 2 * width - m - 1;
+  return m;
+}
+
 ccl_device_inline float4 svm_image_texture_read(const TextureInfo &info, int x, int y, int z)
 {
   const int data_offset = x + info.width * y + info.width * info.height * z;
@@ -85,6 +93,10 @@ ccl_device_inline float4 svm_image_texture_read_2d(int id, int x, int y)
     x = svm_image_texture_wrap_clamp(x, info.width);
     y = svm_image_texture_wrap_clamp(y, info.height);
   }
+  else if (info.extension == EXTENSION_MIRROR) {
+    x = svm_image_texture_wrap_mirror(x, info.width);
+    y = svm_image_texture_wrap_mirror(y, info.height);
+  }
   else {
     if (x < 0 || x >= info.width || y < 0 || y >= info.height) {
       return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
@@ -109,6 +121,11 @@ ccl_device_inline float4 svm_image_texture_read_3d(int id, int x, int y, int z)
     y = svm_image_texture_wrap_clamp(y, info.height);
     z = svm_image_texture_wrap_clamp(z, info.depth);
   }
+  else if (info.extension == EXTENSION_MIRROR) {
+    x = svm_image_texture_wrap_mirror(x, info.width);
+    y = svm_image_texture_wrap_mirror(y, info.height);
+    z = svm_image_texture_wrap_mirror(z, info.depth);
+  }
   else {
     if (x < 0 || x >= info.width || y < 0 || y >= info.height || z < 0 || z >= info.depth) {
       return make_float4(0.0f, 0.0f, 0.0f, 0.0f);

intern/cycles/kernel/integrator/init_from_camera.h

@@ -26,18 +26,22 @@ ccl_device_inline void integrate_camera_sample(KernelGlobals kg,
   const float2 rand_filter = (sample == 0) ? make_float2(0.5f, 0.5f) :
                                              path_rng_2D(kg, rng_hash, sample, PRNG_FILTER);
 
-  /* Depth of field sampling. */
-  const float2 rand_lens = (kernel_data.cam.aperturesize > 0.0f) ?
-                               path_rng_2D(kg, rng_hash, sample, PRNG_LENS) :
-                               zero_float2();
-
-  /* Motion blur time sampling. */
-  const float rand_time = (kernel_data.cam.shuttertime != -1.0f) ?
-                              path_rng_1D(kg, rng_hash, sample, PRNG_TIME) :
-                              0.0f;
+  /* Motion blur (time) and depth of field (lens) sampling. (time, lens_x, lens_y) */
+  const float3 rand_time_lens = (kernel_data.cam.shuttertime != -1.0f ||
+                                 kernel_data.cam.aperturesize > 0.0f) ?
+                                    path_rng_3D(kg, rng_hash, sample, PRNG_LENS_TIME) :
+                                    zero_float3();
 
   /* Generate camera ray. */
-  camera_sample(kg, x, y, rand_filter.x, rand_filter.y, rand_lens.x, rand_lens.y, rand_time, ray);
+  camera_sample(kg,
+                x,
+                y,
+                rand_filter.x,
+                rand_filter.y,
+                rand_time_lens.y,
+                rand_time_lens.z,
+                rand_time_lens.x,
+                ray);
 }
 
 /* Return false to indicate that this pixel is finished.

intern/cycles/kernel/integrator/path_state.h

@@ -336,6 +336,14 @@ ccl_device_inline float2 path_state_rng_2D(KernelGlobals kg,
       kg, rng_state->rng_hash, rng_state->sample, rng_state->rng_offset + dimension);
 }
 
+ccl_device_inline float3 path_state_rng_3D(KernelGlobals kg,
+                                           ccl_private const RNGState *rng_state,
+                                           const int dimension)
+{
+  return path_rng_3D(
+      kg, rng_state->rng_hash, rng_state->sample, rng_state->rng_offset + dimension);
+}
+
 ccl_device_inline float path_branched_rng_1D(KernelGlobals kg,
                                              ccl_private const RNGState *rng_state,
                                              const int branch,
@@ -360,6 +368,18 @@ ccl_device_inline float2 path_branched_rng_2D(KernelGlobals kg,
                      rng_state->rng_offset + dimension);
 }
 
+ccl_device_inline float3 path_branched_rng_3D(KernelGlobals kg,
+                                              ccl_private const RNGState *rng_state,
+                                              const int branch,
+                                              const int num_branches,
+                                              const int dimension)
+{
+  return path_rng_3D(kg,
+                     rng_state->rng_hash,
+                     rng_state->sample * num_branches + branch,
+                     rng_state->rng_offset + dimension);
+}
+
 /* Utility functions to get light termination value,
  * since it might not be needed in many cases.
  */

intern/cycles/kernel/integrator/shade_surface.h

@@ -147,10 +147,11 @@ ccl_device_forceinline void integrate_surface_direct_light(KernelGlobals kg,
   {
     const uint32_t path_flag = INTEGRATOR_STATE(state, path, flag);
     const uint bounce = INTEGRATOR_STATE(state, path, bounce);
-    const float2 rand_light = path_state_rng_2D(kg, rng_state, PRNG_LIGHT);
+    const float3 rand_light = path_state_rng_3D(kg, rng_state, PRNG_LIGHT);
 
     if (!light_sample_from_position(kg,
                                     rng_state,
+                                    rand_light.z,
                                     rand_light.x,
                                     rand_light.y,
                                     sd->time,

intern/cycles/kernel/integrator/shade_volume.h

@@ -702,10 +702,11 @@ ccl_device_forceinline bool integrate_volume_equiangular_sample_light(
   /* Sample position on a light. */
   const uint32_t path_flag = INTEGRATOR_STATE(state, path, flag);
   const uint bounce = INTEGRATOR_STATE(state, path, bounce);
-  const float2 rand_light = path_state_rng_2D(kg, rng_state, PRNG_LIGHT);
+  const float3 rand_light = path_state_rng_3D(kg, rng_state, PRNG_LIGHT);
 
   LightSample ls ccl_optional_struct_init;
   if (!light_sample_from_volume_segment(kg,
+                                        rand_light.z,
                                         rand_light.x,
                                         rand_light.y,
                                         sd->time,
@@ -765,10 +766,11 @@ ccl_device_forceinline void integrate_volume_direct_light(
   {
     const uint32_t path_flag = INTEGRATOR_STATE(state, path, flag);
     const uint bounce = INTEGRATOR_STATE(state, path, bounce);
-    const float2 rand_light = path_state_rng_2D(kg, rng_state, PRNG_LIGHT);
+    const float3 rand_light = path_state_rng_3D(kg, rng_state, PRNG_LIGHT);
 
     if (!light_sample_from_position(kg,
                                     rng_state,
+                                    rand_light.z,
                                     rand_light.x,
                                     rand_light.y,
                                     sd->time,

intern/cycles/kernel/light/area.h

@@ -255,8 +255,9 @@ ccl_device_inline bool area_light_sample(const ccl_global KernelLight *klight,
   float3 inplane;
 
   if (in_volume_segment) {
-    /* FIXME: handle rectangular light. */
-    inplane = ellipse_sample(axis_u * len_u * 0.5f, axis_v * len_v * 0.5f, randu, randv);
+    inplane = sample_rectangle ?
+                  rectangle_sample(axis_u * len_u * 0.5f, axis_v * len_v * 0.5f, randu, randv) :
+                  ellipse_sample(axis_u * len_u * 0.5f, axis_v * len_v * 0.5f, randu, randv);
     ls->P += inplane;
     ls->pdf = invarea;
   }

intern/cycles/kernel/light/common.h

@@ -30,8 +30,13 @@ typedef struct LightSample {
 
 ccl_device_inline float3 ellipse_sample(float3 ru, float3 rv, float randu, float randv)
 {
-  to_unit_disk(&randu, &randv);
-  return ru * randu + rv * randv;
+  const float2 rand = concentric_sample_disk(randu, randv);
+  return ru * rand.x + rv * rand.y;
+}
+
+ccl_device_inline float3 rectangle_sample(float3 ru, float3 rv, float randu, float randv)
+{
+  return ru * (2.0f * randu - 1.0f) + rv * (2.0f * randv - 1.0f);
 }
 
 ccl_device float3 disk_light_sample(float3 v, float randu, float randv)

intern/cycles/kernel/light/distribution.h

@@ -11,7 +11,7 @@ CCL_NAMESPACE_BEGIN
 /* Simple CDF based sampling over all lights in the scene, without taking into
  * account shading position or normal. */
 
-ccl_device int light_distribution_sample(KernelGlobals kg, ccl_private float *randu)
+ccl_device int light_distribution_sample(KernelGlobals kg, const float randn)
 {
   /* This is basically std::upper_bound as used by PBRT, to find a point light or
    * triangle to emit from, proportional to area. a good improvement would be to
@@ -19,7 +19,7 @@ ccl_device int light_distribution_sample(KernelGlobals kg, ccl_private float *ra
    * arbitrary shaders. */
   int first = 0;
   int len = kernel_data.integrator.num_distribution + 1;
-  float r = *randu;
+  float r = randn;
 
   do {
     int half_len = len >> 1;
@@ -38,18 +38,13 @@ ccl_device int light_distribution_sample(KernelGlobals kg, ccl_private float *ra
    * make this fail on rare occasions. */
   int index = clamp(first - 1, 0, kernel_data.integrator.num_distribution - 1);
 
-  /* Rescale to reuse random number. this helps the 2D samples within
-   * each area light be stratified as well. */
-  float distr_min = kernel_data_fetch(light_distribution, index).totarea;
-  float distr_max = kernel_data_fetch(light_distribution, index + 1).totarea;
-  *randu = (r - distr_min) / (distr_max - distr_min);
-
   return index;
 }
 
 template<bool in_volume_segment>
 ccl_device_noinline bool light_distribution_sample(KernelGlobals kg,
-                                                   float randu,
+                                                   const float randn,
+                                                   const float randu,
                                                    const float randv,
                                                    const float time,
                                                    const float3 P,
@@ -58,42 +53,10 @@ ccl_device_noinline bool light_distribution_sample(KernelGlobals kg,
                                                    ccl_private LightSample *ls)
 {
   /* Sample light index from distribution. */
-  const int index = light_distribution_sample(kg, &randu);
-  ccl_global const KernelLightDistribution *kdistribution = &kernel_data_fetch(light_distribution,
-                                                                               index);
-  const int prim = kdistribution->prim;
-
-  if (prim >= 0) {
-    /* Mesh light. */
-    const int object = kdistribution->mesh_light.object_id;
-
-    /* Exclude synthetic meshes from shadow catcher pass. */
-    if ((path_flag & PATH_RAY_SHADOW_CATCHER_PASS) &&
-        !(kernel_data_fetch(object_flag, object) & SD_OBJECT_SHADOW_CATCHER)) {
-      return false;
-    }
-
-    const int shader_flag = kdistribution->mesh_light.shader_flag;
-    if (!triangle_light_sample<in_volume_segment>(kg, prim, object, randu, randv, time, ls, P)) {
-      return false;
-    }
-    ls->shader |= shader_flag;
-  }
-  else {
-    const int lamp = -prim - 1;
-
-    if (UNLIKELY(light_select_reached_max_bounces(kg, lamp, bounce))) {
-      return false;
-    }
-
-    if (!light_sample<in_volume_segment>(kg, lamp, randu, randv, P, path_flag, ls)) {
-      return false;
-    }
-    ls->pdf_selection = kernel_data.integrator.distribution_pdf_lights;
-  }
-
-  ls->pdf *= ls->pdf_selection;
-  return (ls->pdf > 0.0f);
+  const int index = light_distribution_sample(kg, randn);
+  const float pdf_selection = kernel_data.integrator.distribution_pdf_lights;
+  return light_sample<in_volume_segment>(
+      kg, randu, randv, time, P, bounce, path_flag, index, pdf_selection, ls);
 }
 
 ccl_device_inline float light_distribution_pdf_lamp(KernelGlobals kg)

intern/cycles/kernel/light/light.h

@@ -14,6 +14,13 @@
 
 CCL_NAMESPACE_BEGIN
 
+/* Light info. */
+
+ccl_device_inline bool light_select_reached_max_bounces(KernelGlobals kg, int index, int bounce)
+{
+  return (bounce > kernel_data_fetch(lights, index).max_bounces);
+}
+
 /* Sample point on an individual light. */
 
 template<bool in_volume_segment>
@@ -90,6 +97,68 @@ ccl_device_inline bool light_sample(KernelGlobals kg,
   return in_volume_segment || (ls->pdf > 0.0f);
 }
 
+/* Sample a point on the chosen emitter. */
+
+template<bool in_volume_segment>
+ccl_device_noinline bool light_sample(KernelGlobals kg,
+                                      const float randu,
+                                      const float randv,
+                                      const float time,
+                                      const float3 P,
+                                      const int bounce,
+                                      const uint32_t path_flag,
+                                      const int emitter_index,
+                                      const float pdf_selection,
+                                      ccl_private LightSample *ls)
+{
+  int prim;
+  MeshLight mesh_light;
+  if (kernel_data.integrator.use_light_tree) {
+    ccl_global const KernelLightTreeEmitter *kemitter = &kernel_data_fetch(light_tree_emitters,
+                                                                           emitter_index);
+    prim = kemitter->prim;
+    mesh_light = kemitter->mesh_light;
+  }
+  else {
+    ccl_global const KernelLightDistribution *kdistribution = &kernel_data_fetch(
+        light_distribution, emitter_index);
+    prim = kdistribution->prim;
+    mesh_light = kdistribution->mesh_light;
+  }
+
+  /* A different value would be assigned in `triangle_light_sample()` if `!use_light_tree`. */
+  ls->pdf_selection = pdf_selection;
+
+  if (prim >= 0) {
+    /* Mesh light. */
+    const int object = mesh_light.object_id;
+
+    /* Exclude synthetic meshes from shadow catcher pass. */
+    if ((path_flag & PATH_RAY_SHADOW_CATCHER_PASS) &&
+        !(kernel_data_fetch(object_flag, object) & SD_OBJECT_SHADOW_CATCHER)) {
+      return false;
+    }
+
+    const int shader_flag = mesh_light.shader_flag;
+    if (!triangle_light_sample<in_volume_segment>(kg, prim, object, randu, randv, time, ls, P)) {
+      return false;
+    }
+    ls->shader |= shader_flag;
+  }
+  else {
+    if (UNLIKELY(light_select_reached_max_bounces(kg, ~prim, bounce))) {
+      return false;
+    }
+
+    if (!light_sample<in_volume_segment>(kg, ~prim, randu, randv, P, path_flag, ls)) {
+      return false;
+    }
+  }
+
+  ls->pdf *= ls->pdf_selection;
+  return in_volume_segment || (ls->pdf > 0.0f);
+}
+
 /* Intersect ray with individual light. */
 
 ccl_device bool lights_intersect(KernelGlobals kg,
@@ -230,11 +299,4 @@ ccl_device_forceinline void light_update_position(KernelGlobals kg,
   }
 }
 
-/* Light info. */
-
-ccl_device_inline bool light_select_reached_max_bounces(KernelGlobals kg, int index, int bounce)
-{
-  return (bounce > kernel_data_fetch(lights, index).max_bounces);
-}
-
 CCL_NAMESPACE_END

intern/cycles/kernel/light/sample.h

@@ -324,7 +324,8 @@ ccl_device_inline float light_sample_mis_weight_nee(KernelGlobals kg,
  * Uses either a flat distribution or light tree. */
 
 ccl_device_inline bool light_sample_from_volume_segment(KernelGlobals kg,
-                                                        float randu,
+                                                        const float randn,
+                                                        const float randu,
                                                         const float randv,
                                                         const float time,
                                                         const float3 P,
@@ -337,17 +338,19 @@ ccl_device_inline bool light_sample_from_volume_segment(KernelGlobals kg,
 #ifdef __LIGHT_TREE__
   if (kernel_data.integrator.use_light_tree) {
     return light_tree_sample<true>(
-        kg, randu, randv, time, P, D, t, SD_BSDF_HAS_TRANSMISSION, bounce, path_flag, ls);
+        kg, randn, randu, randv, time, P, D, t, SD_BSDF_HAS_TRANSMISSION, bounce, path_flag, ls);
   }
   else
 #endif
   {
-    return light_distribution_sample<true>(kg, randu, randv, time, P, bounce, path_flag, ls);
+    return light_distribution_sample<true>(
+        kg, randn, randu, randv, time, P, bounce, path_flag, ls);
   }
 }
 
 ccl_device bool light_sample_from_position(KernelGlobals kg,
                                            ccl_private const RNGState *rng_state,
+                                           const float randn,
                                            const float randu,
                                            const float randv,
                                            const float time,
@@ -361,12 +364,13 @@ ccl_device bool light_sample_from_position(KernelGlobals kg,
 #ifdef __LIGHT_TREE__
   if (kernel_data.integrator.use_light_tree) {
     return light_tree_sample<false>(
-        kg, randu, randv, time, P, N, 0, shader_flags, bounce, path_flag, ls);
+        kg, randn, randu, randv, time, P, N, 0, shader_flags, bounce, path_flag, ls);
   }
   else
 #endif
   {
-    return light_distribution_sample<false>(kg, randu, randv, time, P, bounce, path_flag, ls);
+    return light_distribution_sample<false>(
+        kg, randn, randu, randv, time, P, bounce, path_flag, ls);
   }
 }
 

intern/cycles/kernel/light/tree.h

@@ -189,7 +189,7 @@ ccl_device bool compute_emitter_centroid_and_dir(KernelGlobals kg,
                                                  ccl_private float3 &centroid,
                                                  ccl_private packed_float3 &dir)
 {
-  const int prim_id = kemitter->prim_id;
+  const int prim_id = kemitter->prim;
   if (prim_id < 0) {
     const ccl_global KernelLight *klight = &kernel_data_fetch(lights, ~prim_id);
     centroid = klight->co;
@@ -223,10 +223,10 @@ ccl_device bool compute_emitter_centroid_and_dir(KernelGlobals kg,
     triangle_world_space_vertices(kg, object, prim_id, -1.0f, vertices);
     centroid = (vertices[0] + vertices[1] + vertices[2]) / 3.0f;
 
-    if (kemitter->mesh_light.emission_sampling == EMISSION_SAMPLING_FRONT) {
+    if (kemitter->emission_sampling == EMISSION_SAMPLING_FRONT) {
       dir = safe_normalize(cross(vertices[1] - vertices[0], vertices[2] - vertices[0]));
     }
-    else if (kemitter->mesh_light.emission_sampling == EMISSION_SAMPLING_BACK) {
+    else if (kemitter->emission_sampling == EMISSION_SAMPLING_BACK) {
       dir = -safe_normalize(cross(vertices[1] - vertices[0], vertices[2] - vertices[0]));
     }
     else {
@@ -264,7 +264,7 @@ ccl_device void light_tree_emitter_importance(KernelGlobals kg,
     return;
   }
 
-  const int prim_id = kemitter->prim_id;
+  const int prim_id = kemitter->prim;
 
   if (in_volume_segment) {
     const float3 D = N_or_D;
@@ -551,8 +551,9 @@ ccl_device bool get_left_probability(KernelGlobals kg,
 
 template<bool in_volume_segment>
 ccl_device_noinline bool light_tree_sample(KernelGlobals kg,
-                                           float randu,
-                                           float randv,
+                                           float randn,
+                                           const float randu,
+                                           const float randv,
                                            const float time,
                                            const float3 P,
                                            const float3 N_or_D,
@@ -568,8 +569,8 @@ ccl_device_noinline bool light_tree_sample(KernelGlobals kg,
 
   const bool has_transmission = (shader_flags & SD_BSDF_HAS_TRANSMISSION);
   float pdf_leaf = 1.0f;
-  float pdf_emitter_from_leaf = 1.0f;
-  int selected_light = -1;
+  float pdf_selection = 1.0f;
+  int selected_emitter = -1;
 
   int node_index = 0; /* Root node. */
 
@@ -579,8 +580,8 @@ ccl_device_noinline bool light_tree_sample(KernelGlobals kg,
 
     if (knode->child_index <= 0) {
       /* At a leaf node, we pick an emitter. */
-      selected_light = light_tree_cluster_select_emitter<in_volume_segment>(
-          kg, randv, P, N_or_D, t, has_transmission, knode, &pdf_emitter_from_leaf);
+      selected_emitter = light_tree_cluster_select_emitter<in_volume_segment>(
+          kg, randn, P, N_or_D, t, has_transmission, knode, &pdf_selection);
       break;
     }
 
@@ -598,50 +599,18 @@ ccl_device_noinline bool light_tree_sample(KernelGlobals kg,
     float discard;
     float total_prob = left_prob;
     node_index = left_index;
-    sample_resevoir(right_index, 1.0f - left_prob, node_index, discard, total_prob, randu);
+    sample_resevoir(right_index, 1.0f - left_prob, node_index, discard, total_prob, randn);
     pdf_leaf *= (node_index == left_index) ? left_prob : (1.0f - left_prob);
   }
 
-  if (selected_light < 0) {
+  if (selected_emitter < 0) {
     return false;
   }
 
-  /* Sample a point on the chosen emitter. */
-  ccl_global const KernelLightTreeEmitter *kemitter = &kernel_data_fetch(light_tree_emitters,
-                                                                         selected_light);
+  pdf_selection *= pdf_leaf;
 
-  /* TODO: this is the same code as light_distribution_sample, except the index is determined
-   * differently. Would it be better to refactor this into a separate function? */
-  const int prim = kemitter->prim_id;
-  if (prim >= 0) {
-    /* Mesh light. */
-    const int object = kemitter->mesh_light.object_id;
-
-    /* Exclude synthetic meshes from shadow catcher pass. */
-    if ((path_flag & PATH_RAY_SHADOW_CATCHER_PASS) &&
-        !(kernel_data_fetch(object_flag, object) & SD_OBJECT_SHADOW_CATCHER)) {
-      return false;
-    }
-
-    const int mesh_shader_flag = kemitter->mesh_light.shader_flag;
-    if (!triangle_light_sample<in_volume_segment>(kg, prim, object, randu, randv, time, ls, P)) {
-      return false;
-    }
-    ls->shader |= mesh_shader_flag;
-  }
-  else {
-    if (UNLIKELY(light_select_reached_max_bounces(kg, ~prim, bounce))) {
-      return false;
-    }
-
-    if (!light_sample<in_volume_segment>(kg, ~prim, randu, randv, P, path_flag, ls)) {
-      return false;
-    }
-  }
-
-  ls->pdf_selection = pdf_leaf * pdf_emitter_from_leaf;
-  ls->pdf *= ls->pdf_selection;
-  return (ls->pdf > 0);
+  return light_sample<in_volume_segment>(
+      kg, randu, randv, time, P, bounce, path_flag, selected_emitter, pdf_selection, ls);
 }
 
 /* We need to be able to find the probability of selecting a given light for MIS. */

intern/cycles/kernel/light/triangle.h

@@ -306,7 +306,7 @@ ccl_device_forceinline bool triangle_light_tree_parameters(
 
   const int object = kemitter->mesh_light.object_id;
   float3 vertices[3];
-  triangle_world_space_vertices(kg, object, kemitter->prim_id, -1.0f, vertices);
+  triangle_world_space_vertices(kg, object, kemitter->prim, -1.0f, vertices);
 
   bool shape_above_surface = false;
   for (int i = 0; i < 3; i++) {

intern/cycles/kernel/osl/services_gpu.h

@@ -14,111 +14,111 @@
 namespace DeviceStrings {
 
 /* "" */
-ccl_device_constant DeviceString _emptystring_ = {0ull};
+ccl_device_constant DeviceString _emptystring_ = 0ull;
 /* "common" */
-ccl_device_constant DeviceString u_common = {14645198576927606093ull};
+ccl_device_constant DeviceString u_common = 14645198576927606093ull;
 /* "world" */
-ccl_device_constant DeviceString u_world = {16436542438370751598ull};
+ccl_device_constant DeviceString u_world = 16436542438370751598ull;
 /* "shader" */
-ccl_device_constant DeviceString u_shader = {4279676006089868ull};
+ccl_device_constant DeviceString u_shader = 4279676006089868ull;
 /* "object" */
-ccl_device_constant DeviceString u_object = {973692718279674627ull};
+ccl_device_constant DeviceString u_object = 973692718279674627ull;
 /* "NDC" */
-ccl_device_constant DeviceString u_ndc = {5148305047403260775ull};
+ccl_device_constant DeviceString u_ndc = 5148305047403260775ull;
 /* "screen" */
-ccl_device_constant DeviceString u_screen = {14159088609039777114ull};
+ccl_device_constant DeviceString u_screen = 14159088609039777114ull;
 /* "camera" */
-ccl_device_constant DeviceString u_camera = {2159505832145726196ull};
+ccl_device_constant DeviceString u_camera = 2159505832145726196ull;
 /* "raster" */
-ccl_device_constant DeviceString u_raster = {7759263238610201778ull};
+ccl_device_constant DeviceString u_raster = 7759263238610201778ull;
 /* "hsv" */
-ccl_device_constant DeviceString u_hsv = {2177035556331879497ull};
+ccl_device_constant DeviceString u_hsv = 2177035556331879497ull;
 /* "hsl" */
-ccl_device_constant DeviceString u_hsl = {7749766809258288148ull};
+ccl_device_constant DeviceString u_hsl = 7749766809258288148ull;
 /* "XYZ" */
-ccl_device_constant DeviceString u_xyz = {4957977063494975483ull};
+ccl_device_constant DeviceString u_xyz = 4957977063494975483ull;
 /* "xyY" */
-ccl_device_constant DeviceString u_xyy = {5138822319725660255ull};
+ccl_device_constant DeviceString u_xyy = 5138822319725660255ull;
 /* "sRGB" */
-ccl_device_constant DeviceString u_srgb = {15368599878474175032ull};
+ccl_device_constant DeviceString u_srgb = 15368599878474175032ull;
 /* "object:location" */
-ccl_device_constant DeviceString u_object_location = {7846190347358762897ull};
+ccl_device_constant DeviceString u_object_location = 7846190347358762897ull;
 /* "object:color" */
-ccl_device_constant DeviceString u_object_color = {12695623857059169556ull};
+ccl_device_constant DeviceString u_object_color = 12695623857059169556ull;
 /* "object:alpha" */
-ccl_device_constant DeviceString u_object_alpha = {11165053919428293151ull};
+ccl_device_constant DeviceString u_object_alpha = 11165053919428293151ull;
 /* "object:index" */
-ccl_device_constant DeviceString u_object_index = {6588325838217472556ull};
+ccl_device_constant DeviceString u_object_index = 6588325838217472556ull;
 /* "geom:dupli_generated" */
-ccl_device_constant DeviceString u_geom_dupli_generated = {6715607178003388908ull};
+ccl_device_constant DeviceString u_geom_dupli_generated = 6715607178003388908ull;
 /* "geom:dupli_uv" */
-ccl_device_constant DeviceString u_geom_dupli_uv = {1294253317490155849ull};
+ccl_device_constant DeviceString u_geom_dupli_uv = 1294253317490155849ull;
 /* "material:index" */
-ccl_device_constant DeviceString u_material_index = {741770758159634623ull};
+ccl_device_constant DeviceString u_material_index = 741770758159634623ull;
 /* "object:random" */
-ccl_device_constant DeviceString u_object_random = {15789063994977955884ull};
+ccl_device_constant DeviceString u_object_random = 15789063994977955884ull;
 /* "particle:index" */
-ccl_device_constant DeviceString u_particle_index = {9489711748229903784ull};
+ccl_device_constant DeviceString u_particle_index = 9489711748229903784ull;
 /* "particle:random" */
-ccl_device_constant DeviceString u_particle_random = {17993722202766855761ull};
+ccl_device_constant DeviceString u_particle_random = 17993722202766855761ull;
 /* "particle:age" */
-ccl_device_constant DeviceString u_particle_age = {7380730644710951109ull};
+ccl_device_constant DeviceString u_particle_age = 7380730644710951109ull;
 /* "particle:lifetime" */
-ccl_device_constant DeviceString u_particle_lifetime = {16576828923156200061ull};
+ccl_device_constant DeviceString u_particle_lifetime = 16576828923156200061ull;
 /* "particle:location" */
-ccl_device_constant DeviceString u_particle_location = {10309536211423573010ull};
+ccl_device_constant DeviceString u_particle_location = 10309536211423573010ull;
 /* "particle:rotation" */
-ccl_device_constant DeviceString u_particle_rotation = {17858543768041168459ull};
+ccl_device_constant DeviceString u_particle_rotation = 17858543768041168459ull;
 /* "particle:size" */
-ccl_device_constant DeviceString u_particle_size = {16461524249715420389ull};
+ccl_device_constant DeviceString u_particle_size = 16461524249715420389ull;
 /* "particle:velocity" */
-ccl_device_constant DeviceString u_particle_velocity = {13199101248768308863ull};
+ccl_device_constant DeviceString u_particle_velocity = 13199101248768308863ull;
 /* "particle:angular_velocity" */
-ccl_device_constant DeviceString u_particle_angular_velocity = {16327930120486517910ull};
+ccl_device_constant DeviceString u_particle_angular_velocity = 16327930120486517910ull;
 /* "geom:numpolyvertices" */
-ccl_device_constant DeviceString u_geom_numpolyvertices = {382043551489988826ull};
+ccl_device_constant DeviceString u_geom_numpolyvertices = 382043551489988826ull;
 /* "geom:trianglevertices" */
-ccl_device_constant DeviceString u_geom_trianglevertices = {17839267571524187074ull};
+ccl_device_constant DeviceString u_geom_trianglevertices = 17839267571524187074ull;
 /* "geom:polyvertices" */
-ccl_device_constant DeviceString u_geom_polyvertices = {1345577201967881769ull};
+ccl_device_constant DeviceString u_geom_polyvertices = 1345577201967881769ull;
 /* "geom:name" */
-ccl_device_constant DeviceString u_geom_name = {13606338128269760050ull};
+ccl_device_constant DeviceString u_geom_name = 13606338128269760050ull;
 /* "geom:undisplaced" */
-ccl_device_constant DeviceString u_geom_undisplaced = {12431586303019276305ull};
+ccl_device_constant DeviceString u_geom_undisplaced = 12431586303019276305ull;
 /* "geom:is_smooth" */
-ccl_device_constant DeviceString u_is_smooth = {857544214094480123ull};
+ccl_device_constant DeviceString u_is_smooth = 857544214094480123ull;
 /* "geom:is_curve" */
-ccl_device_constant DeviceString u_is_curve = {129742495633653138ull};
+ccl_device_constant DeviceString u_is_curve = 129742495633653138ull;
 /* "geom:curve_thickness" */
-ccl_device_constant DeviceString u_curve_thickness = {10605802038397633852ull};
+ccl_device_constant DeviceString u_curve_thickness = 10605802038397633852ull;
 /* "geom:curve_length" */
-ccl_device_constant DeviceString u_curve_length = {11423459517663715453ull};
+ccl_device_constant DeviceString u_curve_length = 11423459517663715453ull;
 /* "geom:curve_tangent_normal" */
-ccl_device_constant DeviceString u_curve_tangent_normal = {12301397394034985633ull};
+ccl_device_constant DeviceString u_curve_tangent_normal = 12301397394034985633ull;
 /* "geom:curve_random" */
-ccl_device_constant DeviceString u_curve_random = {15293085049960492358ull};
+ccl_device_constant DeviceString u_curve_random = 15293085049960492358ull;
 /* "geom:is_point" */
-ccl_device_constant DeviceString u_is_point = {2511357849436175953ull};
+ccl_device_constant DeviceString u_is_point = 2511357849436175953ull;
 /* "geom:point_radius" */
-ccl_device_constant DeviceString u_point_radius = {9956381140398668479ull};
+ccl_device_constant DeviceString u_point_radius = 9956381140398668479ull;
 /* "geom:point_position" */
-ccl_device_constant DeviceString u_point_position = {15684484280742966916ull};
+ccl_device_constant DeviceString u_point_position = 15684484280742966916ull;
 /* "geom:point_random" */
-ccl_device_constant DeviceString u_point_random = {5632627207092325544ull};
+ccl_device_constant DeviceString u_point_random = 5632627207092325544ull;
 /* "geom:normal_map_normal" */
-ccl_device_constant DeviceString u_normal_map_normal = {10718948685686827073};
+ccl_device_constant DeviceString u_normal_map_normal = 10718948685686827073;
 /* "path:ray_length" */
-ccl_device_constant DeviceString u_path_ray_length = {16391985802412544524ull};
+ccl_device_constant DeviceString u_path_ray_length = 16391985802412544524ull;
 /* "path:ray_depth" */
-ccl_device_constant DeviceString u_path_ray_depth = {16643933224879500399ull};
+ccl_device_constant DeviceString u_path_ray_depth = 16643933224879500399ull;
 /* "path:diffuse_depth" */
-ccl_device_constant DeviceString u_path_diffuse_depth = {13191651286699118408ull};
+ccl_device_constant DeviceString u_path_diffuse_depth = 13191651286699118408ull;
 /* "path:glossy_depth" */
-ccl_device_constant DeviceString u_path_glossy_depth = {15717768399057252940ull};
+ccl_device_constant DeviceString u_path_glossy_depth = 15717768399057252940ull;
 /* "path:transparent_depth" */
-ccl_device_constant DeviceString u_path_transparent_depth = {7821650266475578543ull};
+ccl_device_constant DeviceString u_path_transparent_depth = 7821650266475578543ull;
 /* "path:transmission_depth" */
-ccl_device_constant DeviceString u_path_transmission_depth = {15113408892323917624ull};
+ccl_device_constant DeviceString u_path_transmission_depth = 15113408892323917624ull;
 
 }  // namespace DeviceStrings
 
@@ -1275,9 +1275,7 @@ ccl_device_extern bool osl_get_attribute(ccl_private ShaderGlobals *sg,
     object = sd->object;
   }
 
-  const uint64_t id = name.hash();
-
-  const AttributeDescriptor desc = find_attribute(kg, object, sd->prim, sd->type, id);
+  const AttributeDescriptor desc = find_attribute(kg, object, sd->prim, sd->type, name);
   if (desc.offset != ATTR_STD_NOT_FOUND) {
     return get_object_attribute(kg, sd, desc, type, derivatives, res);
   }

intern/cycles/kernel/osl/types.h

@@ -5,47 +5,26 @@
 
 CCL_NAMESPACE_BEGIN
 
-struct DeviceString {
 #if defined(__KERNEL_GPU__)
-  /* Strings are represented by their hashes in CUDA and OptiX. */
-  size_t str_;
-
-  ccl_device_inline_method uint64_t hash() const
-  {
-    return str_;
-  }
+/* Strings are represented by their hashes on the GPU. */
+typedef size_t DeviceString;
 #elif defined(OPENIMAGEIO_USTRING_H)
-  ustring str_;
-
-  ccl_device_inline_method uint64_t hash() const
-  {
-    return str_.hash();
-  }
+typedef ustring DeviceString;
 #else
-  const char *str_;
+typedef const char *DeviceString;
 #endif
 
-  ccl_device_inline_method bool operator==(DeviceString b) const
-  {
-    return str_ == b.str_;
-  }
-  ccl_device_inline_method bool operator!=(DeviceString b) const
-  {
-    return str_ != b.str_;
-  }
-};
-
 ccl_device_inline DeviceString make_string(const char *str, size_t hash)
 {
 #if defined(__KERNEL_GPU__)
   (void)str;
-  return {hash};
+  return hash;
 #elif defined(OPENIMAGEIO_USTRING_H)
   (void)hash;
-  return {ustring(str)};
+  return ustring(str);
 #else
   (void)hash;
-  return {str};
+  return str;
 #endif
 }
 

intern/cycles/kernel/sample/jitter.h

@@ -1,90 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0
- * Copyright 2011-2022 Blender Foundation */
-
-#include "kernel/sample/util.h"
-#include "util/hash.h"
-
-#pragma once
-CCL_NAMESPACE_BEGIN
-
-ccl_device uint pmj_shuffled_sample_index(KernelGlobals kg, uint sample, uint dimension, uint seed)
-{
-  const uint sample_count = kernel_data.integrator.pmj_sequence_size;
-
-  /* Shuffle the pattern order and sample index to better decorrelate
-   * dimensions and make the most of the finite patterns we have.
-   * The funky sample mask stuff is to ensure that we only shuffle
-   * *within* the current sample pattern, which is necessary to avoid
-   * early repeat pattern use. */
-  const uint pattern_i = hash_shuffle_uint(dimension, NUM_PMJ_PATTERNS, seed);
-  /* sample_count should always be a power of two, so this results in a mask. */
-  const uint sample_mask = sample_count - 1;
-  const uint sample_shuffled = nested_uniform_scramble(sample,
-                                                       hash_wang_seeded_uint(dimension, seed));
-  sample = (sample & ~sample_mask) | (sample_shuffled & sample_mask);
-
-  return ((pattern_i * sample_count) + sample) % (sample_count * NUM_PMJ_PATTERNS);
-}
-
-ccl_device float pmj_sample_1D(KernelGlobals kg,
-                               uint sample,
-                               const uint rng_hash,
-                               const uint dimension)
-{
-  uint seed = rng_hash;
-
-  /* Use the same sample sequence seed for all pixels when using
-   * scrambling distance. */
-  if (kernel_data.integrator.scrambling_distance < 1.0f) {
-    seed = kernel_data.integrator.seed;
-  }
-
-  /* Fetch the sample. */
-  const uint index = pmj_shuffled_sample_index(kg, sample, dimension, seed);
-  float x = kernel_data_fetch(sample_pattern_lut, index * NUM_PMJ_DIMENSIONS);
-
-  /* Do limited Cranley-Patterson rotation when using scrambling distance. */
-  if (kernel_data.integrator.scrambling_distance < 1.0f) {
-    const float jitter_x = hash_wang_seeded_float(dimension, rng_hash) *
-                           kernel_data.integrator.scrambling_distance;
-    x += jitter_x;
-    x -= floorf(x);
-  }
-
-  return x;
-}
-
-ccl_device float2 pmj_sample_2D(KernelGlobals kg,
-                                uint sample,
-                                const uint rng_hash,
-                                const uint dimension)
-{
-  uint seed = rng_hash;
-
-  /* Use the same sample sequence seed for all pixels when using
-   * scrambling distance. */
-  if (kernel_data.integrator.scrambling_distance < 1.0f) {
-    seed = kernel_data.integrator.seed;
-  }
-
-  /* Fetch the sample. */
-  const uint index = pmj_shuffled_sample_index(kg, sample, dimension, seed);
-  float x = kernel_data_fetch(sample_pattern_lut, index * NUM_PMJ_DIMENSIONS);
-  float y = kernel_data_fetch(sample_pattern_lut, index * NUM_PMJ_DIMENSIONS + 1);
-
-  /* Do limited Cranley-Patterson rotation when using scrambling distance. */
-  if (kernel_data.integrator.scrambling_distance < 1.0f) {
-    const float jitter_x = hash_wang_seeded_float(dimension, rng_hash) *
-                           kernel_data.integrator.scrambling_distance;
-    const float jitter_y = hash_wang_seeded_float(dimension, rng_hash ^ 0xca0e1151) *
-                           kernel_data.integrator.scrambling_distance;
-    x += jitter_x;
-    y += jitter_y;
-    x -= floorf(x);
-    y -= floorf(y);
-  }
-
-  return make_float2(x, y);
-}
-
-CCL_NAMESPACE_END

intern/cycles/kernel/sample/pattern.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "kernel/sample/jitter.h"
 #include "kernel/sample/sobol_burley.h"
+#include "kernel/sample/tabulated_sobol.h"
 #include "util/hash.h"
 
 CCL_NAMESPACE_BEGIN
@@ -23,10 +23,11 @@ ccl_device_forceinline float path_rng_1D(KernelGlobals kg,
 #endif
 
   if (kernel_data.integrator.sampling_pattern == SAMPLING_PATTERN_SOBOL_BURLEY) {
-    return sobol_burley_sample_1D(sample, dimension, rng_hash);
+    const uint index_mask = kernel_data.integrator.sobol_index_mask;
+    return sobol_burley_sample_1D(sample, dimension, rng_hash, index_mask);
   }
   else {
-    return pmj_sample_1D(kg, sample, rng_hash, dimension);
+    return tabulated_sobol_sample_1D(kg, sample, rng_hash, dimension);
   }
 }
 
@@ -40,10 +41,47 @@ ccl_device_forceinline float2 path_rng_2D(KernelGlobals kg,
 #endif
 
   if (kernel_data.integrator.sampling_pattern == SAMPLING_PATTERN_SOBOL_BURLEY) {
-    return sobol_burley_sample_2D(sample, dimension, rng_hash);
+    const uint index_mask = kernel_data.integrator.sobol_index_mask;
+    return sobol_burley_sample_2D(sample, dimension, rng_hash, index_mask);
   }
   else {
-    return pmj_sample_2D(kg, sample, rng_hash, dimension);
+    return tabulated_sobol_sample_2D(kg, sample, rng_hash, dimension);
+  }
+}
+
+ccl_device_forceinline float3 path_rng_3D(KernelGlobals kg,
+                                          uint rng_hash,
+                                          int sample,
+                                          int dimension)
+{
+#ifdef __DEBUG_CORRELATION__
+  return make_float3((float)drand48(), (float)drand48(), (float)drand48());
+#endif
+
+  if (kernel_data.integrator.sampling_pattern == SAMPLING_PATTERN_SOBOL_BURLEY) {
+    const uint index_mask = kernel_data.integrator.sobol_index_mask;
+    return sobol_burley_sample_3D(sample, dimension, rng_hash, index_mask);
+  }
+  else {
+    return tabulated_sobol_sample_3D(kg, sample, rng_hash, dimension);
+  }
+}
+
+ccl_device_forceinline float4 path_rng_4D(KernelGlobals kg,
+                                          uint rng_hash,
+                                          int sample,
+                                          int dimension)
+{
+#ifdef __DEBUG_CORRELATION__
+  return make_float4((float)drand48(), (float)drand48(), (float)drand48(), (float)drand48());
+#endif
+
+  if (kernel_data.integrator.sampling_pattern == SAMPLING_PATTERN_SOBOL_BURLEY) {
+    const uint index_mask = kernel_data.integrator.sobol_index_mask;
+    return sobol_burley_sample_4D(sample, dimension, rng_hash, index_mask);
+  }
+  else {
+    return tabulated_sobol_sample_4D(kg, sample, rng_hash, dimension);
   }
 }
 
@@ -97,7 +135,7 @@ ccl_device_inline uint path_rng_hash_init(KernelGlobals kg,
 ccl_device_inline bool sample_is_class_A(int pattern, int sample)
 {
 #if 0
-  if (!(pattern == SAMPLING_PATTERN_PMJ || pattern == SAMPLING_PATTERN_SOBOL_BURLEY)) {
+  if (!(pattern == SAMPLING_PATTERN_TABULATED_SOBOL || pattern == SAMPLING_PATTERN_SOBOL_BURLEY)) {
     /* Fallback: assign samples randomly.
      * This is guaranteed to work "okay" for any sampler, but isn't good.
      * (NOTE: the seed constant is just a random number to guard against
@@ -114,8 +152,8 @@ ccl_device_inline bool sample_is_class_A(int pattern, int sample)
    * Multi-Jittered Sample Sequences" by Christensen et al., but
    * implemented with efficient bit-fiddling.
    *
-   * This approach also turns out to work equally well with Sobol-Burley
-   * (see https://developer.blender.org/D15746#429471).
+   * This approach also turns out to work equally well with Owen
+   * scrambled and shuffled Sobol (see https://developer.blender.org/D15746#429471).
    */
   return popcount(uint(sample) & 0xaaaaaaaa) & 1;
 }

intern/cycles/kernel/sample/sobol_burley.h

@@ -65,31 +65,75 @@ ccl_device_forceinline float sobol_burley(uint rev_bit_index,
 }
 
 /*
- * Computes a 1D Owen-scrambled and shuffled Sobol sample.
+ * NOTE: the functions below intentionally produce samples that are
+ * uncorrelated between functions.  For example, a 1D sample and 2D
+ * sample produced with the same index, dimension, and seed are
+ * uncorrelated with each other.  This allows more care-free usage
+ * of the functions together, without having to worry about
+ * e.g. 1D and 2D samples being accidentally correlated with each
+ * other.
  */
-ccl_device float sobol_burley_sample_1D(uint index, uint const dimension, uint seed)
+
+/*
+ * Computes a 1D Owen-scrambled and shuffled Sobol sample.
+ *
+ * `index` is the index of the sample in the sequence.
+ *
+ * `dimension` is which dimensions of the sample you want to fetch.  Note
+ * that different 1D dimensions are uncorrelated.  For samples with > 1D
+ * stratification, use the multi-dimensional sampling methods below.
+ *
+ * `seed`: different seeds produce statistically independent,
+ * uncorrelated sequences.
+ *
+ * `shuffled_index_mask` limits the sample sequence length, improving
+ * performance. It must be a string of binary 1 bits followed by a
+ * string of binary 0 bits (e.g. 0xffff0000) for the sampler to operate
+ * correctly. In general, `reverse_integer_bits(shuffled_index_mask)`
+ * should be >= the maximum number of samples expected to be taken. A safe
+ * default (but least performant) is 0xffffffff, for maximum sequence
+ * length.
+ */
+ccl_device float sobol_burley_sample_1D(uint index,
+                                        uint const dimension,
+                                        uint seed,
+                                        uint shuffled_index_mask)
 {
   /* Include the dimension in the seed, so we get decorrelated
    * sequences for different dimensions via shuffling. */
   seed ^= hash_hp_uint(dimension);
 
-  /* Shuffle. */
+  /* Shuffle and mask.  The masking is just for better
+   * performance at low sample counts. */
   index = reversed_bit_owen(reverse_integer_bits(index), seed ^ 0xbff95bfe);
+  index &= shuffled_index_mask;
 
   return sobol_burley(index, 0, seed ^ 0x635c77bd);
 }
 
 /*
  * Computes a 2D Owen-scrambled and shuffled Sobol sample.
+ *
+ * `dimension_set` is which two dimensions of the sample you want to
+ * fetch.  For example, 0 is the first two, 1 is the second two, etc.
+ * The dimensions within a single set are stratified, but different sets
+ * are uncorrelated.
+ *
+ * See sobol_burley_sample_1D for further usage details.
  */
-ccl_device float2 sobol_burley_sample_2D(uint index, const uint dimension_set, uint seed)
+ccl_device float2 sobol_burley_sample_2D(uint index,
+                                         const uint dimension_set,
+                                         uint seed,
+                                         uint shuffled_index_mask)
 {
   /* Include the dimension set in the seed, so we get decorrelated
    * sequences for different dimension sets via shuffling. */
   seed ^= hash_hp_uint(dimension_set);
 
-  /* Shuffle. */
+  /* Shuffle and mask.  The masking is just for better
+   * performance at low sample counts. */
   index = reversed_bit_owen(reverse_integer_bits(index), seed ^ 0xf8ade99a);
+  index &= shuffled_index_mask;
 
   return make_float2(sobol_burley(index, 0, seed ^ 0xe0aaaf76),
                      sobol_burley(index, 1, seed ^ 0x94964d4e));
@@ -97,15 +141,27 @@ ccl_device float2 sobol_burley_sample_2D(uint index, const uint dimension_set, u
 
 /*
  * Computes a 3D Owen-scrambled and shuffled Sobol sample.
+ *
+ * `dimension_set` is which three dimensions of the sample you want to
+ * fetch.  For example, 0 is the first three, 1 is the second three, etc.
+ * The dimensions within a single set are stratified, but different sets
+ * are uncorrelated.
+ *
+ * See sobol_burley_sample_1D for further usage details.
  */
-ccl_device float3 sobol_burley_sample_3D(uint index, const uint dimension_set, uint seed)
+ccl_device float3 sobol_burley_sample_3D(uint index,
+                                         const uint dimension_set,
+                                         uint seed,
+                                         uint shuffled_index_mask)
 {
   /* Include the dimension set in the seed, so we get decorrelated
    * sequences for different dimension sets via shuffling. */
   seed ^= hash_hp_uint(dimension_set);
 
-  /* Shuffle. */
+  /* Shuffle and mask.  The masking is just for better
+   * performance at low sample counts. */
   index = reversed_bit_owen(reverse_integer_bits(index), seed ^ 0xcaa726ac);
+  index &= shuffled_index_mask;
 
   return make_float3(sobol_burley(index, 0, seed ^ 0x9e78e391),
                      sobol_burley(index, 1, seed ^ 0x67c33241),
@@ -114,15 +170,27 @@ ccl_device float3 sobol_burley_sample_3D(uint index, const uint dimension_set, u
 
 /*
  * Computes a 4D Owen-scrambled and shuffled Sobol sample.
+ *
+ * `dimension_set` is which four dimensions of the sample you want to
+ * fetch.  For example, 0 is the first four, 1 is the second four, etc.
+ * The dimensions within a single set are stratified, but different sets
+ * are uncorrelated.
+ *
+ * See sobol_burley_sample_1D for further usage details.
  */
-ccl_device float4 sobol_burley_sample_4D(uint index, const uint dimension_set, uint seed)
+ccl_device float4 sobol_burley_sample_4D(uint index,
+                                         const uint dimension_set,
+                                         uint seed,
+                                         uint shuffled_index_mask)
 {
   /* Include the dimension set in the seed, so we get decorrelated
    * sequences for different dimension sets via shuffling. */
   seed ^= hash_hp_uint(dimension_set);
 
-  /* Shuffle. */
+  /* Shuffle and mask.  The masking is just for better
+   * performance at low sample counts. */
   index = reversed_bit_owen(reverse_integer_bits(index), seed ^ 0xc2c1a055);
+  index &= shuffled_index_mask;
 
   return make_float4(sobol_burley(index, 0, seed ^ 0x39468210),
                      sobol_burley(index, 1, seed ^ 0xe9d8a845),

intern/cycles/kernel/sample/tabulated_sobol.h

@@ -0,0 +1,174 @@
+/* SPDX-License-Identifier: Apache-2.0
+ * Copyright 2011-2022 Blender Foundation */
+
+#include "kernel/sample/util.h"
+#include "util/hash.h"
+
+#pragma once
+CCL_NAMESPACE_BEGIN
+
+ccl_device uint tabulated_sobol_shuffled_sample_index(KernelGlobals kg,
+                                                      uint sample,
+                                                      uint dimension,
+                                                      uint seed)
+{
+  const uint sample_count = kernel_data.integrator.tabulated_sobol_sequence_size;
+
+  /* Shuffle the pattern order and sample index to decorrelate
+   * dimensions and make the most of the finite patterns we have.
+   * The funky sample mask stuff is to ensure that we only shuffle
+   * *within* the current sample pattern, which is necessary to avoid
+   * early repeat pattern use. */
+  const uint pattern_i = hash_shuffle_uint(dimension, NUM_TAB_SOBOL_PATTERNS, seed);
+  /* sample_count should always be a power of two, so this results in a mask. */
+  const uint sample_mask = sample_count - 1;
+  const uint sample_shuffled = nested_uniform_scramble(sample,
+                                                       hash_wang_seeded_uint(dimension, seed));
+  sample = (sample & ~sample_mask) | (sample_shuffled & sample_mask);
+
+  return ((pattern_i * sample_count) + sample) % (sample_count * NUM_TAB_SOBOL_PATTERNS);
+}
+
+ccl_device float tabulated_sobol_sample_1D(KernelGlobals kg,
+                                           uint sample,
+                                           const uint rng_hash,
+                                           const uint dimension)
+{
+  uint seed = rng_hash;
+
+  /* Use the same sample sequence seed for all pixels when using
+   * scrambling distance. */
+  if (kernel_data.integrator.scrambling_distance < 1.0f) {
+    seed = kernel_data.integrator.seed;
+  }
+
+  /* Fetch the sample. */
+  const uint index = tabulated_sobol_shuffled_sample_index(kg, sample, dimension, seed);
+  float x = kernel_data_fetch(sample_pattern_lut, index * NUM_TAB_SOBOL_DIMENSIONS);
+
+  /* Do limited Cranley-Patterson rotation when using scrambling distance. */
+  if (kernel_data.integrator.scrambling_distance < 1.0f) {
+    const float jitter_x = hash_wang_seeded_float(dimension, rng_hash) *
+                           kernel_data.integrator.scrambling_distance;
+    x += jitter_x;
+    x -= floorf(x);
+  }
+
+  return x;
+}
+
+ccl_device float2 tabulated_sobol_sample_2D(KernelGlobals kg,
+                                            uint sample,
+                                            const uint rng_hash,
+                                            const uint dimension)
+{
+  uint seed = rng_hash;
+
+  /* Use the same sample sequence seed for all pixels when using
+   * scrambling distance. */
+  if (kernel_data.integrator.scrambling_distance < 1.0f) {
+    seed = kernel_data.integrator.seed;
+  }
+
+  /* Fetch the sample. */
+  const uint index = tabulated_sobol_shuffled_sample_index(kg, sample, dimension, seed);
+  float x = kernel_data_fetch(sample_pattern_lut, index * NUM_TAB_SOBOL_DIMENSIONS);
+  float y = kernel_data_fetch(sample_pattern_lut, index * NUM_TAB_SOBOL_DIMENSIONS + 1);
+
+  /* Do limited Cranley-Patterson rotation when using scrambling distance. */
+  if (kernel_data.integrator.scrambling_distance < 1.0f) {
+    const float jitter_x = hash_wang_seeded_float(dimension, rng_hash) *
+                           kernel_data.integrator.scrambling_distance;
+    const float jitter_y = hash_wang_seeded_float(dimension, rng_hash ^ 0xca0e1151) *
+                           kernel_data.integrator.scrambling_distance;
+    x += jitter_x;
+    y += jitter_y;
+    x -= floorf(x);
+    y -= floorf(y);
+  }
+
+  return make_float2(x, y);
+}
+
+ccl_device float3 tabulated_sobol_sample_3D(KernelGlobals kg,
+                                            uint sample,
+                                            const uint rng_hash,
+                                            const uint dimension)
+{
+  uint seed = rng_hash;
+
+  /* Use the same sample sequence seed for all pixels when using
+   * scrambling distance. */
+  if (kernel_data.integrator.scrambling_distance < 1.0f) {
+    seed = kernel_data.integrator.seed;
+  }
+
+  /* Fetch the sample. */
+  const uint index = tabulated_sobol_shuffled_sample_index(kg, sample, dimension, seed);
+  float x = kernel_data_fetch(sample_pattern_lut, index * NUM_TAB_SOBOL_DIMENSIONS);
+  float y = kernel_data_fetch(sample_pattern_lut, index * NUM_TAB_SOBOL_DIMENSIONS + 1);
+  float z = kernel_data_fetch(sample_pattern_lut, index * NUM_TAB_SOBOL_DIMENSIONS + 2);
+
+  /* Do limited Cranley-Patterson rotation when using scrambling distance. */
+  if (kernel_data.integrator.scrambling_distance < 1.0f) {
+    const float jitter_x = hash_wang_seeded_float(dimension, rng_hash) *
+                           kernel_data.integrator.scrambling_distance;
+    const float jitter_y = hash_wang_seeded_float(dimension, rng_hash ^ 0xca0e1151) *
+                           kernel_data.integrator.scrambling_distance;
+    const float jitter_z = hash_wang_seeded_float(dimension, rng_hash ^ 0xbf604c5a) *
+                           kernel_data.integrator.scrambling_distance;
+    x += jitter_x;
+    y += jitter_y;
+    z += jitter_z;
+    x -= floorf(x);
+    y -= floorf(y);
+    z -= floorf(z);
+  }
+
+  return make_float3(x, y, z);
+}
+
+ccl_device float4 tabulated_sobol_sample_4D(KernelGlobals kg,
+                                            uint sample,
+                                            const uint rng_hash,
+                                            const uint dimension)
+{
+  uint seed = rng_hash;
+
+  /* Use the same sample sequence seed for all pixels when using
+   * scrambling distance. */
+  if (kernel_data.integrator.scrambling_distance < 1.0f) {
+    seed = kernel_data.integrator.seed;
+  }
+
+  /* Fetch the sample. */
+  const uint index = tabulated_sobol_shuffled_sample_index(kg, sample, dimension, seed);
+  float x = kernel_data_fetch(sample_pattern_lut, index * NUM_TAB_SOBOL_DIMENSIONS);
+  float y = kernel_data_fetch(sample_pattern_lut, index * NUM_TAB_SOBOL_DIMENSIONS + 1);
+  float z = kernel_data_fetch(sample_pattern_lut, index * NUM_TAB_SOBOL_DIMENSIONS + 2);
+  float w = kernel_data_fetch(sample_pattern_lut, index * NUM_TAB_SOBOL_DIMENSIONS + 3);
+
+  /* Do limited Cranley-Patterson rotation when using scrambling distance. */
+  if (kernel_data.integrator.scrambling_distance < 1.0f) {
+    const float jitter_x = hash_wang_seeded_float(dimension, rng_hash) *
+                           kernel_data.integrator.scrambling_distance;
+    const float jitter_y = hash_wang_seeded_float(dimension, rng_hash ^ 0xca0e1151) *
+                           kernel_data.integrator.scrambling_distance;
+    const float jitter_z = hash_wang_seeded_float(dimension, rng_hash ^ 0xbf604c5a) *
+                           kernel_data.integrator.scrambling_distance;
+    const float jitter_w = hash_wang_seeded_float(dimension, rng_hash ^ 0x99634d1d) *
+                           kernel_data.integrator.scrambling_distance;
+    x += jitter_x;
+    y += jitter_y;
+    z += jitter_z;
+    w += jitter_w;
+    x -= floorf(x);
+    y -= floorf(y);
+    z -= floorf(z);
+    w -= floorf(w);
+  }
+
+  return make_float4(x, y, z, w);
+}
+
+CCL_NAMESPACE_END

intern/cycles/kernel/types.h

@@ -148,8 +148,7 @@ CCL_NAMESPACE_BEGIN
 enum PathTraceDimension {
   /* Init bounce */
   PRNG_FILTER = 0,
-  PRNG_LENS = 1,
-  PRNG_TIME = 2,
+  PRNG_LENS_TIME = 1,
 
   /* Shade bounce */
   PRNG_TERMINATE = 0,
@@ -187,7 +186,7 @@ enum PathTraceDimension {
 
 enum SamplingPattern {
   SAMPLING_PATTERN_SOBOL_BURLEY = 0,
-  SAMPLING_PATTERN_PMJ = 1,
+  SAMPLING_PATTERN_TABULATED_SOBOL = 1,
 
   SAMPLING_NUM_PATTERNS,
 };
@@ -1032,13 +1031,28 @@ typedef struct LocalIntersection {
 typedef struct KernelCamera {
   /* type */
   int type;
+  int use_dof_or_motion_blur;
+
+  /* depth of field */
+  float aperturesize;
+  float blades;
+  float bladesrotation;
+  float focaldistance;
+
+  /* motion blur */
+  float shuttertime;
+  int num_motion_steps, have_perspective_motion;
+
+  int pad1;
+  int pad2;
+  int pad3;
 
   /* panorama */
   int panorama_type;
   float fisheye_fov;
   float fisheye_lens;
-  float4 equirectangular_range;
   float fisheye_lens_polynomial_bias;
+  float4 equirectangular_range;
   float4 fisheye_lens_polynomial_coefficients;
 
   /* stereo */
@@ -1055,16 +1069,6 @@ typedef struct KernelCamera {
   float4 dx;
   float4 dy;
 
-  /* depth of field */
-  float aperturesize;
-  float blades;
-  float bladesrotation;
-  float focaldistance;
-
-  /* motion blur */
-  float shuttertime;
-  int num_motion_steps, have_perspective_motion;
-
   /* clipping */
   float nearclip;
   float cliplength;
@@ -1075,7 +1079,6 @@ typedef struct KernelCamera {
 
   /* render size */
   float width, height;
-  int pad1;
 
   /* anamorphic lens bokeh */
   float inv_aperture_ratio;
@@ -1338,13 +1341,15 @@ typedef struct KernelLight {
 } KernelLight;
 static_assert_align(KernelLight, 16);
 
+using MeshLight = struct MeshLight {
+  int shader_flag;
+  int object_id;
+};
+
 typedef struct KernelLightDistribution {
   float totarea;
   int prim;
-  struct {
-    int shader_flag;
-    int object_id;
-  } mesh_light;
+  MeshLight mesh_light;
 } KernelLightDistribution;
 static_assert_align(KernelLightDistribution, 16);
 
@@ -1393,12 +1398,9 @@ typedef struct KernelLightTreeEmitter {
   float energy;
 
   /* prim_id denotes the location in the lights or triangles array. */
-  int prim_id;
-  struct {
-    int shader_flag;
-    int object_id;
+  int prim;
+  MeshLight mesh_light;
   EmissionSampling emission_sampling;
-  } mesh_light;
 
   /* Parent. */
   int parent_index;
@@ -1467,15 +1469,15 @@ typedef struct KernelShaderEvalInput {
 } KernelShaderEvalInput;
 static_assert_align(KernelShaderEvalInput, 16);
 
-/* Pre-computed sample table sizes for PMJ02 sampler.
+/* Pre-computed sample table sizes for the tabulated Sobol sampler.
  *
  * NOTE: min and max samples *must* be a power of two, and patterns
  * ideally should be as well.
  */
-#define MIN_PMJ_SAMPLES 256
-#define MAX_PMJ_SAMPLES 8192
-#define NUM_PMJ_DIMENSIONS 2
-#define NUM_PMJ_PATTERNS 256
+#define MIN_TAB_SOBOL_SAMPLES 256
+#define MAX_TAB_SOBOL_SAMPLES 8192
+#define NUM_TAB_SOBOL_DIMENSIONS 4
+#define NUM_TAB_SOBOL_PATTERNS 256
 
 /* Device kernels.
  *

intern/cycles/scene/CMakeLists.txt

@@ -23,7 +23,6 @@ set(SRC
   image_sky.cpp
   image_vdb.cpp
   integrator.cpp
-  jitter.cpp
   light.cpp
   light_tree.cpp
   mesh.cpp
@@ -43,6 +42,7 @@ set(SRC
   stats.cpp
   svm.cpp
   tables.cpp
+  tabulated_sobol.cpp
   volume.cpp
 )
 
@@ -65,7 +65,6 @@ set(SRC_HEADERS
   integrator.h
   light.h
   light_tree.h
-  jitter.h
   mesh.h
   object.h
   osl.h
@@ -81,6 +80,7 @@ set(SRC_HEADERS
   stats.h
   svm.h
   tables.h
+  tabulated_sobol.h
   volume.h
 )
 

intern/cycles/scene/constant_fold.cpp

@@ -386,6 +386,46 @@ void ConstantFolder::fold_mix_color(NodeMix type, bool clamp_factor, bool clamp)
   }
 }
 
+void ConstantFolder::fold_mix_float(bool clamp_factor, bool clamp) const
+{
+  ShaderInput *fac_in = node->input("Factor");
+  ShaderInput *float1_in = node->input("A");
+  ShaderInput *float2_in = node->input("B");
+
+  float fac = clamp_factor ? saturatef(node->get_float(fac_in->socket_type)) :
+                             node->get_float(fac_in->socket_type);
+  bool fac_is_zero = !fac_in->link && fac == 0.0f;
+  bool fac_is_one = !fac_in->link && fac == 1.0f;
+
+  /* remove no-op node when factor is 0.0 */
+  if (fac_is_zero) {
+    if (try_bypass_or_make_constant(float1_in, clamp)) {
+      return;
+    }
+  }
+
+  /* remove useless mix floats nodes */
+  if (float1_in->link && float2_in->link) {
+    if (float1_in->link == float2_in->link) {
+      try_bypass_or_make_constant(float1_in, clamp);
+      return;
+    }
+  }
+  else if (!float1_in->link && !float2_in->link) {
+    float value1 = node->get_float(float1_in->socket_type);
+    float value2 = node->get_float(float2_in->socket_type);
+    if (value1 == value2) {
+      try_bypass_or_make_constant(float1_in, clamp);
+      return;
+    }
+  }
+  /* remove no-op mix float node when factor is 1.0 */
+  if (fac_is_one) {
+    try_bypass_or_make_constant(float2_in, clamp);
+    return;
+  }
+}
+
 void ConstantFolder::fold_math(NodeMathType type) const
 {
   ShaderInput *value1_in = node->input("Value1");

intern/cycles/scene/constant_fold.h

@@ -52,6 +52,7 @@ class ConstantFolder {
   /* Specific nodes. */
   void fold_mix(NodeMix type, bool clamp) const;
   void fold_mix_color(NodeMix type, bool clamp_factor, bool clamp) const;
+  void fold_mix_float(bool clamp_factor, bool clamp) const;
   void fold_math(NodeMathType type) const;
   void fold_vector_math(NodeVectorMathType type) const;
   void fold_mapping(NodeMappingType type) const;

intern/cycles/scene/film.cpp

@@ -88,7 +88,7 @@ NODE_DEFINE(Film)
 {
   NodeType *type = NodeType::add("film", create);
 
-  SOCKET_FLOAT(exposure, "Exposure", 0.8f);
+  SOCKET_FLOAT(exposure, "Exposure", 1.0f);
   SOCKET_FLOAT(pass_alpha_threshold, "Pass Alpha Threshold", 0.0f);
 
   static NodeEnum filter_enum;

intern/cycles/scene/integrator.cpp

@@ -8,12 +8,12 @@
 #include "scene/camera.h"
 #include "scene/film.h"
 #include "scene/integrator.h"
-#include "scene/jitter.h"
 #include "scene/light.h"
 #include "scene/object.h"
 #include "scene/scene.h"
 #include "scene/shader.h"
 #include "scene/stats.h"
+#include "scene/tabulated_sobol.h"
 
 #include "kernel/types.h"
 
@@ -107,8 +107,11 @@ NODE_DEFINE(Integrator)
 
   static NodeEnum sampling_pattern_enum;
   sampling_pattern_enum.insert("sobol_burley", SAMPLING_PATTERN_SOBOL_BURLEY);
-  sampling_pattern_enum.insert("pmj", SAMPLING_PATTERN_PMJ);
-  SOCKET_ENUM(sampling_pattern, "Sampling Pattern", sampling_pattern_enum, SAMPLING_PATTERN_PMJ);
+  sampling_pattern_enum.insert("tabulated_sobol", SAMPLING_PATTERN_TABULATED_SOBOL);
+  SOCKET_ENUM(sampling_pattern,
+              "Sampling Pattern",
+              sampling_pattern_enum,
+              SAMPLING_PATTERN_TABULATED_SOBOL);
   SOCKET_FLOAT(scrambling_distance, "Scrambling Distance", 1.0f);
 
   static NodeEnum denoiser_type_enum;
@@ -250,32 +253,33 @@ void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene
 
   kintegrator->sampling_pattern = sampling_pattern;
   kintegrator->scrambling_distance = scrambling_distance;
+  kintegrator->sobol_index_mask = reverse_integer_bits(next_power_of_two(aa_samples - 1) - 1);
 
   kintegrator->use_light_tree = scene->integrator->use_light_tree;
   if (light_sampling_threshold > 0.0f) {
-    kintegrator->light_inv_rr_threshold = 1.0f / light_sampling_threshold;
+    kintegrator->light_inv_rr_threshold = scene->film->get_exposure() / light_sampling_threshold;
   }
   else {
     kintegrator->light_inv_rr_threshold = 0.0f;
   }
 
-  constexpr int num_sequences = NUM_PMJ_PATTERNS;
-  int sequence_size = clamp(next_power_of_two(aa_samples - 1), MIN_PMJ_SAMPLES, MAX_PMJ_SAMPLES);
-  if (kintegrator->sampling_pattern == SAMPLING_PATTERN_PMJ &&
+  /* Build pre-tabulated Sobol samples if needed. */
+  int sequence_size = clamp(
+      next_power_of_two(aa_samples - 1), MIN_TAB_SOBOL_SAMPLES, MAX_TAB_SOBOL_SAMPLES);
+  if (kintegrator->sampling_pattern == SAMPLING_PATTERN_TABULATED_SOBOL &&
       dscene->sample_pattern_lut.size() !=
-          (sequence_size * NUM_PMJ_DIMENSIONS * NUM_PMJ_PATTERNS)) {
-    kintegrator->pmj_sequence_size = sequence_size;
+          (sequence_size * NUM_TAB_SOBOL_PATTERNS * NUM_TAB_SOBOL_DIMENSIONS)) {
+    kintegrator->tabulated_sobol_sequence_size = sequence_size;
 
     if (dscene->sample_pattern_lut.size() != 0) {
       dscene->sample_pattern_lut.free();
     }
-    float2 *directions = (float2 *)dscene->sample_pattern_lut.alloc(sequence_size * num_sequences *
-                                                                    NUM_PMJ_DIMENSIONS);
+    float4 *directions = (float4 *)dscene->sample_pattern_lut.alloc(
+        sequence_size * NUM_TAB_SOBOL_PATTERNS * NUM_TAB_SOBOL_DIMENSIONS);
     TaskPool pool;
-    for (int j = 0; j < num_sequences; ++j) {
-      float2 *sequence = directions + j * sequence_size;
-      pool.push(
-          function_bind(&progressive_multi_jitter_02_generate_2D, sequence, sequence_size, j));
+    for (int j = 0; j < NUM_TAB_SOBOL_PATTERNS; ++j) {
+      float4 *sequence = directions + j * sequence_size;
+      pool.push(function_bind(&tabulated_sobol_generate_4D, sequence, sequence_size, j));
     }
     pool.wait_work();
 

intern/cycles/scene/jitter.cpp

@@ -1,57 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0
- * Copyright 2019-2022 Blender Foundation */
-
-/* This file is based on "Progressive Multi-Jittered Sample Sequences"
- * by Christensen, Kensler, and Kilpatrick, but with a much simpler and
- * faster implementation based on "Stochastic Generation of (t, s)
- * Sample Sequences" by Helmer, Christensen, and Kensler.
- */
-
-#include "scene/jitter.h"
-#include "util/hash.h"
-
-#include <math.h>
-#include <vector>
-
-CCL_NAMESPACE_BEGIN
-
-void progressive_multi_jitter_02_generate_2D(float2 points[], int size, int rng_seed)
-{
-  /* Xor values for generating the PMJ02 sequence.  These permute the
-   * order we visit the strata in, which is what makes the code below
-   * produce the PMJ02 sequence.  Other choices are also possible, but
-   * result in different sequences. */
-  static uint xors[2][32] = {
-      {0x00000000, 0x00000000, 0x00000002, 0x00000006, 0x00000006, 0x0000000e, 0x00000036,
-       0x0000004e, 0x00000016, 0x0000002e, 0x00000276, 0x000006ce, 0x00000716, 0x00000c2e,
-       0x00003076, 0x000040ce, 0x00000116, 0x0000022e, 0x00020676, 0x00060ece, 0x00061716,
-       0x000e2c2e, 0x00367076, 0x004ec0ce, 0x00170116, 0x002c022e, 0x02700676, 0x06c00ece,
-       0x07001716, 0x0c002c2e, 0x30007076, 0x4000c0ce},
-      {0x00000000, 0x00000001, 0x00000003, 0x00000003, 0x00000007, 0x0000001b, 0x00000027,
-       0x0000000b, 0x00000017, 0x0000013b, 0x00000367, 0x0000038b, 0x00000617, 0x0000183b,
-       0x00002067, 0x0000008b, 0x00000117, 0x0001033b, 0x00030767, 0x00030b8b, 0x00071617,
-       0x001b383b, 0x00276067, 0x000b808b, 0x00160117, 0x0138033b, 0x03600767, 0x03800b8b,
-       0x06001617, 0x1800383b, 0x20006067, 0x0000808b}};
-
-  uint rng_i = rng_seed;
-
-  points[0].x = hash_hp_float(rng_i++);
-  points[0].y = hash_hp_float(rng_i++);
-
-  /* Subdivide the domain into smaller and smaller strata, filling in new
-   * points as we go. */
-  for (int log_N = 0, N = 1; N < size; log_N++, N *= 2) {
-    float strata_count = (float)(N * 2);
-    for (int i = 0; i < N && (N + i) < size; i++) {
-      /* Find the strata that are already occupied in this cell. */
-      uint occupied_x_stratum = (uint)(points[i ^ xors[0][log_N]].x * strata_count);
-      uint occupied_y_stratum = (uint)(points[i ^ xors[1][log_N]].y * strata_count);
-
-      /* Generate a new point in the unoccupied strata. */
-      points[N + i].x = ((float)(occupied_x_stratum ^ 1) + hash_hp_float(rng_i++)) / strata_count;
-      points[N + i].y = ((float)(occupied_y_stratum ^ 1) + hash_hp_float(rng_i++)) / strata_count;
-    }
-  }
-}
-
-CCL_NAMESPACE_END

intern/cycles/scene/jitter.h

@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0
- * Copyright 2019-2022 Blender Foundation */
-
-#ifndef __JITTER_H__
-#define __JITTER_H__
-
-#include "util/types.h"
-
-CCL_NAMESPACE_BEGIN
-
-void progressive_multi_jitter_02_generate_2D(float2 points[], int size, int rng_seed);
-
-CCL_NAMESPACE_END
-
-#endif /* __JITTER_H__ */

intern/cycles/scene/light.cpp

@@ -616,18 +616,16 @@ void LightManager::device_update_tree(Device *,
             shader_flag |= SHADER_EXCLUDE_SHADOW_CATCHER;
           }
 
-          light_tree_emitters[emitter_index].prim_id = prim.prim_id + mesh->prim_offset;
+          light_tree_emitters[emitter_index].prim = prim.prim_id + mesh->prim_offset;
           light_tree_emitters[emitter_index].mesh_light.shader_flag = shader_flag;
-          light_tree_emitters[emitter_index].mesh_light.emission_sampling =
-              shader->emission_sampling;
+          light_tree_emitters[emitter_index].emission_sampling = shader->emission_sampling;
           triangle_array[prim.prim_id + object_lookup_offsets[prim.object_id]] = emitter_index;
         }
         else {
-          light_tree_emitters[emitter_index].prim_id = prim.prim_id;
+          light_tree_emitters[emitter_index].prim = prim.prim_id;
           light_tree_emitters[emitter_index].mesh_light.shader_flag = 0;
           light_tree_emitters[emitter_index].mesh_light.object_id = OBJECT_NONE;
-          light_tree_emitters[emitter_index].mesh_light.emission_sampling =
-              EMISSION_SAMPLING_FRONT_BACK;
+          light_tree_emitters[emitter_index].emission_sampling = EMISSION_SAMPLING_FRONT_BACK;
           light_array[~prim.prim_id] = emitter_index;
         }
 
@@ -726,7 +724,6 @@ void LightManager::device_update_background(Device *device,
   foreach (ShaderNode *node, shader->graph->nodes) {
     if (node->type == EnvironmentTextureNode::get_node_type()) {
       EnvironmentTextureNode *env = (EnvironmentTextureNode *)node;
-      ImageMetaData metadata;
       if (!env->handle.empty()) {
         ImageMetaData metadata = env->handle.metadata();
         environment_res.x = max(environment_res.x, (int)metadata.width);

intern/cycles/scene/light_tree.cpp

@@ -181,7 +181,9 @@ LightTreePrimitive::LightTreePrimitive(Scene *scene, int prim_id, int object_id)
       strength *= lamp->get_shader()->emission_estimate;
     }
 
-    energy = average(strength);
+    /* Use absolute value of energy so lights with negative strength are properly
+     * supported in the light tree. */
+    energy = fabsf(average(strength));
   }
 }
 

intern/cycles/scene/shader.cpp

@@ -349,7 +349,7 @@ void Shader::estimate_emission()
   }
 
   ShaderInput *surf = graph->output()->input("Surface");
-  emission_estimate = output_estimate_emission(surf->link, emission_is_constant);
+  emission_estimate = fabs(output_estimate_emission(surf->link, emission_is_constant));
 
   if (is_zero(emission_estimate)) {
     emission_sampling = EMISSION_SAMPLING_NONE;

intern/cycles/scene/shader_nodes.cpp

@@ -226,6 +226,7 @@ NODE_DEFINE(ImageTextureNode)
   extension_enum.insert("periodic", EXTENSION_REPEAT);
   extension_enum.insert("clamp", EXTENSION_EXTEND);
   extension_enum.insert("black", EXTENSION_CLIP);
+  extension_enum.insert("mirror", EXTENSION_MIRROR);
   SOCKET_ENUM(extension, "Extension", extension_enum, EXTENSION_REPEAT);
 
   static NodeEnum projection_enum;
@@ -5132,6 +5133,9 @@ void MixFloatNode::constant_fold(const ConstantFolder &folder)
     }
     folder.make_constant(a * (1 - fac) + b * fac);
   }
+  else {
+    folder.fold_mix_float(use_clamp, false);
+  }
 }
 
 /* Mix Vector */
@@ -5185,6 +5189,9 @@ void MixVectorNode::constant_fold(const ConstantFolder &folder)
     }
     folder.make_constant(a * (one_float3() - fac) + b * fac);
   }
+  else {
+    folder.fold_mix_color(NODE_MIX_BLEND, use_clamp, false);
+  }
 }
 
 /* Mix Vector Non Uniform */

intern/cycles/scene/tabulated_sobol.cpp

@@ -0,0 +1,71 @@
+/* SPDX-License-Identifier: Apache-2.0
+ * Copyright 2019-2022 Blender Foundation */
+
+/* This file is based on the paper "Stochastic Generation of (t, s)
+ * Sample Sequences" by Helmer, Christensen, and Kensler.
+ */
+
+#include "scene/tabulated_sobol.h"
+#include "util/hash.h"
+
+#include <math.h>
+#include <vector>
+
+CCL_NAMESPACE_BEGIN
+
+void tabulated_sobol_generate_4D(float4 points[], int size, int rng_seed)
+{
+  /* Xor values for generating the (4D) Owen-scrambled Sobol sequence.
+   * These permute the order we visit the strata in, which is what
+   * makes the code below produce the scrambled Sobol sequence.  Other
+   * choices are also possible, but result in different sequences. */
+  static uint xors[4][32] = {
+      {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+      {0x00000000, 0x00000001, 0x00000001, 0x00000007, 0x00000001, 0x00000013, 0x00000015,
+       0x0000007f, 0x00000001, 0x00000103, 0x00000105, 0x0000070f, 0x00000111, 0x00001333,
+       0x00001555, 0x00007fff, 0x00000001, 0x00010003, 0x00010005, 0x0007000f, 0x00010011,
+       0x00130033, 0x00150055, 0x007f00ff, 0x00010101, 0x01030303, 0x01050505, 0x070f0f0f,
+       0x01111111, 0x13333333, 0x15555555, 0x7fffffff},
+      {0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x00000005, 0x0000001f, 0x0000002b,
+       0x0000003d, 0x00000011, 0x00000133, 0x00000377, 0x00000199, 0x00000445, 0x00001ccf,
+       0x00002ddb, 0x0000366d, 0x00000101, 0x00010303, 0x00030707, 0x00010909, 0x00051515,
+       0x001f3f3f, 0x002b6b6b, 0x003dbdbd, 0x00101011, 0x01303033, 0x03707077, 0x01909099,
+       0x04515145, 0x1cf3f3cf, 0x2db6b6db, 0x36dbdb6d},
+      {0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x0000000d, 0x0000000c, 0x00000005,
+       0x0000004f, 0x00000014, 0x000000e7, 0x00000329, 0x0000039c, 0x00000011, 0x00001033,
+       0x00000044, 0x000030bb, 0x0000d1cd, 0x0000c2ec, 0x00005415, 0x0004fc3f, 0x00015054,
+       0x000e5c97, 0x0032e5b9, 0x0039725c, 0x00000101, 0x01000303, 0x00000404, 0x03000b0b,
+       0x0d001d1d, 0x0c002c2c, 0x05004545, 0x4f00cfcf},
+  };
+
+  /* Randomize the seed, in case it's incrementing.  The constant is just a
+   * random number, and has no other significance. */
+  uint rng_i = hash_hp_seeded_uint(rng_seed, 0x44605a73);
+
+  points[0].x = hash_hp_float(rng_i++);
+  points[0].y = hash_hp_float(rng_i++);
+  points[0].z = hash_hp_float(rng_i++);
+  points[0].w = hash_hp_float(rng_i++);
+
+  /* Subdivide the domain into smaller and smaller strata, filling in new
+   * points as we go. */
+  for (int log_N = 0, N = 1; N < size; log_N++, N *= 2) {
+    float strata_count = (float)(N * 2);
+    for (int i = 0; i < N && (N + i) < size; i++) {
+      /* Find the strata that are already occupied in this cell. */
+      uint occupied_x_stratum = (uint)(points[i ^ xors[0][log_N]].x * strata_count);
+      uint occupied_y_stratum = (uint)(points[i ^ xors[1][log_N]].y * strata_count);
+      uint occupied_z_stratum = (uint)(points[i ^ xors[2][log_N]].z * strata_count);
+      uint occupied_w_stratum = (uint)(points[i ^ xors[3][log_N]].w * strata_count);
+
+      /* Generate a new point in the unoccupied strata. */
+      points[N + i].x = ((float)(occupied_x_stratum ^ 1) + hash_hp_float(rng_i++)) / strata_count;
+      points[N + i].y = ((float)(occupied_y_stratum ^ 1) + hash_hp_float(rng_i++)) / strata_count;
+      points[N + i].z = ((float)(occupied_z_stratum ^ 1) + hash_hp_float(rng_i++)) / strata_count;
+      points[N + i].w = ((float)(occupied_w_stratum ^ 1) + hash_hp_float(rng_i++)) / strata_count;
+    }
+  }
+}
+
+CCL_NAMESPACE_END

intern/cycles/scene/tabulated_sobol.h

@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: Apache-2.0
+ * Copyright 2019-2022 Blender Foundation */
+
+#ifndef __TABULATED_SOBOL_H__
+#define __TABULATED_SOBOL_H__
+
+#include "util/types.h"
+
+CCL_NAMESPACE_BEGIN
+
+void tabulated_sobol_generate_4D(float4 points[], int size, int rng_seed);
+
+CCL_NAMESPACE_END
+
+#endif /* __TABULATED_SOBOL_H__ */

intern/cycles/test/util_float8_test.h

@@ -22,13 +22,26 @@ static bool validate_cpu_capabilities()
 #endif
 }
 
+/* These are not just static variables because we don't want to run the
+ * constructor until we know the instructions are supported. */
+static vfloat8 float8_a()
+{
+  return make_vfloat8(0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f);
+}
+
+static vfloat8 float8_b()
+{
+  return make_vfloat8(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f);
+}
+
+static vfloat8 float8_c()
+{
+  return make_vfloat8(1.1f, 2.2f, 3.3f, 4.4f, 5.5f, 6.6f, 7.7f, 8.8f);
+}
+
 #define INIT_FLOAT8_TEST \
   if (!validate_cpu_capabilities()) \
-    return; \
-\
-  const vfloat8 float8_a = make_vfloat8(0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f); \
-  const vfloat8 float8_b = make_vfloat8(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f); \
-  const vfloat8 float8_c = make_vfloat8(1.1f, 2.2f, 3.3f, 4.4f, 5.5f, 6.6f, 7.7f, 8.8f);
+    return;
 
 #define compare_vector_scalar(a, b) \
   for (size_t index = 0; index < 8; index++) \
@@ -57,15 +70,15 @@ static bool validate_cpu_capabilities()
 
 static const float float_b = 1.5f;
 
-TEST(TEST_CATEGORY_NAME,
-     float8_add_vv){basic_test_vv(float8_a, float8_b, +)} TEST(TEST_CATEGORY_NAME, float8_sub_vv){
-    basic_test_vv(float8_a, float8_b, -)} TEST(TEST_CATEGORY_NAME, float8_mul_vv){
-    basic_test_vv(float8_a, float8_b, *)} TEST(TEST_CATEGORY_NAME, float8_div_vv){
-    basic_test_vv(float8_a, float8_b, /)} TEST(TEST_CATEGORY_NAME, float8_add_vf){
-    basic_test_vf(float8_a, float_b, +)} TEST(TEST_CATEGORY_NAME, float8_sub_vf){
-    basic_test_vf(float8_a, float_b, -)} TEST(TEST_CATEGORY_NAME, float8_mul_vf){
-    basic_test_vf(float8_a, float_b, *)} TEST(TEST_CATEGORY_NAME,
-                                              float8_div_vf){basic_test_vf(float8_a, float_b, /)}
+TEST(TEST_CATEGORY_NAME, float8_add_vv){
+    basic_test_vv(float8_a(), float8_b(), +)} TEST(TEST_CATEGORY_NAME, float8_sub_vv){
+    basic_test_vv(float8_a(), float8_b(), -)} TEST(TEST_CATEGORY_NAME, float8_mul_vv){
+    basic_test_vv(float8_a(), float8_b(), *)} TEST(TEST_CATEGORY_NAME, float8_div_vv){
+    basic_test_vv(float8_a(), float8_b(), /)} TEST(TEST_CATEGORY_NAME, float8_add_vf){
+    basic_test_vf(float8_a(), float_b, +)} TEST(TEST_CATEGORY_NAME, float8_sub_vf){
+    basic_test_vf(float8_a(), float_b, -)} TEST(TEST_CATEGORY_NAME, float8_mul_vf){
+    basic_test_vf(float8_a(), float_b, *)} TEST(TEST_CATEGORY_NAME, float8_div_vf){
+    basic_test_vf(float8_a(), float_b, /)}
 
 TEST(TEST_CATEGORY_NAME, float8_ctor)
 {
@@ -85,18 +98,18 @@ TEST(TEST_CATEGORY_NAME, float8_sqrt)
 TEST(TEST_CATEGORY_NAME, float8_min_max)
 {
   INIT_FLOAT8_TEST
-  compare_vector_vector(min(float8_a, float8_b), float8_a);
-  compare_vector_vector(max(float8_a, float8_b), float8_b);
+  compare_vector_vector(min(float8_a(), float8_b()), float8_a());
+  compare_vector_vector(max(float8_a(), float8_b()), float8_b());
 }
 
 TEST(TEST_CATEGORY_NAME, float8_shuffle)
 {
   INIT_FLOAT8_TEST
-  vfloat8 res0 = shuffle<0, 1, 2, 3, 1, 3, 2, 0>(float8_a);
+  vfloat8 res0 = shuffle<0, 1, 2, 3, 1, 3, 2, 0>(float8_a());
   compare_vector_vector(res0, make_vfloat8(0.1f, 0.2f, 0.3f, 0.4f, 0.6f, 0.8f, 0.7f, 0.5f));
-  vfloat8 res1 = shuffle<3>(float8_a);
+  vfloat8 res1 = shuffle<3>(float8_a());
   compare_vector_vector(res1, make_vfloat8(0.4f, 0.4f, 0.4f, 0.4f, 0.8f, 0.8f, 0.8f, 0.8f));
-  vfloat8 res2 = shuffle<3, 2, 1, 0>(float8_a, float8_b);
+  vfloat8 res2 = shuffle<3, 2, 1, 0>(float8_a(), float8_b());
   compare_vector_vector(res2, make_vfloat8(0.4f, 0.3f, 2.0f, 1.0f, 0.8f, 0.7f, 6.0f, 5.0f));
 }
 

intern/cycles/util/texture.h

@@ -65,6 +65,8 @@ typedef enum ExtensionType {
   EXTENSION_EXTEND = 1,
   /* Clip to image size and set exterior pixels as transparent. */
   EXTENSION_CLIP = 2,
+  /* Repeatedly flip the image horizontally and vertically. */
+  EXTENSION_MIRROR = 3,
 
   EXTENSION_NUM_TYPES,
 } ExtensionType;

intern/ghost/GHOST_IWindow.h

@@ -274,7 +274,7 @@ class GHOST_IWindow {
    */
   virtual GHOST_TSuccess setCursorShape(GHOST_TStandardCursor cursorShape) = 0;
 
-  virtual GHOST_TSuccess getCursorGrabBounds(GHOST_Rect &bounds) = 0;
+  virtual GHOST_TSuccess getCursorGrabBounds(GHOST_Rect &bounds) const = 0;
 
   virtual void getCursorGrabState(GHOST_TGrabCursorMode &mode,
                                   GHOST_TAxisFlag &axis_flag,

intern/ghost/intern/GHOST_SystemWayland.cpp

@@ -5316,7 +5316,7 @@ GHOST_SystemWayland::GHOST_SystemWayland(bool background)
   /* Connect to the Wayland server. */
   display_->wl_display = wl_display_connect(nullptr);
   if (!display_->wl_display) {
-    gwl_display_destroy(display_);
+    this->~GHOST_SystemWayland();
     throw std::runtime_error("Wayland: unable to connect to display!");
   }
 
@@ -5360,7 +5360,7 @@ GHOST_SystemWayland::GHOST_SystemWayland(bool background)
               "WAYLAND found but libdecor was not, install libdecor for Wayland support, "
               "falling back to X11\n");
 #  endif
-      gwl_display_destroy(display_);
+      this->~GHOST_SystemWayland();
       throw std::runtime_error("Wayland: unable to find libdecor!");
 
       use_libdecor = true;
@@ -5377,7 +5377,7 @@ GHOST_SystemWayland::GHOST_SystemWayland(bool background)
     GWL_LibDecor_System &decor = *display_->libdecor;
     decor.context = libdecor_new(display_->wl_display, &libdecor_interface);
     if (!decor.context) {
-      gwl_display_destroy(display_);
+      this->~GHOST_SystemWayland();
       throw std::runtime_error("Wayland: unable to create window decorations!");
     }
   }
@@ -5388,7 +5388,7 @@ GHOST_SystemWayland::GHOST_SystemWayland(bool background)
   {
     GWL_XDG_Decor_System &decor = *display_->xdg_decor;
     if (!decor.shell) {
-      gwl_display_destroy(display_);
+      this->~GHOST_SystemWayland();
       throw std::runtime_error("Wayland: unable to access xdg_shell!");
     }
   }
@@ -5830,8 +5830,36 @@ static GHOST_TSuccess getCursorPositionClientRelative_impl(
     int32_t &y)
 {
   const wl_fixed_t scale = win->scale();
+
+  if (win->getCursorGrabModeIsWarp()) {
+    /* As the cursor is restored at the warped location,
+     * apply warping when requesting the cursor location. */
+    GHOST_Rect wrap_bounds{};
+    if (win->getCursorGrabModeIsWarp()) {
+      if (win->getCursorGrabBounds(wrap_bounds) == GHOST_kFailure) {
+        win->getClientBounds(wrap_bounds);
+      }
+    }
+    int xy_wrap[2] = {
+        seat_state_pointer->xy[0],
+        seat_state_pointer->xy[1],
+    };
+
+    GHOST_Rect wrap_bounds_scale;
+    wrap_bounds_scale.m_l = wl_fixed_from_int(wrap_bounds.m_l) / scale;
+    wrap_bounds_scale.m_t = wl_fixed_from_int(wrap_bounds.m_t) / scale;
+    wrap_bounds_scale.m_r = wl_fixed_from_int(wrap_bounds.m_r) / scale;
+    wrap_bounds_scale.m_b = wl_fixed_from_int(wrap_bounds.m_b) / scale;
+    wrap_bounds_scale.wrapPoint(UNPACK2(xy_wrap), 0, win->getCursorGrabAxis());
+
+    x = wl_fixed_to_int(scale * xy_wrap[0]);
+    y = wl_fixed_to_int(scale * xy_wrap[1]);
+  }
+  else {
     x = wl_fixed_to_int(scale * seat_state_pointer->xy[0]);
     y = wl_fixed_to_int(scale * seat_state_pointer->xy[1]);
+  }
+
   return GHOST_kSuccess;
 }
 

intern/ghost/intern/GHOST_SystemWin32.cpp

@@ -1061,82 +1061,62 @@ GHOST_EventCursor *GHOST_SystemWin32::processCursorEvent(GHOST_WindowWin32 *wind
 
   int32_t x_screen = screen_co[0], y_screen = screen_co[1];
   if (window->getCursorGrabModeIsWarp()) {
-    /* WORKAROUND:
-     * Sometimes Windows ignores `SetCursorPos()` or `SendInput()` calls or the mouse event is
-     * outdated. Identify these cases by checking if the cursor is not yet within bounds. */
-    static bool is_warping_x = false;
-    static bool is_warping_y = false;
+    static uint64_t last_warp_time = 0;
+    {
+      /* WORKAROUND: Check the mouse event timestamp so we can ignore mousemove events that were
+       * already in the queue before we changed the cursor position. */
+      MOUSEMOVEPOINT mp = {x_screen, y_screen};
+      ::GetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &mp, &mp, 1, GMMP_USE_DISPLAY_POINTS);
+      if (mp.time <= last_warp_time) {
+        return NULL;
+      }
+    }
 
     int32_t x_new = x_screen;
     int32_t y_new = y_screen;
     int32_t x_accum, y_accum;
-
-    /* Warp within bounds. */
-    {
     GHOST_Rect bounds;
-      int32_t bounds_margin = 0;
-      GHOST_TAxisFlag bounds_axis = GHOST_kAxisNone;
 
-      if (window->getCursorGrabMode() == GHOST_kGrabHide) {
-        window->getClientBounds(bounds);
-
-        /* WARNING(@campbellbarton): The current warping logic fails to warp on every event,
-         * so the box needs to small enough not to let the cursor escape the window but large
-         * enough that the cursor isn't being warped every time.
-         * If this was not the case it would be less trouble to simply warp the cursor to the
-         * center of the screen on every motion, see: D16558 (alternative fix for T102346). */
-        const int32_t subregion_div = 4; /* One quarter of the region. */
-        const int32_t size[2] = {bounds.getWidth(), bounds.getHeight()};
-        const int32_t center[2] = {(bounds.m_l + bounds.m_r) / 2, (bounds.m_t + bounds.m_b) / 2};
-        /* Shrink the box to prevent the cursor escaping. */
-        bounds.m_l = center[0] - (size[0] / (subregion_div * 2));
-        bounds.m_r = center[0] + (size[0] / (subregion_div * 2));
-        bounds.m_t = center[1] - (size[1] / (subregion_div * 2));
-        bounds.m_b = center[1] + (size[1] / (subregion_div * 2));
-        bounds_margin = 0;
-        bounds_axis = GHOST_TAxisFlag(GHOST_kAxisX | GHOST_kAxisY);
-      }
-      else {
     /* Fallback to window bounds. */
     if (window->getCursorGrabBounds(bounds) == GHOST_kFailure) {
       window->getClientBounds(bounds);
     }
-        bounds_margin = 2;
-        bounds_axis = window->getCursorGrabAxis();
-      }
 
     /* Could also clamp to screen bounds wrap with a window outside the view will
      * fail at the moment. Use inset in case the window is at screen bounds. */
-      bounds.wrapPoint(x_new, y_new, bounds_margin, bounds_axis);
-    }
+    bounds.wrapPoint(x_new, y_new, 2, window->getCursorGrabAxis());
 
     window->getCursorGrabAccum(x_accum, y_accum);
     if (x_new != x_screen || y_new != y_screen) {
-      system->setCursorPosition(x_new, y_new); /* wrap */
+      /* WORKAROUND: Store the current time so that we ignore outdated mousemove events. */
+      last_warp_time = ::GetTickCount64();
+
+      /* For more control over which timestamp to store in the event, we use `SendInput` instead of
+       * `SetCursorPos` here.
+       * It is quite unlikely to happen, but still possible that some event between
+       * `last_warp_time` and `GHOST_SystemWin32::setCursorPosition` is sent. */
+      INPUT input[3] = {0};
+      input[0].type = INPUT_MOUSE;
+      input[0].mi.dx = (LONG)(x_new * (65535.0f / GetSystemMetrics(SM_CXSCREEN)));
+      input[0].mi.dy = (LONG)(y_new * (65535.0f / GetSystemMetrics(SM_CYSCREEN)));
+      input[0].mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE;
+      input[0].mi.time = last_warp_time;
+
+      /* Send 3 events with a jitter to make sure Windows does not occasionally and
+       * inexplicably ignore `SetCursorPos` or `SendInput`. */
+      input[2] = input[1] = input[0];
+      input[1].mi.dx += 1;
+      ::SendInput(3, input, sizeof(INPUT));
 
-      /* Do not update the accum values if we are an outdated or failed pos-warp event. */
-      if (!is_warping_x) {
-        is_warping_x = x_new != x_screen;
-        if (is_warping_x) {
       x_accum += (x_screen - x_new);
-        }
-      }
-
-      if (!is_warping_y) {
-        is_warping_y = y_new != y_screen;
-        if (is_warping_y) {
       y_accum += (y_screen - y_new);
-        }
-      }
       window->setCursorGrabAccum(x_accum, y_accum);
 
-      /* When wrapping we don't need to add an event because the setCursorPosition call will cause
-       * a new event after. */
+      /* When wrapping we don't need to add an event because the `SendInput` call will cause new
+       * events after. */
       return NULL;
     }
 
-    is_warping_x = false;
-    is_warping_y = false;
     x_screen += x_accum;
     y_screen += y_accum;
   }
@@ -1210,16 +1190,16 @@ GHOST_EventKey *GHOST_SystemWin32::processKeyEvent(GHOST_WindowWin32 *window, RA
     const bool ctrl_pressed = has_state && state[VK_CONTROL] & 0x80;
     const bool alt_pressed = has_state && state[VK_MENU] & 0x80;
 
-    if (!key_down) {
-      /* Pass. */
-    }
+    /* We can be here with !key_down if processing dead keys (diacritics). See T103119. */
+
     /* No text with control key pressed (Alt can be used to insert special characters though!). */
-    else if (ctrl_pressed && !alt_pressed) {
+    if (ctrl_pressed && !alt_pressed) {
       /* Pass. */
     }
     /* Don't call #ToUnicodeEx on dead keys as it clears the buffer and so won't allow diacritical
-     * composition. */
-    else if (MapVirtualKeyW(vk, 2) != 0) {
+     * composition. XXX: we are not checking return of MapVirtualKeyW for high bit set, which is
+     * what is supposed to indicate dead keys. But this is working now so approach cautiously. */
+    else if (MapVirtualKeyW(vk, MAPVK_VK_TO_CHAR) != 0) {
       wchar_t utf16[3] = {0};
       int r;
       /* TODO: #ToUnicodeEx can respond with up to 4 utf16 chars (only 2 here).
@@ -1234,6 +1214,10 @@ GHOST_EventKey *GHOST_SystemWin32::processKeyEvent(GHOST_WindowWin32 *window, RA
           utf8_char[0] = '\0';
         }
       }
+      if (!key_down) {
+        /* Clear or wm_event_add_ghostevent will warn of unexpected data on key up. */
+        utf8_char[0] = '\0';
+      }
     }
 
 #ifdef WITH_INPUT_IME

intern/ghost/intern/GHOST_SystemX11.cpp

@@ -275,10 +275,6 @@ uint8_t GHOST_SystemX11::getNumDisplays() const
   return uint8_t(1);
 }
 
-/**
- * Returns the dimensions of the main display on this system.
- * \return The dimension of the main display.
- */
 void GHOST_SystemX11::getMainDisplayDimensions(uint32_t &width, uint32_t &height) const
 {
   if (m_display) {
@@ -289,10 +285,6 @@ void GHOST_SystemX11::getMainDisplayDimensions(uint32_t &width, uint32_t &height
   }
 }
 
-/**
- * Returns the dimensions of the main display on this system.
- * \return The dimension of the main display.
- */
 void GHOST_SystemX11::getAllDisplayDimensions(uint32_t &width, uint32_t &height) const
 {
   if (m_display) {
@@ -301,22 +293,6 @@ void GHOST_SystemX11::getAllDisplayDimensions(uint32_t &width, uint32_t &height)
   }
 }
 
-/**
- * Create a new window.
- * The new window is added to the list of windows managed.
- * Never explicitly delete the window, use #disposeWindow() instead.
- * \param title: The name of the window
- * (displayed in the title bar of the window if the OS supports it).
- * \param left: The coordinate of the left edge of the window.
- * \param top: The coordinate of the top edge of the window.
- * \param width: The width the window.
- * \param height: The height the window.
- * \param state: The state of the window when opened.
- * \param glSettings: Misc OpenGL settings.
- * \param exclusive: Use to show the window on top and ignore others (used full-screen).
- * \param parentWindow: Parent window.
- * \return The new window (or 0 if creation failed).
- */
 GHOST_IWindow *GHOST_SystemX11::createWindow(const char *title,
                                              int32_t left,
                                              int32_t top,
@@ -417,11 +393,7 @@ static GHOST_Context *create_glx_context(Display *display,
 
   return nullptr;
 }
-/**
- * Create a new off-screen context.
- * Never explicitly delete the context, use #disposeContext() instead.
- * \return The new context (or 0 if creation failed).
- */
+
 GHOST_IContext *GHOST_SystemX11::createOffscreenContext(GHOST_GLSettings glSettings)
 {
   /* During development:
@@ -479,11 +451,6 @@ GHOST_IContext *GHOST_SystemX11::createOffscreenContext(GHOST_GLSettings glSetti
   return nullptr;
 }
 
-/**
- * Dispose of a context.
- * \param context: Pointer to the context to be disposed.
- * \return Indication of success.
- */
 GHOST_TSuccess GHOST_SystemX11::disposeContext(GHOST_IContext *context)
 {
   delete context;
@@ -950,47 +917,16 @@ void GHOST_SystemX11::processEvent(XEvent *xe)
         int32_t x_new = xme.x_root;
         int32_t y_new = xme.y_root;
         int32_t x_accum, y_accum;
-
-        /* Warp within bounds. */
-        {
         GHOST_Rect bounds;
-          int32_t bounds_margin = 0;
-          GHOST_TAxisFlag bounds_axis = GHOST_kAxisNone;
 
-          if (window->getCursorGrabMode() == GHOST_kGrabHide) {
-            window->getClientBounds(bounds);
-
-            /* TODO(@campbellbarton): warp the cursor to `window->getCursorGrabInitPos`,
-             * on every motion event, see: D16557 (alternative fix for T102346). */
-            const int32_t subregion_div = 4; /* One quarter of the region. */
-            const int32_t size[2] = {bounds.getWidth(), bounds.getHeight()};
-            const int32_t center[2] = {
-                (bounds.m_l + bounds.m_r) / 2,
-                (bounds.m_t + bounds.m_b) / 2,
-            };
-            /* Shrink the box to prevent the cursor escaping. */
-            bounds.m_l = center[0] - (size[0] / (subregion_div * 2));
-            bounds.m_r = center[0] + (size[0] / (subregion_div * 2));
-            bounds.m_t = center[1] - (size[1] / (subregion_div * 2));
-            bounds.m_b = center[1] + (size[1] / (subregion_div * 2));
-            bounds_margin = 0;
-            bounds_axis = GHOST_TAxisFlag(GHOST_kAxisX | GHOST_kAxisY);
-          }
-          else {
-            /* Fallback to window bounds. */
+        /* fallback to window bounds */
         if (window->getCursorGrabBounds(bounds) == GHOST_kFailure) {
           window->getClientBounds(bounds);
         }
-            /* Could also clamp to screen bounds wrap with a window outside the view will
-             * fail at the moment. Use offset of 8 in case the window is at screen bounds. */
-            bounds_margin = 8;
-            bounds_axis = window->getCursorGrabAxis();
-          }
 
         /* Could also clamp to screen bounds wrap with a window outside the view will
-           * fail at the moment. Use inset in case the window is at screen bounds. */
-          bounds.wrapPoint(x_new, y_new, bounds_margin, bounds_axis);
-        }
+         * fail at the moment. Use offset of 8 in case the window is at screen bounds. */
+        bounds.wrapPoint(x_new, y_new, 8, window->getCursorGrabAxis());
 
         window->getCursorGrabAccum(x_accum, y_accum);
 

intern/ghost/intern/GHOST_Window.cpp

@@ -175,7 +175,7 @@ GHOST_TSuccess GHOST_Window::setCursorGrab(GHOST_TGrabCursorMode mode,
   return GHOST_kFailure;
 }
 
-GHOST_TSuccess GHOST_Window::getCursorGrabBounds(GHOST_Rect &bounds)
+GHOST_TSuccess GHOST_Window::getCursorGrabBounds(GHOST_Rect &bounds) const
 {
   if (m_cursorGrab != GHOST_kGrabWrap) {
     return GHOST_kFailure;

intern/ghost/intern/GHOST_Window.h

@@ -152,7 +152,7 @@ class GHOST_Window : public GHOST_IWindow {
    * Gets the cursor grab region, if unset the window is used.
    * reset when grab is disabled.
    */
-  GHOST_TSuccess getCursorGrabBounds(GHOST_Rect &bounds) override;
+  GHOST_TSuccess getCursorGrabBounds(GHOST_Rect &bounds) const override;
 
   void getCursorGrabState(GHOST_TGrabCursorMode &mode,
                           GHOST_TAxisFlag &axis_flag,

intern/ghost/intern/GHOST_WindowWayland.cpp

@@ -1203,10 +1203,6 @@ void GHOST_WindowWayland::setOpaque() const
 }
 #endif
 
-/**
- * \param type: The type of rendering context create.
- * \return Indication of success.
- */
 GHOST_Context *GHOST_WindowWayland::newDrawingContext(GHOST_TDrawingContextType type)
 {
   GHOST_Context *context;

intern/ghost/intern/GHOST_WindowX11.cpp

@@ -1112,11 +1112,6 @@ void GHOST_WindowX11::validate()
   m_invalid_window = false;
 }
 
-/**
- * Destructor.
- * Closes the window and disposes resources allocated.
- */
-
 GHOST_WindowX11::~GHOST_WindowX11()
 {
   std::map<uint, Cursor>::iterator it = m_standard_cursors.begin();

intern/ghost/test/CMakeLists.txt

@@ -167,7 +167,7 @@ add_library(bli_lib
   "../../../source/blender/blenlib/intern/rct.c"
   "../../../source/blender/blenlib/intern/string.c"
   "../../../source/blender/blenlib/intern/string_utf8.c"
-  "../../../source/blender/blenlib/intern/listbase.c"
+  "../../../source/blender/blenlib/intern/listbase.cc"
   "../../../source/blender/blenlib/intern/math_color.c"
   "../../../source/blender/blenlib/intern/math_geom.c"
   "../../../source/blender/blenlib/intern/math_matrix.c"

release/scripts/modules/bpy_extras/anim_utils.py

@@ -9,13 +9,24 @@ __all__ = (
 )
 
 import bpy
-from typing import Mapping, List, Tuple, Sequence
+from bpy.types import Action
 
-# (fcurve.data_path, fcurve.array_index)
-FCurveKey = Tuple[str, int]
-# [frame0, value0, frame1, value1, ...]
+from typing import (
+    List,
+    Mapping,
+    Sequence,
+    Tuple,
+)
+
+FCurveKey = Tuple[
+    # `fcurve.data_path`.
+    str,
+    # `fcurve.array_index`.
+    int,
+]
+
+# List of `[frame0, value0, frame1, value1, ...]` pairs.
 ListKeyframes = List[float]
-Action = bpy.types.Action
 
 
 def bake_action(
@@ -144,11 +155,11 @@ def bake_action_iter(
 
     # Note: BBONE_PROPS is a list so we can preserve the ordering
     BBONE_PROPS = [
-        'bbone_curveinx', 'bbone_curveoutx',
-        'bbone_curveinz', 'bbone_curveoutz',
-        'bbone_rollin', 'bbone_rollout',
-        'bbone_scalein', 'bbone_scaleout',
-        'bbone_easein', 'bbone_easeout'
+        "bbone_curveinx", "bbone_curveoutx",
+        "bbone_curveinz", "bbone_curveoutz",
+        "bbone_rollin", "bbone_rollout",
+        "bbone_scalein", "bbone_scaleout",
+        "bbone_easein", "bbone_easeout",
     ]
     BBONE_PROPS_LENGTHS = {
         "bbone_curveinx": 1,
@@ -433,14 +444,18 @@ def bake_action_iter(
 
 
 class KeyframesCo:
-    """A buffer for keyframe Co unpacked values per FCurveKey. FCurveKeys are added using
-    add_paths(), Co values stored using extend_co_values(), then finally use
-    insert_keyframes_into_*_action() for efficiently inserting keys into the fcurves.
+    """
+    A buffer for keyframe Co unpacked values per ``FCurveKey``. ``FCurveKeys`` are added using
+    ``add_paths()``, Co values stored using extend_co_values(), then finally use
+    ``insert_keyframes_into_*_action()`` for efficiently inserting keys into the F-curves.
 
     Users are limited to one Action Group per instance.
     """
+    __slots__ = (
+        "keyframes_from_fcurve",
+    )
 
-    # keyframes[(rna_path, array_index)] = list(time0,value0, time1,value1,...)
+    # `keyframes[(rna_path, array_index)] = list(time0,value0, time1,value1,...)`.
     keyframes_from_fcurve: Mapping[FCurveKey, ListKeyframes]
 
     def __init__(self):
@@ -480,11 +495,12 @@ class KeyframesCo:
         action: Action,
         action_group_name: str,
     ) -> None:
-        """Assumes the action is new, that it has no fcurves. Otherwise, the only difference between versions is
+        """
+        Assumes the action is new, that it has no F-curves. Otherwise, the only difference between versions is
         performance and implementation simplicity.
 
-        Args:
-            action_group_name (str): Name of Action Group that fcurves are added to.
+        :arg action_group_name: Name of Action Group that F-curves are added to.
+        :type action_group_name: str
         """
         linear_enum_values = [
             bpy.types.Keyframe.bl_rna.properties["interpolation"].enum_items["LINEAR"].value
@@ -513,14 +529,15 @@ class KeyframesCo:
         action: Action,
         action_group_name: str,
     ) -> None:
-        """Assumes the action already exists, that it might already have fcurves. Otherwise, the
+        """
+        Assumes the action already exists, that it might already have F-curves. Otherwise, the
         only difference between versions is performance and implementation simplicity.
 
-        Args:
-            lookup_fcurves (Mapping[FCurveKey, bpy.types.FCurve]): This is only used for efficiency.
-            It's a substitute for action.fcurves.find() which is a potentially expensive linear
-            search.
-            action_group_name (str): Name of Action Group that fcurves are added to.
+        :arg lookup_fcurves: : This is only used for efficiency.
+           It's a substitute for ``action.fcurves.find()`` which is a potentially expensive linear search.
+        :type lookup_fcurves: ``Mapping[FCurveKey, bpy.types.FCurve]``
+        :arg action_group_name: Name of Action Group that F-curves are added to.
+        :type action_group_name: str
         """
         linear_enum_values = [
             bpy.types.Keyframe.bl_rna.properties["interpolation"].enum_items["LINEAR"].value
@@ -539,7 +556,7 @@ class KeyframesCo:
 
             keyframe_points = fcurve.keyframe_points
 
-            co_buffer = [0] * 2 * len(keyframe_points)
+            co_buffer = [0] * (2 * len(keyframe_points))
             keyframe_points.foreach_get("co", co_buffer)
             co_buffer.extend(key_values)
 

release/scripts/modules/bpy_extras/io_utils.py

@@ -12,7 +12,7 @@ __all__ = (
     "path_reference",
     "path_reference_copy",
     "path_reference_mode",
-    "unique_name"
+    "unique_name",
 )
 
 import bpy

release/scripts/startup/bl_operators/clip.py

@@ -1028,7 +1028,7 @@ class CLIP_OT_track_settings_to_track(Operator):
         "use_red_channel",
         "use_green_channel",
         "use_blue_channel",
-        "weight"
+        "weight",
     )
 
     _attrs_marker = (

release/scripts/startup/bl_operators/object.py

@@ -776,7 +776,7 @@ class TransformsToDeltasAnim(Operator):
             "rotation_euler": "delta_rotation_euler",
             "rotation_quaternion": "delta_rotation_quaternion",
             # "rotation_axis_angle" : "delta_rotation_axis_angle",
-            "scale": "delta_scale"
+            "scale": "delta_scale",
         }
         DELTA_PATHS = STANDARD_TO_DELTA_PATHS.values()
 

release/scripts/startup/bl_operators/object_quick_effects.py

@@ -46,7 +46,7 @@ class QuickFur(ObjectModeOperator, Operator):
         items=(
             ('LIGHT', "Light", ""),
             ('MEDIUM', "Medium", ""),
-            ('HEAVY', "Heavy", "")
+            ('HEAVY', "Heavy", ""),
         ),
         default='MEDIUM',
     )

release/scripts/startup/bl_operators/presets.py

@@ -20,7 +20,7 @@ from bpy.app.translations import (
 WindowManager.preset_name = StringProperty(
     name="Preset Name",
     description="Name for new preset",
-    default=data_("New Preset")
+    default=data_("New Preset"),
 )
 
 
@@ -309,7 +309,7 @@ class AddPresetCamera(AddPresetBase, Operator):
         preset_values = [
             "cam.sensor_width",
             "cam.sensor_height",
-            "cam.sensor_fit"
+            "cam.sensor_fit",
         ]
         if self.use_focal_length:
             preset_values.append("cam.lens")
@@ -439,7 +439,7 @@ class AddPresetTrackingCamera(AddPresetBase, Operator):
             "camera.pixel_aspect",
             "camera.k1",
             "camera.k2",
-            "camera.k3"
+            "camera.k3",
         ]
         if self.use_focal_length:
             preset_values.append("camera.units")
@@ -459,7 +459,7 @@ class AddPresetTrackingTrackColor(AddPresetBase, Operator):
 
     preset_values = [
         "track.color",
-        "track.use_custom_color"
+        "track.use_custom_color",
     ]
 
     preset_subdir = "tracking_track_color"
@@ -489,7 +489,7 @@ class AddPresetTrackingSettings(AddPresetBase, Operator):
         "settings.use_default_red_channel",
         "settings.use_default_green_channel",
         "settings.use_default_blue_channel",
-        "settings.default_weight"
+        "settings.default_weight",
     ]
 
     preset_subdir = "tracking_settings"
@@ -507,7 +507,7 @@ class AddPresetNodeColor(AddPresetBase, Operator):
 
     preset_values = [
         "node.color",
-        "node.use_custom_color"
+        "node.use_custom_color",
     ]
 
     preset_subdir = "node_color"
@@ -616,7 +616,7 @@ class AddPresetGpencilBrush(AddPresetBase, Operator):
 
     preset_defines = [
         "brush = bpy.context.tool_settings.gpencil_paint.brush",
-        "settings = brush.gpencil_settings"
+        "settings = brush.gpencil_settings",
     ]
 
     preset_values = [
@@ -650,7 +650,7 @@ class AddPresetGpencilMaterial(AddPresetBase, Operator):
 
     preset_defines = [
         "material = bpy.context.object.active_material",
-        "gpcolor = material.grease_pencil"
+        "gpcolor = material.grease_pencil",
     ]
 
     preset_values = [

release/scripts/startup/bl_operators/screen_play_rendered_anim.py

@@ -133,7 +133,7 @@ class PlayRenderedAnim(Operator):
                 "-speed", str(fps_final),
                 "-in_out", str(frame_start), str(frame_end),
                 "-frame", str(scene.frame_current),
-                "-time_units", "Frames"
+                "-time_units", "Frames",
             ]
             cmd.extend(opts)
         elif preset == 'FRAMECYCLER':