[patch] Patch from upstream for openvdb-11 with nanovdb

blender-4.0.2-openvdb-11-bbb7e7a6d5.patch (text/plain), 3.52 KB, created by Jyrki Launonen on 2024-04-01 09:38:12 UTC

From bbb7e7a6d57f0b24d3b7374fb3747baf0d128d24 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <[e-mail]>
Date: Sun, 10 Dec 2023 01:02:08 +0100
Subject: [PATCH] Cycles: update to work with OpenVDB 11

Ref #113157
---
 intern/cycles/scene/image_vdb.cpp | 49 ++++++++++++++++++++++++-------
 1 file changed, 38 insertions(+), 11 deletions(-)

diff --git a/intern/cycles/scene/image_vdb.cpp b/intern/cycles/scene/image_vdb.cpp
index 478b88c6d54..d94a7973adc 100644
--- a/intern/cycles/scene/image_vdb.cpp
+++ b/intern/cycles/scene/image_vdb.cpp
@@ -11,6 +11,7 @@
 #  include <openvdb/tools/Dense.h>
 #endif
 #ifdef WITH_NANOVDB
+#  define NANOVDB_USE_OPENVDB
 #  include <nanovdb/util/OpenToNanoVDB.h>
 #endif
 
@@ -52,23 +53,49 @@ struct ToNanoOp {
   {
     if constexpr (!std::is_same_v<GridType, openvdb::MaskGrid>) {
       try {
-        FloatGridType floatgrid(*openvdb::gridConstPtrCast<GridType>(grid));
+#    if NANOVDB_MAJOR_VERSION_NUMBER > 32 || \
+        (NANOVDB_MAJOR_VERSION_NUMBER == 32 && NANOVDB_MINOR_VERSION_NUMBER >= 6)
+        /* OpenVDB 11. */
         if constexpr (std::is_same_v<FloatGridType, openvdb::FloatGrid>) {
+          openvdb::FloatGrid floatgrid(*openvdb::gridConstPtrCast<GridType>(grid));
           if (precision == 0) {
-            nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer,
-                                              typename FloatGridType::TreeType,
-                                              nanovdb::FpN>(floatgrid);
-            return true;
+            nanogrid = nanovdb::createNanoGrid<openvdb::FloatGrid, nanovdb::FpN>(floatgrid);
           }
           else if (precision == 16) {
-            nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer,
-                                              typename FloatGridType::TreeType,
-                                              nanovdb::Fp16>(floatgrid);
-            return true;
+            nanogrid = nanovdb::createNanoGrid<openvdb::FloatGrid, nanovdb::Fp16>(floatgrid);
+          }
+          else {
+            nanogrid = nanovdb::createNanoGrid<openvdb::FloatGrid, float>(floatgrid);
           }
         }
-
-        nanogrid = nanovdb::openToNanoVDB(floatgrid);
+        else if constexpr (std::is_same_v<FloatGridType, openvdb::Vec3fGrid>) {
+          openvdb::Vec3fGrid floatgrid(*openvdb::gridConstPtrCast<GridType>(grid));
+          nanogrid = nanovdb::createNanoGrid<openvdb::Vec3fGrid, nanovdb::Vec3f>(
+              floatgrid, nanovdb::StatsMode::Disable);
+        }
+#    else
+        /* OpenVDB 10. */
+        if constexpr (std::is_same_v<FloatGridType, openvdb::FloatGrid>) {
+          openvdb::FloatGrid floatgrid(*openvdb::gridConstPtrCast<GridType>(grid));
+          if (precision == 0) {
+            nanogrid =
+                nanovdb::openToNanoVDB<nanovdb::HostBuffer, openvdb::FloatTree, nanovdb::FpN>(
+                    floatgrid);
+          }
+          else if (precision == 16) {
+            nanogrid =
+                nanovdb::openToNanoVDB<nanovdb::HostBuffer, openvdb::FloatTree, nanovdb::Fp16>(
+                    floatgrid);
+          }
+          else {
+            nanogrid = nanovdb::openToNanoVDB(floatgrid);
+          }
+        }
+        else if constexpr (std::is_same_v<FloatGridType, openvdb::Vec3fGrid>) {
+          openvdb::Vec3fGrid floatgrid(*openvdb::gridConstPtrCast<GridType>(grid));
+          nanogrid = nanovdb::openToNanoVDB(floatgrid);
+        }
+#    endif
       }
       catch (const std::exception &e) {
         VLOG_WARNING << "Error converting OpenVDB to NanoVDB grid: " << e.what();