Merge branch 'release-0.12.x'

Author: gregjohnson

CHANGELOG.md

@@ -1,6 +1,41 @@
 Version History
 ---------------
 
+### Open VKL 0.12.0
+
+-   Added support for temporally varying volumes with associated API changes for
+    sampling, gradients, and hit iteration. This feature can be used to enable
+    motion blurred rendering
+-   Structured regular volumes:
+    -   Support for temporally structured and temporally unstructured (TUV)
+        input data
+    -   Improved `nominalDeltaT` for interval iteration
+    -   Interval iterator robustness improvements for axis-aligned rays
+    -   Sampling performance improvements
+-   VDB volumes:
+    -   Multi-attribute support (including three-component float grids)
+    -   Interval iterator robustness improvements for axis-aligned rays
+    -   Performance improvements for scalar sampling
+    -   Now restricting volumes to exactly four levels
+    -   Allowing leaf nodes on the lowest level only
+-   Unstructured volumes:
+    -   Improved `nominalDeltaT` for interval iteration
+-   `vdb_util` updates:
+    -   Support for loading multi-attribute .vdb files (`float` and `Vec3s`
+        grids)
+    -   Fix order of rotation matrix coefficients loaded from .vdb files
+-   vklExamples additions demonstrating:
+    -   Motion blurred rendering on temporally structured and temporally
+        unstructured volumes (`structuredRegular` only)
+    -   Support for `vdb` multi-attribute volumes
+    -   Hit iterator time support
+-   Superbuild updates to:
+    -   Embree 3.12.2
+    -   rkcommon 1.6.0
+    -   ISPC 1.15.0
+    -   OpenVDB 8.0.0
+-   Minimum rkcommon version is now 1.6.0
+
 ### Open VKL 0.11.0
 
 -   Introduced API support for multi-attribute volumes, including APIs for

CMakeLists.txt

@@ -1,4 +1,4 @@
-## Copyright 2019-2020 Intel Corporation
+## Copyright 2019-2021 Intel Corporation
 ## SPDX-License-Identifier: Apache-2.0
 
 ## Global CMake options ##
@@ -19,7 +19,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 ## Establish project ##
 
-project(openvkl VERSION 0.11.0 LANGUAGES C CXX)
+project(openvkl VERSION 0.12.0 LANGUAGES C CXX)
 
 ## Add openvkl specific macros ##
 
@@ -47,8 +47,11 @@ openvkl_configure_build_type()
 openvkl_configure_global_build_flags()
 openvkl_configure_ispc_isa()
 
-set(RKCOMMON_VERSION_REQUIRED 1.4.1)
+set(RKCOMMON_VERSION_REQUIRED 1.6.0)
 find_package(rkcommon ${RKCOMMON_VERSION_REQUIRED} REQUIRED)
+get_target_property(RKCOMMON_INCLUDE_DIRS rkcommon::rkcommon
+  INTERFACE_INCLUDE_DIRECTORIES)
+
 
 find_package(embree 3.6.1 REQUIRED)
 openvkl_create_embree_target()

README.md

@@ -4,7 +4,7 @@
 option(OPENVKL_ISPC_FAST_MATH "enable ISPC fast-math optimizations" OFF)
 
 # ISPC versions to look for, in decending order (newest first)
-set(ISPC_VERSION_WORKING "1.14.1")
+set(ISPC_VERSION_WORKING "1.15.0" "1.14.1")
 list(GET ISPC_VERSION_WORKING -1 ISPC_VERSION_REQUIRED)
 
 if (NOT ISPC_EXECUTABLE)
@@ -167,7 +167,7 @@ macro (OPENVKL_ISPC_COMPILE)
 
   set(ISPC_TARGET_DIR ${CMAKE_CURRENT_BINARY_DIR}/ispc_${ISPC_TARGETS_STR})
 
-  if(ISPC_INCLUDE_DIR)
+  if (ISPC_INCLUDE_DIR)
     string(REPLACE ";" ";-I;" ISPC_INCLUDE_DIR_PARMS "${ISPC_INCLUDE_DIR}")
     set(ISPC_INCLUDE_DIR_PARMS "-I" ${ISPC_INCLUDE_DIR_PARMS})
   endif()
@@ -254,7 +254,7 @@ macro (OPENVKL_ISPC_COMPILE)
       --addressing=${OPENVKL_ISPC_ADDRESSING}
       ${ISPC_OPT_FLAGS}
       --target=${ISPC_TARGET_ARGS}
-      --woff
+      --wno-perf
       ${ISPC_ADDITIONAL_ARGS}
       -h ${ISPC_TARGET_DIR}/${fname}_ispc.h
       -MMM  ${outdir}/${fname}.dev.idep

cmake/openvkl_ispc.cmake

@@ -1,4 +1,4 @@
-## Copyright 2019-2020 Intel Corporation
+## Copyright 2019-2021 Intel Corporation
 ## SPDX-License-Identifier: Apache-2.0
 
 macro(openvkl_add_library_ispc name type)
@@ -207,10 +207,15 @@ endmacro()
 # and we also define constants that describe the topology
 # in terms of node resolution per level.
 function(openvkl_vdb_generate_topology)
+  set(VKL_VDB_NUM_LEVELS "4")
+
+  set(VKL_VDB_LOG_RESOLUTION "")
+  list(APPEND VKL_VDB_LOG_RESOLUTION "${VKL_VDB_LOG_RESOLUTION_3}")
+  list(APPEND VKL_VDB_LOG_RESOLUTION "${VKL_VDB_LOG_RESOLUTION_2}")
+  list(APPEND VKL_VDB_LOG_RESOLUTION "${VKL_VDB_LOG_RESOLUTION_1}")
+  list(APPEND VKL_VDB_LOG_RESOLUTION "${VKL_VDB_LOG_RESOLUTION_0}")
 
-  list(LENGTH VKL_VDB_LOG_RESOLUTION VKL_VDB_NUM_LEVELS)
   math(EXPR VKL_VDB_LEAF_LEVEL "${VKL_VDB_NUM_LEVELS}-1")
-  list(REVERSE VKL_VDB_LOG_RESOLUTION) # Define from leaf level up.
   set(VKL_VDB_TOTAL_LOG_RES 0)
 
   foreach(I RANGE ${VKL_VDB_LEAF_LEVEL})
@@ -232,22 +237,35 @@ function(openvkl_vdb_generate_topology)
       ${PROJECT_SOURCE_DIR}/${PROJECT_NAME}/include/${PROJECT_NAME}/vdb_topology.h.in
       include/${PROJECT_NAME}/vdb/topology${VKL_VDB_POSTFIX}.h
     )
-    configure_file(
-      ${PROJECT_SOURCE_DIR}/${PROJECT_NAME}/drivers/ispc/volume/vdb/VdbSampleConstantLeaf.ih.in
-      include/${PROJECT_NAME}_vdb/VdbSampleConstantLeaf_${VKL_VDB_LEVEL}.ih
-    )
 
     configure_file(
       ${PROJECT_SOURCE_DIR}/${PROJECT_NAME}/drivers/ispc/volume/vdb/VdbSamplerDispatchInner.ih.in
       include/${PROJECT_NAME}_vdb/VdbSamplerDispatchInner${VKL_VDB_POSTFIX}.ih
     )
 
-    foreach(VKL_VDB_UNIVARY in "uniform" "varying")
-      configure_file(
-        ${PROJECT_SOURCE_DIR}/${PROJECT_NAME}/drivers/ispc/volume/vdb/VdbSampleInner.ih.in
-        include/${PROJECT_NAME}_vdb/VdbSampleInner_${VKL_VDB_UNIVARY}_${VKL_VDB_LEVEL}.ih
-      )
-    endforeach()
+    # Generate uniform, varying, and univary traversal.
+    # a) We know all queries are in the same leaf node. Fully uniform traversal.
+    set(VKL_VDB_UNIVARY_IN "uniform")
+    set(VKL_VDB_UNIVARY_OUT "uniform")
+    configure_file(
+      ${PROJECT_SOURCE_DIR}/${PROJECT_NAME}/drivers/ispc/volume/vdb/VdbSampleInner.ih.in
+      include/${PROJECT_NAME}_vdb/VdbSampleInner_${VKL_VDB_UNIVARY_IN}_${VKL_VDB_UNIVARY_OUT}_${VKL_VDB_LEVEL}.ih
+    )
+    # b) All lanes are not in the same subtree.
+    set(VKL_VDB_UNIVARY_IN "varying")
+    set(VKL_VDB_UNIVARY_OUT "varying")
+    configure_file(
+      ${PROJECT_SOURCE_DIR}/${PROJECT_NAME}/drivers/ispc/volume/vdb/VdbSampleInner.ih.in
+      include/${PROJECT_NAME}_vdb/VdbSampleInner_${VKL_VDB_UNIVARY_IN}_${VKL_VDB_UNIVARY_OUT}_${VKL_VDB_LEVEL}.ih
+    )
+    # c) Lanes are not in the same leaf, but currently in the same subtree.
+    #    May degenerate to varying.
+    set(VKL_VDB_UNIVARY_IN "uniform")
+    set(VKL_VDB_UNIVARY_OUT "varying")
+    configure_file(
+      ${PROJECT_SOURCE_DIR}/${PROJECT_NAME}/drivers/ispc/volume/vdb/VdbSampleInner.ih.in
+      include/${PROJECT_NAME}_vdb/VdbSampleInner_${VKL_VDB_UNIVARY_IN}_${VKL_VDB_UNIVARY_OUT}_${VKL_VDB_LEVEL}.ih
+    )
 
     configure_file(
       ${PROJECT_SOURCE_DIR}/${PROJECT_NAME}/drivers/ispc/volume/vdb/VdbQueryVoxel.ih.in

cmake/openvkl_macros.cmake

@@ -2,7 +2,7 @@ SHELL := /bin/bash
 
 webpages := $(addprefix www/, $(addsuffix .html, index documentation examples downloads related_projects legal))
 process_version := $(addprefix tmp/, $(addsuffix .md, readme_head))
-images_png := $(addprefix images/, $(addsuffix .png, structured_spherical_coords vdb_structure))
+images_png := $(addprefix images/, $(addsuffix .png, structured_spherical_coords vdb_structure vklExamples))
 
 webimages := $(addprefix www/, $(images_png))
 
@@ -68,7 +68,7 @@ tmp/api_html.md: api.md images.md tmp/links.md
 
 www/index.html: teaser.html overview.md changelog.md support.md
 www/documentation.html: tmp/api_html.md
-www/examples.html: examples.md
+www/examples.html: examples.md images.md
 www/downloads.html: compilation.md
 www/related_projects.html: related_projects.md
 www/legal.html: legal.md