Merge branch 'next_release'

Author: jeffamstutz

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.5.0
+##### 2023-01-23
+- Update to latest ANARI SDK v0.3.0
+- Added support for `curve` geometry subtype
+- Added support `image1D` sampler subtype
+- Added support for `primitive.index` on `sphere` geometry
+- Added support for missing array types for image samplers
+- Added volume scattering in `dpt` renderer
+- Added tool (`visrtxCompileShaders`) for precompiling OptiX shaders offline
+- Improved robustness around object subtypes unknown to VisRTX
+- Improved object leak warnings on device release
+- Moved ambient lighting from being a light subtype into renderer parameters
+- Fix incorrect handling of managed arrays of objects
+- Fix performance bug with rays repeatedly not exiting volumes
+
 ## 0.4.0
 ##### 2022-07-22
 - Update to latest ANARI SDK v0.2.0

CMakeLists.txt

@@ -49,14 +49,21 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
-project(VisRTX VERSION 0.4.0 LANGUAGES C CXX CUDA)
+project(VisRTX VERSION 0.5.0 LANGUAGES C CXX CUDA)
 
 include(GNUInstallDirs)
 
+option(
+  VISRTX_SET_SOVERSION
+  "(Unix) Set the library SOVERSION propert and create namelinks?"
+  OFF
+)
+mark_as_advanced(VISRTX_SET_SOVERSION)
+
 ## Dependencies ###############################################################
 
 # ANARI-SDK
-set(ANARI_REQUIRED_VERSION 0.2.0)
+set(ANARI_REQUIRED_VERSION 0.3.0)
 find_package(anari ${ANARI_REQUIRED_VERSION} EXACT REQUIRED)
 
 # glm (locally included)
@@ -79,12 +86,19 @@ enable_testing()
 add_subdirectory(device)
 add_subdirectory(examples)
 add_subdirectory(tests)
+add_subdirectory(tools)
 
 ## Configure CMake find_package() config files ################################
 
-set(VISRTX_CMAKE_INSTALL_DESTINATION
-  ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_VERSION}
-)
+if (VISRTX_SET_SOVERSION)
+  set(VISRTX_CMAKE_INSTALL_DESTINATION
+    ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_VERSION}
+  )
+else()
+  set(VISRTX_CMAKE_INSTALL_DESTINATION
+    ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+  )
+endif()
 
 install(EXPORT VisRTX_Exports
   DESTINATION ${VISRTX_CMAKE_INSTALL_DESTINATION}

README.md

@@ -28,10 +28,10 @@ Building VisRTX requires the following:
 
 - CMake 3.17+
 - C++17 compiler
-- NVIDIA Driver 470+
+- NVIDIA Driver 495+
 - CUDA 11.3.1+
-- [OptiX 7.3+](https://developer.nvidia.com/rtx/ray-tracing/optix)
-- [ANARI-SDK 0.2.0](https://github.com/KhronosGroup/ANARI-SDK)
+- [OptiX 7.4+](https://developer.nvidia.com/rtx/ray-tracing/optix)
+- [ANARI-SDK 0.3.0](https://github.com/KhronosGroup/ANARI-SDK)
 
 Building VisRTX is done through invoking CMake on the source directory from a
 stand alone build directory. This might look like
@@ -259,22 +259,16 @@ change parameters.
 
 The following features are not yet implemented by VisRTX:
 
-- Geometry: `curve`
 - Light: `spot`, instancing
 - Camera: `omnidirectional`, stereo rendering, direct transform parameter
-- Sampler: `image1D`, `image3D`, in/out transforms on `image2D`
+- Sampler: `image3D`, in/out transforms on `image2D`
 - Frame: variance property
 - Sparse shared arrays (non-zero stride)
 - Core extensions:
     - `ANARI_KHR_AREA_LIGHTS`
     - `ANARI_KHR_FRAME_COMPLETION_CALLBACK`
     - `ANARI_KHR_DEVICE_SYNCHRONIZATION`
     - `ANARI_KHR_TRANSFORMATION_MOTION_BLUR`
-- Introspection for individual parameters of objects other than renderers
-
-The following features have known to be incomplete:
-
-- Arrays for image samplers only suport FLOAT32 type elements
 
 For any found bugs in features that are implemented, please [open an
 issue](https://github.com/NVIDIA/VisRTX/issues/new)!

device/CMakeLists.txt

@@ -103,6 +103,7 @@ target_sources(${PROJECT_NAME} PRIVATE
   camera/Camera.cpp
   camera/Orthographic.cpp
   camera/Perspective.cpp
+  camera/UnknownCamera.cpp
 
   frame/Denoiser.cu
   frame/Frame.cu
@@ -113,45 +114,55 @@ target_sources(${PROJECT_NAME} PRIVATE
   renderer/Raycast.cpp
   renderer/Renderer.cpp
   renderer/SciVis.cpp
+  renderer/Test.cpp
 
   scene/Group.cpp
   scene/Instance.cpp
   scene/World.cpp
 
-  scene/light/Ambient.cpp
   scene/light/Directional.cpp
   scene/light/Light.cpp
   scene/light/Point.cpp
+  scene/light/UnknownLight.cpp
 
   scene/surface/Surface.cpp
 
-  scene/surface/geometry/Cones.cpp
-  scene/surface/geometry/Cylinders.cpp
+  scene/surface/geometry/Cone.cpp
+  scene/surface/geometry/Curve.cpp
+  scene/surface/geometry/Cylinder.cpp
   scene/surface/geometry/Geometry.cpp
-  scene/surface/geometry/Quads.cpp
-  scene/surface/geometry/Spheres.cpp
-  scene/surface/geometry/Triangles.cpp
+  scene/surface/geometry/Quad.cpp
+  scene/surface/geometry/Sphere.cpp
+  scene/surface/geometry/Triangle.cpp
+  scene/surface/geometry/UnknownGeometry.cpp
 
   scene/surface/material/Material.cpp
   scene/surface/material/Matte.cpp
   scene/surface/material/PBR.cpp
   scene/surface/material/TransparentMatte.cpp
+  scene/surface/material/UnknownMaterial.cpp
 
   scene/surface/material/sampler/ColorMap.cpp
+  scene/surface/material/sampler/Image1D.cpp
   scene/surface/material/sampler/Image2D.cpp
+  scene/surface/material/sampler/ImageSamplerHelpers.cpp
   scene/surface/material/sampler/PrimitiveSampler.cpp
   scene/surface/material/sampler/Sampler.cpp
+  scene/surface/material/sampler/UnknownSampler.cpp
 
   scene/volume/Volume.cpp
   scene/volume/SciVisVolume.cpp
+  scene/volume/UnknownVolume.cpp
+
+  scene/volume/space_skipping/UniformGrid.cu
 
   scene/volume/spatial_field/SpatialField.cpp
   scene/volume/spatial_field/StructuredRegularField.cpp
+  scene/volume/spatial_field/StructuredRegularField.cu
+  scene/volume/spatial_field/UnknownSpatialField.cpp
 
-  utility/DeferredCommitBuffer.cpp
-  utility/DeferredUploadBuffer.cpp
+  utility/DeferredArrayUploadBuffer.cpp
   utility/instrument.cpp
-  utility/TimeStamp.cpp
 )
 
 generate_export_header(${PROJECT_NAME}
@@ -179,7 +190,7 @@ target_link_libraries(${PROJECT_NAME}
 PUBLIC
   anari::anari
 PRIVATE
-  anari::anari_utilities
+  anari::helium
   anari::anari_library_debug
   glm_visrtx
   OptiX7::OptiX7
@@ -202,19 +213,28 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE visrtx_EXPORTS)
 
 function(GenerateEmbeddedPTX DIR BASE_NAME)
   set(INPUT_CU_FILE ${DIR}/${BASE_NAME}_ptx.cu)
-  set(INPUT_TARGET ${BASE_NAME}_ptx_gen)
+  set(INPUT_TARGET ${BASE_NAME}_ptx)
   set(OUTPUT_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${BASE_NAME}_ptx.h)
 
+  set_source_files_properties(${INPUT_CU_FILE}
+    PROPERTIES COMPILE_FLAGS "--expt-relaxed-constexpr"
+  )
+
   add_library(${INPUT_TARGET} OBJECT ${INPUT_CU_FILE})
   target_link_libraries(${INPUT_TARGET}
   PRIVATE
+    helium
     anari::anari
     anari::anari_utilities
     glm_visrtx
     OptiX7::OptiX7
     CUDA::curand
   )
-  target_include_directories(${INPUT_TARGET} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
+  target_include_directories(${INPUT_TARGET}
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_LIST_DIR}
+  )
   set_property(TARGET ${INPUT_TARGET} PROPERTY CUDA_PTX_COMPILATION ON)
   set_property(TARGET ${INPUT_TARGET} PROPERTY CUDA_ARCHITECTURES OFF)
 
@@ -230,34 +250,38 @@ GenerateEmbeddedPTX(renderer Debug)
 GenerateEmbeddedPTX(renderer DiffusePathTracer)
 GenerateEmbeddedPTX(renderer Raycast)
 GenerateEmbeddedPTX(renderer SciVis)
+GenerateEmbeddedPTX(renderer Test)
 
 GenerateEmbeddedPTX(scene Intersectors)
 
 ## Install library + headers ##
 
-install(TARGETS ${PROJECT_NAME}
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)
-
-set_target_properties(${PROJECT_NAME}
-    PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
-
 install(TARGETS ${PROJECT_NAME}
   EXPORT VisRTX_Exports
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    NAMELINK_SKIP
-  # on Windows put the dlls into bin
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-  # ... and the import lib into the devel package
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
+if (VISRTX_USE_SOVERSION)
+  set_target_properties(${PROJECT_NAME}
+      PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
+
+  install(TARGETS ${PROJECT_NAME}
+    EXPORT VisRTX_Exports
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      NAMELINK_SKIP
+    # on Windows put the dlls into bin
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    # ... and the import lib into the devel package
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  )
+endif()
+
 install(
 FILES
   ${PROJECT_BINARY_DIR}/${PROJECT_NAME}_export.h
-  ${CMAKE_CURRENT_LIST_DIR}/include/anari/backend/visrtx/visrtx.h
+  ${CMAKE_CURRENT_LIST_DIR}/include/anari/ext/visrtx/visrtx.h
 DESTINATION
-  ${CMAKE_INSTALL_INCLUDEDIR}/anari/backend/visrtx
+  ${CMAKE_INSTALL_INCLUDEDIR}/anari/ext/visrtx
 )

device/Object.cpp

@@ -36,38 +36,25 @@
 
 namespace visrtx {
 
-// Helper functions ///////////////////////////////////////////////////////////
-
-std::string string_printf(const char *fmt, ...)
+Object::Object(ANARIDataType type, DeviceGlobalState *s)
+    : helium::BaseObject(type, s)
 {
-  std::string s;
-  va_list args, args2;
-  va_start(args, fmt);
-  va_copy(args2, args);
-
-  s.resize(vsnprintf(nullptr, 0, fmt, args2) + 1);
-  va_end(args2);
-  vsprintf(s.data(), fmt, args);
-  va_end(args);
-  s.pop_back();
-  return s;
+  helium::BaseObject::markUpdated();
 }
 
-// Object definitions /////////////////////////////////////////////////////////
-
 void Object::commit()
 {
   // no-op
 }
 
-void Object::upload()
-{
-  // no-op
-}
-
 bool Object::getProperty(
     const std::string_view &name, ANARIDataType type, void *ptr, uint32_t flags)
 {
+  if (name == "valid" && type == ANARI_BOOL) {
+    helium::writeToVoidP(ptr, isValid());
+    return true;
+  }
+
   return false;
 }
 
@@ -76,57 +63,14 @@ void *Object::deviceData() const
   return nullptr;
 }
 
-void Object::setObjectType(ANARIDataType type)
+bool Object::isValid() const
 {
-  m_type = type;
-}
-
-ANARIDataType Object::type() const
-{
-  return m_type;
+  return true;
 }
 
 DeviceGlobalState *Object::deviceState() const
 {
-  return m_deviceState;
-}
-
-void Object::setDeviceState(DeviceGlobalState *d)
-{
-  if (m_deviceState)
-    throw std::runtime_error("cannot re-target the device ptr in an object");
-
-  m_deviceState = d;
-}
-
-TimeStamp Object::lastUpdated() const
-{
-  return m_lastUpdated;
-}
-
-void Object::markUpdated()
-{
-  m_lastUpdated = newTimeStamp();
-}
-
-TimeStamp Object::lastCommitted() const
-{
-  return m_lastCommitted;
-}
-
-void Object::markCommitted()
-{
-  m_lastCommitted = newTimeStamp();
-}
-
-int Object::commitPriority() const
-{
-  return m_commitPriority;
-}
-
-void Object::setCommitPriority(int priority)
-{
-  m_commitPriority = priority;
+  return (DeviceGlobalState *)helium::BaseObject::m_state;
 }
 
 } // namespace visrtx