[Bf-blender-cvs] [7111f74bc4d] cycles_path_guiding: Merge branch 'master' into cycles_path_guiding

Mon Aug 1 18:59:13 CEST 2022

Commit: 7111f74bc4d33cd0aaa3e4771ff05981df41ac42
Author: Sebastian Herholz
Date:   Mon Aug 1 18:55:09 2022 +0200
Branches: cycles_path_guiding
https://developer.blender.org/rB7111f74bc4d33cd0aaa3e4771ff05981df41ac42

Merge branch 'master' into cycles_path_guiding

===================================================================



===================================================================

diff --cc build_files/build_environment/cmake/download.cmake
index d32e088460b,547bf77f8dd..8d733549140

--- a/build_files/build_environment/cmake/download.cmake
+++ b/build_files/build_environment/cmake/download.cmake
@@@ -100,5 -100,20 +100,21 @@@ download_source(FMT
  download_source(ROBINMAP)
  download_source(IMATH)
  download_source(PYSTRING)
- download_source(LEVEL_ZERO)
 +download_source(OPENPGL)
+ download_source(LEVEL_ZERO)
+ download_source(DPCPP)
+ download_source(VCINTRINSICS)
+ download_source(OPENCLHEADERS)
+ download_source(ICDLOADER)
+ download_source(MP11)
+ download_source(SPIRV_HEADERS)
+ download_source(IGC)
+ download_source(IGC_LLVM)
+ download_source(IGC_OPENCL_CLANG)
+ download_source(IGC_VCINTRINSICS)
+ download_source(IGC_SPIRV_HEADERS)
+ download_source(IGC_SPIRV_TOOLS)
+ download_source(IGC_SPIRV_TRANSLATOR)
+ download_source(GMMLIB)
+ download_source(OCLOC)
+ download_source(AOM)
diff --cc build_files/build_environment/cmake/versions.cmake
index 975bca24eed,d0bcdc21b20..448de7ba488
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@@ -497,15 -497,145 +497,152 @@@ set(BROTLI_HASH f9e8d81d0405ba66d181529
  set(BROTLI_HASH_TYPE SHA256)
  set(BROTLI_FILE brotli-${BROTLI_VERSION}.tar.gz)
  
- set(LEVEL_ZERO_VERSION v1.7.15)
- set(LEVEL_ZERO_URI https://github.com/oneapi-src/level-zero/archive/refs/tags/${LEVEL_ZERO_VERSION}.tar.gz)
- set(LEVEL_ZERO_HASH c39bb05a8e5898aa6c444e1704105b93d3f1888b9c333f8e7e73825ffbfb2617)
- set(LEVEL_ZERO_HASH_TYPE SHA256)
- set(LEVEL_ZERO_FILE level-zero-${LEVEL_ZERO_VERSION}.tar.gz)
- 
 +set(OPENPGL_VERSION v0.3.1-beta)
 +set(OPENPGL_SHORT_VERSION 0.3.1)
 +set(OPENPGL_URI https://github.com/OpenPathGuidingLibrary/openpgl/archive/refs/tags/${OPENPGL_VERSION}.tar.gz)
 +set(OPENPGL_HASH 3830098c485c962018932766199527aab453a8029528dbbc04d4454d82431e2c)
 +set(OPENPGL_HASH_TYPE SHA256)
 +set(OPENPGL_FILE openpgl-${OPENPGL_VERSION}.tar.gz)
++
+ set(LEVEL_ZERO_VERSION v1.7.15)
+ set(LEVEL_ZERO_URI https://github.com/oneapi-src/level-zero/archive/refs/tags/${LEVEL_ZERO_VERSION}.tar.gz)
+ set(LEVEL_ZERO_HASH c39bb05a8e5898aa6c444e1704105b93d3f1888b9c333f8e7e73825ffbfb2617)
+ set(LEVEL_ZERO_HASH_TYPE SHA256)
+ set(LEVEL_ZERO_FILE level-zero-${LEVEL_ZERO_VERSION}.tar.gz)
+ 
+ set(DPCPP_VERSION 20220620)
+ set(DPCPP_URI https://github.com/intel/llvm/archive/refs/tags/sycl-nightly/${DPCPP_VERSION}.tar.gz)
+ set(DPCPP_HASH a5f41abd5229d28afa92cbd8a5d8d786ee698bf239f722929fd686276bad692c)
+ set(DPCPP_HASH_TYPE SHA256)
+ set(DPCPP_FILE DPCPP-${DPCPP_VERSION}.tar.gz)
+ 
+ ########################
+ ### DPCPP DEPS BEGIN ###
+ ########################
+ # The following deps are build time requirements for dpcpp, when possible
+ # the source in the dpcpp source tree for the version chosen is documented
+ # by each dep, these will only have to be downloaded and unpacked, dpcpp
+ # will take care of building them, unpack is being done in dpcpp_deps.cmake
+ 
+ # Source llvm/lib/SYCLLowerIR/CMakeLists.txt
+ set(VCINTRINSICS_VERSION 984bb27baacce6ee5c716c2e64845f2a1928025b)
+ set(VCINTRINSICS_URI https://github.com/intel/vc-intrinsics/archive/${VCINTRINSICS_VERSION}.tar.gz)
+ set(VCINTRINSICS_HASH abea415a15a0dd11fdc94dee8fb462910f2548311b787e02f42509789e1b0d7b)
+ set(VCINTRINSICS_HASH_TYPE SHA256)
+ set(VCINTRINSICS_FILE vc-intrinsics-${VCINTRINSICS_VERSION}.tar.gz)
+ 
+ # Source opencl/CMakeLists.txt
+ set(OPENCLHEADERS_VERSION dcd5bede6859d26833cd85f0d6bbcee7382dc9b3)
+ set(OPENCLHEADERS_URI https://github.com/KhronosGroup/OpenCL-Headers/archive/${OPENCLHEADERS_VERSION}.tar.gz)
+ set(OPENCLHEADERS_HASH ca8090359654e94f2c41e946b7e9d826253d795ae809ce7c83a7d3c859624693)
+ set(OPENCLHEADERS_HASH_TYPE SHA256)
+ set(OPENCLHEADERS_FILE opencl_headers-${OPENCLHEADERS_VERSION}.tar.gz)
+ 
+ # Source opencl/CMakeLists.txt
+ set(ICDLOADER_VERSION aec3952654832211636fc4af613710f80e203b0a)
+ set(ICDLOADER_URI https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${ICDLOADER_VERSION}.tar.gz)
+ set(ICDLOADER_HASH e1880551d67bd8dc31d13de63b94bbfd6b1f315b6145dad1ffcd159b89bda93c)
+ set(ICDLOADER_HASH_TYPE SHA256)
+ set(ICDLOADER_FILE icdloader-${ICDLOADER_VERSION}.tar.gz)
+ 
+ # Source sycl/cmake/modules/AddBoostMp11Headers.cmake
+ # Using external MP11 here, getting AddBoostMp11Headers.cmake to recognize
+ # our copy in boost directly was more trouble than it was worth.
+ set(MP11_VERSION 7bc4e1ae9b36ec8ee635c3629b59ec525bbe82b9)
+ set(MP11_URI https://github.com/boostorg/mp11/archive/${MP11_VERSION}.tar.gz)
+ set(MP11_HASH 071ee2bd3952ec89882edb3af25dd1816f6b61723f66e42eea32f4d02ceef426)
+ set(MP11_HASH_TYPE SHA256)
+ set(MP11_FILE mp11-${MP11_VERSION}.tar.gz)
+ 
+ # Source llvm-spirv/CMakeLists.txt (repo)
+ # Source llvm-spirv/spirv-headers-tag.conf (hash)
+ set(SPIRV_HEADERS_VERSION 36c0c1596225e728bd49abb7ef56a3953e7ed468)
+ set(SPIRV_HEADERS_URI https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_VERSION}.tar.gz)
+ set(SPIRV_HEADERS_HASH 7a5c89633f8740456fe8adee052033e134476d267411d1336c0cb1e587a9229a)
+ set(SPIRV_HEADERS_HASH_TYPE SHA256)
+ set(SPIRV_HEADERS_FILE SPIR-V-Headers-${SPIRV_HEADERS_VERSION}.tar.gz)
+ 
+ ######################
+ ### DPCPP DEPS END ###
+ ######################
+ 
+ ##########################################
+ ### Intel Graphics Compiler DEPS BEGIN ###
+ ##########################################
+ # The following deps are build time requirements for the intel graphics
+ # compiler, the versions used are taken from the following location
+ # https://github.com/intel/intel-graphics-compiler/releases
+ 
+ set(IGC_VERSION 1.0.11222)
+ set(IGC_URI https://github.com/intel/intel-graphics-compiler/archive/refs/tags/igc-${IGC_VERSION}.tar.gz)
+ set(IGC_HASH d92f0608dcbb52690855685f9447282e5c09c0ba98ae35fabf114fcf8b1e9fcf)
+ set(IGC_HASH_TYPE SHA256)
+ set(IGC_FILE igc-${IGC_VERSION}.tar.gz)
+ 
+ set(IGC_LLVM_VERSION llvmorg-11.1.0)
+ set(IGC_LLVM_URI https://github.com/llvm/llvm-project/archive/refs/tags/${IGC_LLVM_VERSION}.tar.gz)
+ set(IGC_LLVM_HASH 53a0719f3f4b0388013cfffd7b10c7d5682eece1929a9553c722348d1f866e79)
+ set(IGC_LLVM_HASH_TYPE SHA256)
+ set(IGC_LLVM_FILE ${IGC_LLVM_VERSION}.tar.gz)
+ 
+ # WARNING WARNING WARNING
+ #
+ # IGC_OPENCL_CLANG contains patches for some of its dependencies.
+ #
+ # Whenever IGC_OPENCL_CLANG_VERSION changes, one *MUST* inspect
+ # IGC_OPENCL_CLANG's patches folder and update igc.cmake to account for
+ # any added or removed patches.
+ #
+ # WARNING WARNING WARNING
+ 
+ set(IGC_OPENCL_CLANG_VERSION bbdd1587f577397a105c900be114b56755d1f7dc)
+ set(IGC_OPENCL_CLANG_URI https://github.com/intel/opencl-clang/archive/${IGC_OPENCL_CLANG_VERSION}.tar.gz)
+ set(IGC_OPENCL_CLANG_HASH d08315f1b0d8a6fef33de2b3e6aa7356534c324910634962c72523d970773efc)
+ set(IGC_OPENCL_CLANG_HASH_TYPE SHA256)
+ set(IGC_OPENCL_CLANG_FILE opencl-clang-${IGC_OPENCL_CLANG_VERSION}.tar.gz)
+ 
+ set(IGC_VCINTRINSICS_VERSION v0.4.0)
+ set(IGC_VCINTRINSICS_URI https://github.com/intel/vc-intrinsics/archive/refs/tags/${IGC_VCINTRINSICS_VERSION}.tar.gz)
+ set(IGC_VCINTRINSICS_HASH c8b92682ad5031cf9d5b82a40e7d5c0e763cd9278660adbcaa69aab988e4b589)
+ set(IGC_VCINTRINSICS_HASH_TYPE SHA256)
+ set(IGC_VCINTRINSICS_FILE vc-intrinsics-${IGC_VCINTRINSICS_VERSION}.tar.gz)
+ 
+ set(IGC_SPIRV_HEADERS_VERSION sdk-1.3.204.1)
+ set(IGC_SPIRV_HEADERS_URI https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/${IGC_SPIRV_HEADERS_VERSION}.tar.gz)
+ set(IGC_SPIRV_HEADERS_HASH 262864053968c217d45b24b89044a7736a32361894743dd6cfe788df258c746c)
+ set(IGC_SPIRV_HEADERS_HASH_TYPE SHA256)
+ set(IGC_SPIRV_HEADERS_FILE SPIR-V-Headers-${IGC_SPIRV_HEADERS_VERSION}.tar.gz)
+ 
+ set(IGC_SPIRV_TOOLS_VERSION sdk-1.3.204.1)
+ set(IGC_SPIRV_TOOLS_URI https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/${IGC_SPIRV_TOOLS_VERSION}.tar.gz)
+ set(IGC_SPIRV_TOOLS_HASH 6e19900e948944243024aedd0a201baf3854b377b9cc7a386553bc103b087335)
+ set(IGC_SPIRV_TOOLS_HASH_TYPE SHA256)
+ set(IGC_SPIRV_TOOLS_FILE SPIR-V-Tools-${IGC_SPIRV_TOOLS_VERSION}.tar.gz)
+ 
+ set(IGC_SPIRV_TRANSLATOR_VERSION 99420daab98998a7e36858befac9c5ed109d4920)
+ set(IGC_SPIRV_TRANSLATOR_URI https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/${IGC_SPIRV_TRANSLATOR_VERSION}.tar.gz)
+ set(IGC_SPIRV_TRANSLATOR_HASH 77dfb4ddb6bfb993535562c02ddea23f0a0d1c5a0258c1afe7e27c894ff783a8)
+ set(IGC_SPIRV_TRANSLATOR_HASH_TYPE SHA256)
+ set(IGC_SPIRV_TRANSLATOR_FILE SPIR-V-Translator-${IGC_SPIRV_TRANSLATOR_VERSION}.tar.gz)
+ 
+ ########################################
+ ### Intel Graphics Compiler DEPS END ###
+ ########################################
+ 
+ set(GMMLIB_VERSION intel-gmmlib-22.1.2)
+ set(GMMLIB_URI https://github.com/intel/gmmlib/archive/refs/tags/${GMMLIB_VERSION}.tar.gz)
+ set(GMMLIB_HASH 3b9a6d5e7e3f5748b3d0a2fb0e980ae943907fece0980bd9c0508e71c838e334)
+ set(GMMLIB_HASH_TYPE SHA256)
+ set(GMMLIB_FILE ${GMMLIB_VERSION}.tar.gz)
+ 
+ set(OCLOC_VERSION 22.20.23198)
+ set(OCLOC_URI https://github.com/intel/compute-runtime/archive/refs/tags/${OCLOC_VERSION}.tar.gz)
+ set(OCLOC_HASH ab22b8bf2560a57fdd3def0e35a62ca75991406f959c0263abb00cd6cd9ae998)
+ set(OCLOC_HASH_TYPE SHA256)
+ set(OCLOC_FILE ocloc-${OCLOC_VERSION}.tar.gz)
+ 
+ set(AOM_VERSION 3.4.0)
+ set(AOM_URI https://storage.googleapis.com/aom-releases/libaom-${AOM_VERSION}.tar.gz)
+ set(AOM_HASH bd754b58c3fa69f3ffd29da77de591bd9c26970e3b18537951336d6c0252e354)
+ set(AOM_HASH_TYPE SHA256)
+ set(AOM_FILE libaom-${AOM_VERSION}.tar.gz)
diff --cc intern/cycles/kernel/data_template.h
index 00000000000,807d0650fc3..d4bbaa0fcb9
mode 000000,100644..100644
--- a/intern/cycles/kernel/data_template.h
+++ b/intern/cycles/kernel/data_template.h
@@@ -1,0 -1,206 +1,228 @@@
+ /* SPDX-License-Identifier: Apache-2.0
+  * Copyright 2011-2022 Blender Foundation */
+ 
+ #ifndef KERNEL_STRUCT_BEGIN
+ #  define KERNEL_STRUCT_BEGIN(name, parent)
+ #endif
+ #ifndef KERNEL_STRUCT_END
+ #  define KERNEL_STRUCT_END(name)
+ #endif
+ #ifndef KERNEL_STRUCT_MEMBER
+ #  define KERNEL_STRUCT_MEMBER(parent, type, name)
+ #endif
+ 
+ /* Background. */
+ 
+ KERNEL_STRUCT_BEGIN(KernelBackground, background)
+ /* xyz store direction, w the angle. float4 in

@@ Diff output truncated at 10240 characters. @@

