Use simpler device types, consolidate device object initialization

szellmann · Nov 3, 2024 · bf29592 · bf29592
1 parent b723c0b
commit bf29592
Show file tree

Hide file tree

Showing 13 changed files with 221 additions and 84 deletions.
diff --git a/DeviceCopyableObjects.h b/DeviceCopyableObjects.h
diff --git a/camera/Camera.cpp b/camera/Camera.cpp
@@ -9,6 +9,7 @@ namespace visionaray {
 
 Camera::Camera(VisionarayGlobalState *s) : Object(ANARI_CAMERA, s)
 {
+  vcam = dco::createCamera();
   s->objectCounts.cameras++;
 }
 

diff --git a/frame/Frame.cpp b/frame/Frame.cpp
@@ -32,6 +32,7 @@ static bool is_ready(const std::future<R> &f)
 
 Frame::Frame(VisionarayGlobalState *s) : helium::BaseFrame(s)
 {
+  vframe = dco::createFrame();
   vframe.frameID = deviceState()->dcos.frames.alloc(vframe);
   s->objectCounts.frames++;
 #ifdef WITH_CUDA

diff --git a/scene/Instance.cpp b/scene/Instance.cpp
@@ -9,8 +9,7 @@ namespace visionaray {
 
 Instance::Instance(VisionarayGlobalState *s) : Object(ANARI_INSTANCE, s)
 {
-  memset(&vinstance,0,sizeof(vinstance));
-
+  vinstance = dco::createInstance();
   vinstance.type = dco::Instance::Transform;
   vinstance.instID
       = deviceState()->dcos.instances.alloc(vinstance);

diff --git a/scene/VisionarayScene.cpp b/scene/VisionarayScene.cpp
@@ -15,9 +15,9 @@ VisionaraySceneImpl::VisionaraySceneImpl(
 
   if (type == World) {
     m_worldID = deviceState()->dcos.TLSs.alloc({});
-    deviceState()->dcos.worlds.alloc(dco::World{});
+    deviceState()->dcos.worlds.alloc(dco::createWorld());
   }
-  m_groupID = deviceState()->dcos.groups.alloc(dco::Group{});
+  m_groupID = deviceState()->dcos.groups.alloc(dco::createGroup());
 }
 
 VisionaraySceneImpl::~VisionaraySceneImpl()
@@ -432,15 +432,15 @@ void VisionaraySceneImpl::dispatch()
   if (type == World) {
     m_state->dcos.TLSs.update(m_worldID, m_worldTLS.ref());
 
-    dco::World world; // TODO: move TLS and EPS in here!
+    dco::World world = dco::createWorld(); // TODO: move TLS and EPS in here!
     world.numLights = m_allLights.size();
     world.allLights = m_allLights.devicePtr();
     m_state->dcos.worlds.update(m_worldID, world);
   }
 
   // Dispatch group
   if (type == Group) {
-    dco::Group group;
+    dco::Group group = dco::createGroup();
     group.groupID = m_groupID;
     group.numBLSs = m_BLSs.size();
     group.BLSs = m_BLSs.devicePtr();

diff --git a/scene/light/Light.cpp b/scene/light/Light.cpp
@@ -12,7 +12,7 @@ namespace visionaray {
 
 Light::Light(VisionarayGlobalState *s) : Object(ANARI_LIGHT, s)
 {
-  memset(&vlight,0,sizeof(vlight));
+  vlight = dco::createLight();
   vlight.lightID = deviceState()->dcos.lights.alloc(vlight);
   s->objectCounts.lights++;
 }

diff --git a/scene/surface/Surface.cpp b/scene/surface/Surface.cpp
@@ -7,6 +7,7 @@ namespace visionaray {
 
 Surface::Surface(VisionarayGlobalState *s) : Object(ANARI_SURFACE, s)
 {
+  vsurf = dco::createSurface();
   vsurf.surfID = deviceState()->dcos.surfaces.alloc(vsurf);
   s->objectCounts.surfaces++;
 }

diff --git a/scene/surface/geometry/Geometry.cpp b/scene/surface/geometry/Geometry.cpp
@@ -19,7 +19,7 @@ namespace visionaray {
 
 Geometry::Geometry(VisionarayGlobalState *s) : Object(ANARI_GEOMETRY, s)
 {
-  memset(&vgeom,0,sizeof(vgeom));
+  vgeom = dco::createGeometry();
   vgeom.geomID = deviceState()->dcos.geometries.alloc(vgeom);
   s->objectCounts.geometries++;
 }

diff --git a/scene/surface/material/Material.cpp b/scene/surface/material/Material.cpp
@@ -10,6 +10,7 @@ namespace visionaray {
 
 Material::Material(VisionarayGlobalState *s) : Object(ANARI_MATERIAL, s)
 {
+  vmat = dco::createMaterial();
   vmat.matID = deviceState()->dcos.materials.alloc(vmat);
   s->objectCounts.materials++;
 }

diff --git a/scene/surface/material/sampler/Sampler.cpp b/scene/surface/material/sampler/Sampler.cpp
@@ -13,7 +13,7 @@ namespace visionaray {
 
 Sampler::Sampler(VisionarayGlobalState *s) : Object(ANARI_SAMPLER, s)
 {
-  memset(&vsampler,0,sizeof(vsampler));
+  vsampler = dco::createSampler();
   vsampler.samplerID = deviceState()->dcos.samplers.alloc(vsampler);
   s->objectCounts.samplers++;
 }

diff --git a/scene/volume/Volume.cpp b/scene/volume/Volume.cpp
@@ -14,7 +14,7 @@ namespace visionaray {
 
 Volume::Volume(VisionarayGlobalState *s) : Object(ANARI_VOLUME, s)
 {
-  memset(&vvol,0,sizeof(vvol));
+  vvol = dco::createVolume();
   vvol.volID = deviceState()->dcos.volumes.alloc(vvol);
   s->objectCounts.volumes++;
 }

diff --git a/scene/volume/spatial_field/GridAccel.cpp b/scene/volume/spatial_field/GridAccel.cpp
@@ -3,7 +3,10 @@
 
 namespace visionaray {
 
-GridAccel::GridAccel(VisionarayGlobalState *s) : m_state(s) {}
+GridAccel::GridAccel(VisionarayGlobalState *s) : m_state(s)
+{
+  vaccel = dco::createGridAccel();
+}
 
 void GridAccel::init(int3 dims, box3 worldBounds)
 {

diff --git a/scene/volume/spatial_field/SpatialField.cpp b/scene/volume/spatial_field/SpatialField.cpp
@@ -14,11 +14,8 @@ SpatialField::SpatialField(VisionarayGlobalState *s)
     , m_gridAccel(s)
 {
   s->objectCounts.spatialFields++;
+  vfield = dco::createSpatialField();
   vfield.fieldID = deviceState()->dcos.spatialFields.alloc(vfield);
-  m_gridAccel.visionarayAccel().fieldID = vfield.fieldID;
-  m_gridAccel.visionarayAccel().dims = int3(0);
-  m_gridAccel.visionarayAccel().valueRanges = nullptr;
-  m_gridAccel.visionarayAccel().maxOpacities = nullptr;
 }
 
 SpatialField::~SpatialField()
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ namespace visionaray { @@
     Camera::Camera(VisionarayGlobalState *s) : Object(ANARI_CAMERA, s)
     {
+      vcam = dco::createCamera();
       s->objectCounts.cameras++;
     }
@@ Expand Down @@