Patch for OpenPGL:6

3 files changed, 80 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8aadbf81b0f..615455d1da4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = blender-develop-git
 	pkgdesc = Development version of Blender (non-conflicting version)
-	pkgver = 4.2.r132730.g98231ea880b
+	pkgver = 4.2.r132961.g76b09765002
 	pkgrel = 1
 	url = https://blender.org/
 	changelog = blender.changelog
@@ -61,6 +61,7 @@ pkgbase = blender-develop-git
 	source = blender-sycl-path.patch
 	source = force-draco1.patch
 	source = force-draco2.patch
+	source = openpgl6.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -70,5 +71,6 @@ pkgbase = blender-develop-git
 	sha256sums = 05e83a1c06790594fcd96f86bac7912d67c91ce9076cfc7088203b37f65949b1
 	sha256sums = e3ff41269ab26f34e7762ee2754d238af375761131178917f61a97763f60ee0d
 	sha256sums = a7c809d2b979e097a1853d42ad0edb6d9fa2ef51c99424257e5ec083ef76bb03
+	sha256sums = 3b1cdb2d18eb5852e72e031dc9b184b8ee695f858361967ef56953b1ffcf58b9
 
 pkgname = blender-develop-git
diff --git a/PKGBUILD b/PKGBUILD
index b65eddca8205..1b3b8d80cabb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,7 +29,7 @@ _fragment=${FRAGMENT:-#branch=main}
 ((DISABLE_CUDA)) && optdepends+=('cuda: CUDA support in Cycles') || { makedepends+=('cuda') ; ((DISABLE_OPTIX)) || makedepends+=('optix>=7.4'); }
 
 pkgname=blender-develop-git
-pkgver=4.2.r132730.g98231ea880b
+pkgver=4.2.r132961.g76b09765002
 pkgrel=1
 pkgdesc="Development version of Blender (non-conflicting version)"
 changelog=blender.changelog
@@ -62,6 +62,7 @@ source=("blender::git+https://github.com/blender/blender${_fragment}"
         blender-sycl-path.patch
         force-draco1.patch
         force-draco2.patch
+        openpgl6.patch
         )
 sha256sums=('SKIP'
             'SKIP'
@@ -71,7 +72,8 @@ sha256sums=('SKIP'
             '60ac315c873a3842dd46393ed351c008255911a8fa352d39587a5eede3983e3a'
             '05e83a1c06790594fcd96f86bac7912d67c91ce9076cfc7088203b37f65949b1'
             'e3ff41269ab26f34e7762ee2754d238af375761131178917f61a97763f60ee0d'
-            'a7c809d2b979e097a1853d42ad0edb6d9fa2ef51c99424257e5ec083ef76bb03')
+            'a7c809d2b979e097a1853d42ad0edb6d9fa2ef51c99424257e5ec083ef76bb03'
+            '3b1cdb2d18eb5852e72e031dc9b184b8ee695f858361967ef56953b1ffcf58b9')
 
 pkgver() {
   blender_version=$(grep -Po "BLENDER_VERSION \K[0-9]{3}" "$srcdir"/blender/source/blender/blenkernel/BKE_blender_version.h)
@@ -90,6 +92,7 @@ prepare() {
   fi
   ((DISABLE_DRACO)) || git -C "$srcdir/blender" apply -v "${srcdir}"/force-draco1.patch
   ((DISABLE_DRACO)) || git -C "$srcdir/blender/scripts/addons" apply -v "${srcdir}"/force-draco2.patch
+  git -C "$srcdir/blender" apply -v "${srcdir}"/openpgl6.patch
 }
 
 build() {
diff --git a/openpgl6.patch b/openpgl6.patch
new file mode 100644
index 000000000000..1b57810a2032
--- /dev/null
+++ b/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
+