Support for OSPRay 1.5

Note that loading of the OptiX module works, but the registered objecs from Brayns (like Renderers) are still taking into account. Those have to be moved to plugins/modules, so we don't load those as they are not needed for Optix.
BlueBrain · Mar 9, 2018 · c4e0833 · c4e0833
1 parent 7d9e5d0
commit c4e0833
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 25 deletions.
diff --git a/ospray_modules/optix/Device.cpp b/ospray_modules/optix/Device.cpp
@@ -109,7 +109,7 @@ OSPModel Device::newModel()
 
 void Device::commit(OSPObject _object)
 {
-    ManagedObject *object = (ManagedObject *)_object;
+    ospray::ManagedObject *object = (ospray::ManagedObject *)_object;
     Assert2(object, "null object in LocalDevice::commit()");
     object->commit();
 }
@@ -139,15 +139,15 @@ OSPData Device::newData(size_t nitems, OSPDataType format, const void *init,
 
 void Device::setVoidPtr(OSPObject _object, const char *bufName, void *v)
 {
-    ManagedObject *object = (ManagedObject *)_object;
+    ospray::ManagedObject *object = (ospray::ManagedObject *)_object;
     Assert(object != nullptr && "invalid object handle");
     Assert(bufName != nullptr && "invalid identifier for object parameter");
-    object->findParam(bufName, true)->set(v);
+    object->setParam(bufName, v);
 }
 
 void Device::removeParam(OSPObject _object, const char *name)
 {
-    ManagedObject *object = (ManagedObject *)_object;
+    ospray::ManagedObject *object = (ospray::ManagedObject *)_object;
     Assert(object != nullptr && "invalid object handle");
     Assert(name != nullptr && "invalid identifier for object parameter");
     object->removeParam(name);
@@ -162,10 +162,10 @@ int Device::setRegion(OSPVolume /*_volume*/, const void * /*source*/,
 
 void Device::setString(OSPObject _object, const char *bufName, const char *s)
 {
-    ManagedObject *object = (ManagedObject *)_object;
+    ospray::ManagedObject *object = (ospray::ManagedObject *)_object;
     Assert(object != nullptr && "invalid object handle");
     Assert(bufName != nullptr && "invalid identifier for object parameter");
-    object->findParam(bufName, true)->set(s);
+    object->setParam<std::string>(bufName, s);
 }
 
 int Device::loadModule(const char *name)
@@ -179,82 +179,81 @@ int Device::loadModule(const char *name)
 
 void Device::setFloat(OSPObject _object, const char *bufName, const float f)
 {
-    ManagedObject *object = (ManagedObject *)_object;
+    ospray::ManagedObject *object = (ospray::ManagedObject *)_object;
     Assert(object != nullptr && "invalid object handle");
     Assert(bufName != nullptr && "invalid identifier for object parameter");
 
-    ManagedObject::Param *param = object->findParam(bufName, true);
-    param->set(f);
+    object->setParam(bufName, f);
 }
 
 void Device::setInt(OSPObject _object, const char *bufName, const int i)
 {
-    ManagedObject *object = (ManagedObject *)_object;
+    ospray::ManagedObject *object = (ospray::ManagedObject *)_object;
     Assert(object != nullptr && "invalid object handle");
     Assert(bufName != nullptr && "invalid identifier for object parameter");
 
-    object->findParam(bufName, true)->set(i);
+    object->setParam(bufName, i);
 }
 
 void Device::setVec2f(OSPObject _object, const char *bufName,
                       const ospray::vec2f &v)
 {
-    ManagedObject *object = (ManagedObject *)_object;
+    ospray::ManagedObject *object = (ospray::ManagedObject *)_object;
     Assert(object != nullptr && "invalid object handle");
     Assert(bufName != nullptr && "invalid identifier for object parameter");
 
-    object->findParam(bufName, true)->set(v);
+    object->setParam(bufName, v);
 }
 
 void Device::setVec3f(OSPObject _object, const char *bufName,
                       const ospray::vec3f &v)
 {
-    ManagedObject *object = (ManagedObject *)_object;
+    ospray::ManagedObject *object = (ospray::ManagedObject *)_object;
     Assert(object != nullptr && "invalid object handle");
     Assert(bufName != nullptr && "invalid identifier for object parameter");
 
-    object->findParam(bufName, true)->set(v);
+    object->setParam(bufName, v);
 }
 
 void Device::setVec4f(OSPObject _object, const char *bufName,
                       const ospray::vec4f &v)
 {
-    ManagedObject *object = (ManagedObject *)_object;
+    ospray::ManagedObject *object = (ospray::ManagedObject *)_object;
     Assert(object != nullptr && "invalid object handle");
     Assert(bufName != nullptr && "invalid identifier for object parameter");
 
-    object->findParam(bufName, true)->set(v);
+    object->setParam(bufName, v);
 }
 
 void Device::setVec2i(OSPObject _object, const char *bufName,
                       const ospray::vec2i &v)
 {
-    ManagedObject *object = (ManagedObject *)_object;
+    ospray::ManagedObject *object = (ospray::ManagedObject *)_object;
     Assert(object != nullptr && "invalid object handle");
     Assert(bufName != nullptr && "invalid identifier for object parameter");
 
-    object->findParam(bufName, true)->set(v);
+    object->setParam(bufName, v);
 }
 
 void Device::setVec3i(OSPObject _object, const char *bufName,
                       const ospray::vec3i &v)
 {
-    ManagedObject *object = (ManagedObject *)_object;
+    ospray::ManagedObject *object = (ospray::ManagedObject *)_object;
     Assert(object != nullptr && "invalid object handle");
     Assert(bufName != nullptr && "invalid identifier for object parameter");
 
-    object->findParam(bufName, true)->set(v);
+    object->setParam(bufName, v);
 }
 
 void Device::setObject(OSPObject _target, const char *bufName, OSPObject _value)
 {
-    ManagedObject *target = (ManagedObject *)_target;
-    ManagedObject *value = (ManagedObject *)_value;
+    ospray::ManagedObject *target = (ospray::ManagedObject *)_target;
+    ospray::ManagedObject *value = (ospray::ManagedObject *)_value;
 
     Assert(target != nullptr && "invalid target object handle");
     Assert(bufName != nullptr && "invalid identifier for object parameter");
 
-    target->set(bufName, value);
+    target->setParam(bufName, value);
 }
 
 OSPPixelOp Device::newPixelOp(const char * /*type*/)
@@ -330,6 +329,17 @@ OSPMaterial Device::newMaterial(OSPRenderer _renderer, const char *type)
     return (OSPMaterial)material;
 }
 
+#if ((OSPRAY_VERSION_MAJOR == 1) && (OSPRAY_VERSION_MINOR > 4))
+OSPMaterial Device::newMaterial(const char *renderer_type,
+                                const char *material_type)
+{
+    auto renderer = newRenderer(renderer_type);
+    auto material = newMaterial(renderer, material_type);
+    release(renderer);
+    return material;
+}
+#endif
+
 OSPTransferFunction Device::newTransferFunction(const char * /*type*/)
 {
     return nullptr;
@@ -345,6 +355,16 @@ OSPLight Device::newLight(OSPRenderer _renderer, const char *type)
     return (OSPLight)light;
 }
 
+#if ((OSPRAY_VERSION_MAJOR == 1) && (OSPRAY_VERSION_MINOR > 4))
+OSPLight Device::newLight(const char *renderer_type, const char *light_type)
+{
+    auto renderer = newRenderer(renderer_type);
+    auto light = newLight(renderer, light_type);
+    release(renderer);
+    return light;
+}
+#endif
+
 void Device::frameBufferClear(OSPFrameBuffer _fb,
                               const ospray::uint32 fbChannelFlags)
 {
@@ -403,7 +423,7 @@ void Device::release(OSPObject _obj)
 {
     if (!_obj)
         return;
-    ManagedObject *obj = (ManagedObject *)_obj;
+    ospray::ManagedObject *obj = (ospray::ManagedObject *)_obj;
 
     // TODO: would need to check for refcount == 1, but private. So better move
     // this to our own Texture2D class' dtor.

diff --git a/ospray_modules/optix/Device.h b/ospray_modules/optix/Device.h
@@ -22,6 +22,7 @@
 
 #include <ospray/SDK/api/Device.h>
 #include <ospray/SDK/common/Managed.h>
+#include <ospray/version.h>
 
 #include <optixu/optixpp_namespace.h>
 #include <optixu/optixu_math_stream_namespace.h>
@@ -53,6 +54,12 @@ struct Device : public ospray::api::Device
     /*! have given renderer create a new Light */
     OSPLight newLight(OSPRenderer _renderer, const char *type) override;
 
+#if ((OSPRAY_VERSION_MAJOR == 1) && (OSPRAY_VERSION_MINOR > 4))
+    /*! have given renderer create a new Light */
+    OSPLight newLight(const char *renderer_type,
+                      const char *light_type) override;
+#endif
+
     /*! map frame buffer */
     const void *frameBufferMap(OSPFrameBuffer fb,
                                OSPFrameBufferChannel channel) override;
@@ -158,6 +165,12 @@ struct Device : public ospray::api::Device
     /*! have given renderer create a new material */
     OSPMaterial newMaterial(OSPRenderer _renderer, const char *type) override;
 
+#if ((OSPRAY_VERSION_MAJOR == 1) && (OSPRAY_VERSION_MINOR > 4))
+    /*! have given renderer create a new material */
+    OSPMaterial newMaterial(const char *renderer_type,
+                            const char *material_type) override;
+#endif
+
     /*! create a new camera object (out of list of registered cameras) */
     OSPCamera newCamera(const char *type) override;
 

diff --git a/plugins/engines/ospray/CMakeLists.txt b/plugins/engines/ospray/CMakeLists.txt
@@ -61,6 +61,9 @@ set(BRAYNSOSPRAYENGINEPLUGIN_PUBLIC_HEADERS
   OSPRayCamera.h
 )
 
+set_source_files_properties(OSPRayScene.cpp
+  PROPERTIES COMPILE_FLAGS -Wno-deprecated)
+
 set(BRAYNSOSPRAYENGINEPLUGIN_LINK_LIBRARIES
     PUBLIC vmmlib braynsCommon braynsIO ${OSPRAY_LIBRARIES}
 )

diff --git a/plugins/engines/ospray/ispc/geometry/ExtendedCones.ispc b/plugins/engines/ospray/ispc/geometry/ExtendedCones.ispc
@@ -225,7 +225,9 @@ static void ExtendedCones_postIntersect(uniform Geometry *uniform geometry,
     uniform ExtendedCones *uniform this =
         (uniform ExtendedCones * uniform)geometry;
     dg.geometry = geometry;
+#if ((OSPRAY_VERSION_MAJOR == 1) && (OSPRAY_VERSION_MINOR < 5))
     dg.material = geometry->material;
+#endif
     vec3f Ng = ray.Ng;
     vec3f Ns = Ng;
 

diff --git a/plugins/engines/ospray/ispc/geometry/ExtendedCylinders.ispc b/plugins/engines/ospray/ispc/geometry/ExtendedCylinders.ispc
@@ -146,7 +146,9 @@ static void ExtendedCylinders_postIntersect(uniform Geometry *uniform geometry,
     uniform ExtendedCylinders *uniform this =
         (uniform ExtendedCylinders * uniform)geometry;
     dg.geometry = geometry;
+#if ((OSPRAY_VERSION_MAJOR == 1) && (OSPRAY_VERSION_MINOR < 5))
     dg.material = geometry->material;
+#endif
     vec3f Ng = ray.Ng;
     vec3f Ns = Ng;
 

diff --git a/plugins/engines/ospray/ispc/geometry/ExtendedSpheres.ispc b/plugins/engines/ospray/ispc/geometry/ExtendedSpheres.ispc
@@ -62,7 +62,9 @@ static void ExtendedSpheres_postIntersect(uniform Geometry *uniform geometry,
     uniform ExtendedSpheres *uniform this =
         (uniform ExtendedSpheres * uniform)geometry;
     dg.geometry = geometry;
+#if ((OSPRAY_VERSION_MAJOR == 1) && (OSPRAY_VERSION_MINOR < 5))
     dg.material = geometry->material;
+#endif
     vec3f Ng = ray.Ng;
     vec3f Ns = Ng;