OpenPGL6 patch

3 files changed, 79 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9932f6dfa10..36e43b11dc79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = blender-git
 	pkgdesc = A fully integrated 3D graphics creation suite (development)
-	pkgver = 4.2.r132760.gc3b7f76e5f6
+	pkgver = 4.2.r132989.gd9d9ff1dcd2
 	pkgrel = 1
 	url = https://blender.org/
 	arch = i686
@@ -66,6 +66,7 @@ pkgbase = blender-git
 	source = blender/assets::svn+https://svn.blender.org/svnroot/bf-blender/trunk/lib/assets
 	source = 0001-Use-github.com-for-make-update-git.patch
 	source = 0004-fix-opencollada-pcre.patch
+	source = 0005-openpgl6.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -74,5 +75,6 @@ pkgbase = blender-git
 	sha256sums = SKIP
 	sha256sums = 52da80b721efb6a6d579adf531640becfac1955a88857ca46ca16030a52c3b1c
 	sha256sums = 6beedc541e33288a282f57cd2bd09860f333154027b6175e9f61cce49b8db5df
+	sha256sums = 3b1cdb2d18eb5852e72e031dc9b184b8ee695f858361967ef56953b1ffcf58b9
 
 pkgname = blender-git
diff --git a/0005-openpgl6.patch b/0005-openpgl6.patch
new file mode 100644
index 000000000000..1b57810a2032
--- /dev/null
+++ b/0005-openpgl6.patch
@@ -0,0 +1,72 @@
+From eaccbab8f9ee66dc9c31ff29957fbb07fc096753 Mon Sep 17 00:00:00 2001
+From: bartus <szczepaniak.bartek+github@gmail.com>
+Date: Thu, 15 Feb 2024 14:27:55 +0100
+Subject: [PATCH] OpenPGL:6 patch
+
+Replace PGLFieldArguments with FieldConfig class
+---
+ intern/cycles/integrator/path_trace.cpp | 26 ++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/intern/cycles/integrator/path_trace.cpp b/intern/cycles/integrator/path_trace.cpp
+index cd5dca34d2a..903b34af193 100644
+--- a/intern/cycles/integrator/path_trace.cpp
++++ b/intern/cycles/integrator/path_trace.cpp
+@@ -1286,41 +1286,41 @@ void PathTrace::set_guiding_params(const GuidingParams &guiding_params, const bo
+     guiding_params_ = guiding_params;
+ 
+     if (guiding_params_.use) {
+-      PGLFieldArguments field_args;
++      openpgl::cpp::FieldConfig field_cfg;
+       switch (guiding_params_.type) {
+         default:
+         /* Parallax-aware von Mises-Fisher mixture models. */
+         case GUIDING_TYPE_PARALLAX_AWARE_VMM: {
+-          pglFieldArgumentsSetDefaults(
+-              field_args,
++          field_cfg.Init(
+               PGL_SPATIAL_STRUCTURE_TYPE::PGL_SPATIAL_STRUCTURE_KDTREE,
+-              PGL_DIRECTIONAL_DISTRIBUTION_TYPE::PGL_DIRECTIONAL_DISTRIBUTION_PARALLAX_AWARE_VMM);
++              PGL_DIRECTIONAL_DISTRIBUTION_TYPE::PGL_DIRECTIONAL_DISTRIBUTION_PARALLAX_AWARE_VMM,
++              guiding_params.deterministic,32000);
+           break;
+         }
+         /* Directional quad-trees. */
+         case GUIDING_TYPE_DIRECTIONAL_QUAD_TREE: {
+-          pglFieldArgumentsSetDefaults(
+-              field_args,
++          field_cfg.Init(
+               PGL_SPATIAL_STRUCTURE_TYPE::PGL_SPATIAL_STRUCTURE_KDTREE,
+-              PGL_DIRECTIONAL_DISTRIBUTION_TYPE::PGL_DIRECTIONAL_DISTRIBUTION_QUADTREE);
++              PGL_DIRECTIONAL_DISTRIBUTION_TYPE::PGL_DIRECTIONAL_DISTRIBUTION_QUADTREE,
++              guiding_params.deterministic,32000);
++          break;
+           break;
+         }
+         /* von Mises-Fisher mixture models. */
+         case GUIDING_TYPE_VMM: {
+-          pglFieldArgumentsSetDefaults(
+-              field_args,
++          field_cfg.Init(
+               PGL_SPATIAL_STRUCTURE_TYPE::PGL_SPATIAL_STRUCTURE_KDTREE,
+-              PGL_DIRECTIONAL_DISTRIBUTION_TYPE::PGL_DIRECTIONAL_DISTRIBUTION_VMM);
++              PGL_DIRECTIONAL_DISTRIBUTION_TYPE::PGL_DIRECTIONAL_DISTRIBUTION_VMM,
++              guiding_params.deterministic,32000);
+           break;
+         }
+       }
+-      field_args.deterministic = guiding_params.deterministic;
+-      reinterpret_cast<PGLKDTreeArguments *>(field_args.spatialSturctureArguments)->maxDepth = 16;
++      field_cfg.SetSpatialStructureArgMaxDepth(16);
+       openpgl::cpp::Device *guiding_device = static_cast<openpgl::cpp::Device *>(
+           device_->get_guiding_device());
+       if (guiding_device) {
+         guiding_sample_data_storage_ = make_unique<openpgl::cpp::SampleStorage>();
+-        guiding_field_ = make_unique<openpgl::cpp::Field>(guiding_device, field_args);
++        guiding_field_ = make_unique<openpgl::cpp::Field>(guiding_device, field_cfg);
+       }
+       else {
+         guiding_sample_data_storage_ = nullptr;
+-- 
+2.43.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 974ebf2ab792..a50d83a9a0fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ _fragment="${FRAGMENT:-#branch=main}"
 [[ -v CUDA_ARCH ]] && _CMAKE_FLAGS+=(-DCYCLES_CUDA_BINARIES_ARCH="${CUDA_ARCH}")
 
 pkgname=blender-git
-pkgver=4.2.r132760.gc3b7f76e5f6
+pkgver=4.2.r132989.gd9d9ff1dcd2
 pkgrel=1
 pkgdesc="A fully integrated 3D graphics creation suite (development)"
 arch=('i686' 'x86_64')
@@ -55,6 +55,7 @@ source=("blender::git+https://github.com/blender/blender${_fragment}"
         # Patches...
         '0001-Use-github.com-for-make-update-git.patch'
         '0004-fix-opencollada-pcre.patch' #fix broken search for opencollada pcre
+        '0005-openpgl6.patch'
         )
 sha256sums=('SKIP'
             'SKIP'
@@ -63,7 +64,8 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             '52da80b721efb6a6d579adf531640becfac1955a88857ca46ca16030a52c3b1c'
-            '6beedc541e33288a282f57cd2bd09860f333154027b6175e9f61cce49b8db5df')
+            '6beedc541e33288a282f57cd2bd09860f333154027b6175e9f61cce49b8db5df'
+            '3b1cdb2d18eb5852e72e031dc9b184b8ee695f858361967ef56953b1ffcf58b9')
 
 pkgver() {
   blender_version=$(grep -Po "BLENDER_VERSION \K[0-9]{3}" "$srcdir"/blender/source/blender/blenkernel/BKE_blender_version.h)