Don't try to build TLSs if BLS array is empty

szellmann · Oct 28, 2024 · f7243b9 · f7243b9
1 parent f8207bf
commit f7243b9
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 25 deletions.
diff --git a/scene/VisionarayScene.cpp b/scene/VisionarayScene.cpp
@@ -46,9 +46,11 @@ void VisionaraySceneImpl::commit()
     }
 
     // Build TLS
-    lbvh_builder tlsBuilder;
-    m_worldTLS = tlsBuilder.build(
-        WorldTLS{}, m_worldBLSs.hostPtr(), m_worldBLSs.size());
+    if (!m_worldBLSs.empty()) {
+      lbvh_builder tlsBuilder;
+      m_worldTLS = tlsBuilder.build(
+          WorldTLS{}, m_worldBLSs.hostPtr(), m_worldBLSs.size());
+    }
 
     // Build flat list of lights
     m_allLights.clear();
@@ -247,8 +249,10 @@ void VisionaraySceneImpl::commit()
     }
 
     // Build TLS
-    lbvh_builder tlsBuilder;
-    m_TLS = tlsBuilder.build(TLS{}, m_BLSs.hostPtr(), m_BLSs.size());
+    if (!m_BLSs.empty()) {
+      lbvh_builder tlsBuilder;
+      m_TLS = tlsBuilder.build(TLS{}, m_BLSs.hostPtr(), m_BLSs.size());
+    }
   }
 #endif
 

diff --git a/scene/VisionaraySceneGPU.cu b/scene/VisionaraySceneGPU.cu
@@ -103,10 +103,12 @@ void VisionaraySceneGPU::commit()
     }
 
     // Build TLS
-    lbvh_builder tlsBuilder;
-    m_impl->m_worldTLS = tlsBuilder.build(
-        GPU::WorldTLS{}, m_impl->parent->m_worldBLSs.devicePtr(),
-        m_impl->parent->m_worldBLSs.size());
+    if (!m_impl->parent->m_worldBLSs.empty()) {
+      lbvh_builder tlsBuilder;
+      m_impl->m_worldTLS = tlsBuilder.build(
+          GPU::WorldTLS{}, m_impl->parent->m_worldBLSs.devicePtr(),
+          m_impl->parent->m_worldBLSs.size());
+    }
 
     // Build flat list of lights
     m_impl->parent->m_allLights.clear();
@@ -354,10 +356,12 @@ void VisionaraySceneGPU::commit()
     }
 
     // Build TLS
-    lbvh_builder tlsBuilder;
-    m_impl->m_TLS = tlsBuilder.build(
-        GPU::TLS{}, m_impl->parent->m_BLSs.devicePtr(),
-        m_impl->parent->m_BLSs.size());
+    if (!m_impl->parent->m_BLSs.empty()) {
+      lbvh_builder tlsBuilder;
+      m_impl->m_TLS = tlsBuilder.build(
+          GPU::TLS{}, m_impl->parent->m_BLSs.devicePtr(),
+          m_impl->parent->m_BLSs.size());
+    }
   }
 }
 

diff --git a/scene/VisionaraySceneGPU.hip b/scene/VisionaraySceneGPU.hip
@@ -116,12 +116,14 @@ void VisionaraySceneGPU::commit()
     }
 
     // Build TLS
-    binned_sah_builder tlsBuilder;
-    typedef index_bvh<dco::Instance> WorldTLS;
-    auto h_worldTLS = tlsBuilder.build(
-        WorldTLS{}, m_impl->parent->m_worldBLSs.devicePtr(),
-        m_impl->parent->m_worldBLSs.size());
-    m_impl->m_worldTLS = GPU::WorldTLS(h_worldTLS);
+    if (!m_impl->parent->m_worldBLSs.empty()) {
+      binned_sah_builder tlsBuilder;
+      typedef index_bvh<dco::Instance> WorldTLS;
+      auto h_worldTLS = tlsBuilder.build(
+          WorldTLS{}, m_impl->parent->m_worldBLSs.devicePtr(),
+          m_impl->parent->m_worldBLSs.size());
+      m_impl->m_worldTLS = GPU::WorldTLS(h_worldTLS);
+    }
 
     // Build flat list of lights
     m_impl->parent->m_allLights.clear();
@@ -369,12 +371,14 @@ void VisionaraySceneGPU::commit()
     }
 
     // Build TLS
-    binned_sah_builder tlsBuilder;
-    typedef index_bvh<dco::BLS> TLS;
-    auto h_TLS = tlsBuilder.build(
-        TLS{}, m_impl->parent->m_BLSs.devicePtr(),
-        m_impl->parent->m_BLSs.size());
-    m_impl->m_TLS = GPU::TLS(h_TLS);
+    if (!m_impl->parent->m_BLSs.empty()) {
+      binned_sah_builder tlsBuilder;
+      typedef index_bvh<dco::BLS> TLS;
+      auto h_TLS = tlsBuilder.build(
+          TLS{}, m_impl->parent->m_BLSs.devicePtr(),
+          m_impl->parent->m_BLSs.size());
+      m_impl->m_TLS = GPU::TLS(h_TLS);
+    }
   }
 }