Don't attach invalid geometry

szellmann · Nov 1, 2024 · f4983d2 · f4983d2
1 parent dce161c
commit f4983d2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/DeviceCopyableObjects.h b/DeviceCopyableObjects.h
@@ -1342,6 +1342,9 @@ struct Array
   const void *data{nullptr};
   size_t len{0};
   TypeInfo typeInfo;
+
+  VSNRAY_FUNC bool empty() const
+  { return len==0; }
 };
 
 enum class Attribute
@@ -1565,7 +1568,7 @@ struct Geometry
   inline bool isValid() const
   {
     if (type == ISOSurface) {
-      return as<dco::ISOSurface>(0).numValues > 0;
+      return !primitives.empty() && as<dco::ISOSurface>(0).numValues > 0;
     }
     // TODO..
     return true;

diff --git a/scene/VisionarayScene.cpp b/scene/VisionarayScene.cpp
@@ -321,6 +321,9 @@ void VisionaraySceneImpl::attachInstance(
 void VisionaraySceneImpl::attachGeometry(
     dco::Geometry geom, unsigned geomID, unsigned userID)
 {
+  if (!geom.isValid())
+    return;
+
 #if defined(WITH_CUDA) || defined(WITH_HIP)
   m_gpuScene->attachGeometry(geom, geomID, userID);
 #else