Merge branch 'next_release'

Author: jeffamstutz

.github/workflows/tsd_ci.yml

@@ -0,0 +1,52 @@
+name: TSD CI
+
+on:
+  push:
+    branches: [ next_release ]
+  pull_request:
+    branches: [ main, next_release ]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+        config: [Release, Debug]
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install Packages
+      if: ${{ matrix.os == 'ubuntu-latest' }}
+      run: sudo apt install -y libtbb-dev
+
+    - name: Configure ANARI-SDK CMake
+      run: >
+        cmake -LA -B ${{github.workspace}}/deps_build
+        -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/deps
+        ${{github.workspace}}/tsd/cmake/build_deps
+
+    - name: Build + install ANARI-SDK
+      run: cmake --build ${{ github.workspace }}/deps_build --config ${{ matrix.config }}
+
+    - name: Configure TSD CMake
+      run: >
+        cmake -LA -B ${{github.workspace}}/build
+        -DBUILD_INTERACTIVE_APPS=OFF
+        -DCMAKE_PREFIX_PATH=${{ github.workspace }}/deps
+        -DCMAKE_BUILD_TYPE=${{ matrix.config }}
+        -DTSD_USE_ASSIMP=OFF
+        -DTSD_USE_CUDA=OFF
+        -DTSD_USE_HDF5=OFF
+        -DTSD_USE_OPENGL=OFF
+        -DTSD_USE_TBB=OFF
+        -DTSD_ENABLE_SERIALIZATION=OFF
+        ${{ github.workspace }}/tsd
+
+    - name: Build
+      run: cmake --build ${{ github.workspace }}/build --config ${{ matrix.config }}
+
+    - name: Unit Tests
+      working-directory: ${{  github.workspace }}/build
+      run: ctest -C ${{ matrix.config }} --output-on-failure

CMakeLists.txt

@@ -35,6 +35,8 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
 set(CMAKE_BUILD_TYPE_INIT "Release")
 
 set(CMAKE_INSTALL_RPATH "$ORIGIN")
@@ -49,10 +51,12 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 if (NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
   if (CMAKE_VERSION VERSION_LESS "3.23")
     set(CMAKE_CUDA_ARCHITECTURES OFF)
+  else()
+    set(CMAKE_CUDA_ARCHITECTURES all-major)
   endif()
 endif()
 
-project(VisRTX VERSION 0.9.0 LANGUAGES C CXX)
+project(VisRTX VERSION 0.10.0 LANGUAGES C CXX)
 
 include(GNUInstallDirs)
 
@@ -63,6 +67,15 @@ option(
 )
 mark_as_advanced(VISRTX_SET_SOVERSION)
 
+option(VISRTX_BUILD_TSD "Build TSD sample applications" OFF)
+mark_as_advanced(VISRTX_BUILD_TSD)
+
+option(
+  VISRTX_ENABLE_MDL_SUPPORT
+  "Whether to enable NVIDIA MDL support for VisRTX materials"
+  OFF
+)
+
 if (VISRTX_SET_SOVERSION)
   set(VISRTX_CMAKE_INSTALL_DESTINATION
     ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_VERSION}
@@ -76,7 +89,7 @@ endif()
 ## Dependencies ###############################################################
 
 # ANARI-SDK
-set(ANARI_REQUIRED_VERSION 0.10.0)
+set(ANARI_REQUIRED_VERSION 0.12.0)
 find_package(anari ${ANARI_REQUIRED_VERSION} REQUIRED)
 
 # CUDA
@@ -106,6 +119,10 @@ enable_testing()
 add_subdirectory(devices)
 add_subdirectory(examples)
 add_subdirectory(tests)
+add_subdirectory(shaders)
+if (VISRTX_BUILD_TSD)
+  add_subdirectory(tsd)
+endif()
 
 ## Configure CMake find_package() config files ################################
 

README.md

@@ -79,6 +79,13 @@ In addition to standard `ANARI_KHR` extensions, the following extensions are
 also implemented in the `visrtx` device. Note that all extensions are subject to
 change
 
+#### "VISRTX_ARRAY_CUDA" (experimental)
+
+This extension indicates that applications can use pointers to CUDA device
+memory when created shared and captured arrays when using VisRTX. This is
+currently only working with `sharedStructured` spatial fields and is under
+active development.
+
 #### "VISRTX_CUDA_OUTPUT_BUFFERS"
 
 This extension indicates that raw CUDA GPU buffers from frame objects can be
@@ -92,10 +99,19 @@ GPU pointers returned by `anariMapFrame()` are device pointers intended to be
 kept on the device. Applications which desire to copy data from the device back
 to the host should instead map the ordinary `color` and `depth` channels.
 
-#### "VISRTX_UNIFORM_ATTRIBUTES" (experimental)
+#### "VISRTX_INSTANCE_ATTRIBUTES" (experimental)
 
 This extension indicates that all attributes can be set as a single
-`ANARI_FLOAT32_VEC4` value, which is constant over the entire geometry.
+`ANARI_FLOAT32_VEC4` value on the instance, which overrides any values on the
+geometries within the instanced group.
+
+#### "VISRTX_SPATIAL_FIELD_NANOVDB" (experimental)
+
+This extension adds the ability to render
+[NanoVDB](https://developer.nvidia.com/nanovdb) spatial fields. This subtype
+takes a single array parameter called `data`, where the array is of type `UINT8`
+containing the raw bytes containing of the grid data. Currently `float`,
+`nanovdb::Fp4/8/16/N` grids are supported.
 
 #### "VISRTX_TRIANGLE_FACE_VARYING_ATTRIBUTES" (experimental)
 
@@ -155,6 +171,7 @@ The following extensions are either partially or fully implemented by VisRTX:
 
 - `KHR_ARRAY1D_REGION`
 - `KHR_AUXILIARY_BUFFERS`
+- `KHR_CAMERA_DEPTH_OF_FIELD`
 - `KHR_CAMERA_ORTHOGRAPHIC`
 - `KHR_CAMERA_PERSPECTIVE`
 - `KHR_DEVICE_SYNCHRONIZATION`
@@ -169,6 +186,7 @@ The following extensions are either partially or fully implemented by VisRTX:
 - `KHR_GEOMETRY_SPHERE`
 - `KHR_GEOMETRY_TRIANGLE`
 - `KHR_INSTANCE_TRANSFORM`
+- `KHR_INSTANCE_TRANSFORM_ARRAY`
 - `KHR_LIGHT_DIRECTIONAL`
 - `KHR_LIGHT_POINT`
 - `KHR_MATERIAL_MATTE`
@@ -179,9 +197,12 @@ The following extensions are either partially or fully implemented by VisRTX:
 - `KHR_SAMPLER_TRANSFORM`
 - `KHR_SPATIAL_FIELD_STRUCTURED_REGULAR`
 - `KHR_VOLUME_TRANSFER_FUNCTION1D`
+- `VISRTX_ARRAY_CUDA`
 - `VISRTX_CUDA_OUTPUT_BUFFERS`
+- `VISRTX_INSTANCE_ATTRIBUTES`
+- `VISRTX_SPATIAL_FIELD_NANOVDB`
+- `VISRTX_TRIANGLE_BACK_FACE_CULLING`
 - `VISRTX_TRIANGLE_FACE_VARYING_ATTRIBUTES`
-- `VISRTX_UNIFORM_ATTRIBUTES`
 
 For any found bugs in extensions that are implemented, please [open an
 issue](https://github.com/NVIDIA/VisRTX/issues/new)!

ci/.gitlab-ci.yml

@@ -0,0 +1,45 @@
+# Copyright (c) 2019-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+if (TARGET MDL_SDK::MDL_SDK)
+  return()
+endif()
+
+find_path(MDL_SDK_ROOT NAMES "include/mi/mdl_sdk.h" PATHS ${MDL_SDK_PATH} ENV MDL_SDK_PATH)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(MDL_SDK DEFAULT_MSG MDL_SDK_ROOT)
+
+
+set(MDL_SDK_INCLUDE_DIR ${MDL_SDK_ROOT}/include)
+set(MDL_SDK_INCLUDE_DIRS ${MDL_SDK_ROOT}/include)
+mark_as_advanced(MDL_SDK_INCLUDE_DIR MDL_SDK_INCLUDE_DIRS)
+
+add_library(MDL_SDK::MDL_SDK INTERFACE IMPORTED)
+target_include_directories(MDL_SDK::MDL_SDK INTERFACE ${MDL_SDK_INCLUDE_DIR})

ci/build_linux.sh

@@ -29,6 +29,9 @@
 
 option(VISRTX_BUILD_RTX_DEVICE "Build CUDA/OptiX device" ON)
 if (VISRTX_BUILD_RTX_DEVICE)
+  if(VISRTX_ENABLE_MDL_SUPPORT)
+    add_subdirectory(libmdl)
+  endif()
   add_subdirectory(rtx)
 endif()
 

ci/build_win.ps1

@@ -48,8 +48,6 @@ anari_generate_frontend(
   JSON ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-add_subdirectory(generated)
-
 set(CMAKE_INSTALL_RPATH "$ORIGIN")
 
 add_library(${PROJECT_NAME} SHARED
@@ -85,10 +83,16 @@ add_library(${PROJECT_NAME} SHARED
   generated/VisGLObjects.cpp
   generated/VisGLDeviceFactories.cpp
   generated/VisGLString.cpp
-  generated/VisGLQueries.cpp
   src/glad/src/gl.c
 )
 
+anari_generate_queries(
+  DEVICE_TARGET ${PROJECT_NAME}
+  CPP_NAMESPACE visgl
+  JSON_ROOT_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}
+  JSON_DEFINITIONS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/visgl_device.json
+)
+
 generate_export_header(${PROJECT_NAME}
   EXPORT_MACRO_NAME "VISGL_DEVICE_INTERFACE"
 )

cmake/FindMDL_SDK.cmake

@@ -60,7 +60,7 @@ Device::Device(ANARIDevice device, ANARIObject o) : device(device), object(o) {
       glAPI.set(device, object, ANARI_STRING, value);
    }
    {
-      int32_t value[] = {INT32_C(0)};
+      int8_t value[] = {INT8_C(0)};
       glDebug.set(device, object, ANARI_BOOL, value);
    }
    {
@@ -112,7 +112,7 @@ void Device::unset(const char *paramname) {
          return;
       case 35: //glDebug
          {
-            int32_t value[] = {INT32_C(0)};
+            int8_t value[] = {INT8_C(0)};
             glDebug.set(device, object, ANARI_BOOL, value);
          }
          return;