optix version 7.5 changes. initial commit (untested)

Author: Felix Igelbrink

optix/build.pxd

@@ -70,15 +70,32 @@ cdef extern from "optix.h" nogil:
         unsigned int sbtIndexOffsetStrideInBytes
         unsigned int primitiveIndexOffset
 
-    IF _OPTIX_VERSION_MAJOR == 7 and _OPTIX_VERSION_MINOR > 3:  # switch to new instance flags
+    IF _OPTIX_VERSION_MAJOR == 7 and _OPTIX_VERSION_MINOR > 4:  # switch to new instance flags
+        cdef enum OptixPrimitiveType:
+            OPTIX_PRIMITIVE_TYPE_CUSTOM,
+            OPTIX_PRIMITIVE_TYPE_ROUND_QUADRATIC_BSPLINE,
+            OPTIX_PRIMITIVE_TYPE_ROUND_CUBIC_BSPLINE,
+            OPTIX_PRIMITIVE_TYPE_ROUND_LINEAR,
+            OPTIX_PRIMITIVE_TYPE_ROUND_CATMULLROM,
+            OPTIX_PRIMITIVE_TYPE_SPHERE,
+            OPTIX_PRIMITIVE_TYPE_TRIANGLE,
+    ELIF _OPTIX_VERSION_MAJOR == 7 and _OPTIX_VERSION_MINOR > 3:
         cdef enum OptixPrimitiveType:
             OPTIX_PRIMITIVE_TYPE_CUSTOM,
             OPTIX_PRIMITIVE_TYPE_ROUND_QUADRATIC_BSPLINE,
             OPTIX_PRIMITIVE_TYPE_ROUND_CUBIC_BSPLINE,
             OPTIX_PRIMITIVE_TYPE_ROUND_LINEAR,
             OPTIX_PRIMITIVE_TYPE_ROUND_CATMULLROM,
             OPTIX_PRIMITIVE_TYPE_TRIANGLE,
+    ELSE:
+        cdef enum OptixPrimitiveType:
+            OPTIX_PRIMITIVE_TYPE_CUSTOM,
+            OPTIX_PRIMITIVE_TYPE_ROUND_QUADRATIC_BSPLINE,
+            OPTIX_PRIMITIVE_TYPE_ROUND_CUBIC_BSPLINE,
+            OPTIX_PRIMITIVE_TYPE_ROUND_LINEAR,
+            OPTIX_PRIMITIVE_TYPE_TRIANGLE,
 
+    IF _OPTIX_VERSION_MAJOR == 7 and _OPTIX_VERSION_MINOR > 3:  # switch to new instance flags
         cdef enum OptixCurveEndcapFlags:
             OPTIX_CURVE_ENDCAP_DEFAULT,
             OPTIX_CURVE_ENDCAP_ON
@@ -99,13 +116,6 @@ cdef extern from "optix.h" nogil:
             unsigned int primitiveIndexOffset
             unsigned int endcapFlags
     ELSE:
-        cdef enum OptixPrimitiveType:
-            OPTIX_PRIMITIVE_TYPE_CUSTOM,
-            OPTIX_PRIMITIVE_TYPE_ROUND_QUADRATIC_BSPLINE,
-            OPTIX_PRIMITIVE_TYPE_ROUND_CUBIC_BSPLINE,
-            OPTIX_PRIMITIVE_TYPE_ROUND_LINEAR,
-            OPTIX_PRIMITIVE_TYPE_TRIANGLE,
-
         cdef struct OptixBuildInputCurveArray:
             OptixPrimitiveType curveType
             unsigned int numPrimitives
@@ -139,10 +149,17 @@ cdef extern from "optix.h" nogil:
         OPTIX_TRANSFORM_FORMAT_NONE,
         OPTIX_TRANSFORM_FORMAT_MATRIX_FLOAT12,
 
-    cdef enum OptixGeometryFlags:
-        OPTIX_GEOMETRY_FLAG_NONE,
-        OPTIX_GEOMETRY_FLAG_DISABLE_ANYHIT,
-        OPTIX_GEOMETRY_FLAG_REQUIRE_SINGLE_ANYHIT_CALL
+    IF _OPTIX_VERSION_MAJOR == 7 and _OPTIX_VERSION_MINOR > 4:  # switch to new geometry flags
+        cdef enum OptixGeometryFlags:
+            OPTIX_GEOMETRY_FLAG_NONE,
+            OPTIX_GEOMETRY_FLAG_DISABLE_ANYHIT,
+            OPTIX_GEOMETRY_FLAG_REQUIRE_SINGLE_ANYHIT_CALL
+            OPTIX_GEOMETRY_FLAG_DISABLE_TRIANGLE_FACE_CULLING
+    ELSE:
+        cdef enum OptixGeometryFlags:
+            OPTIX_GEOMETRY_FLAG_NONE,
+            OPTIX_GEOMETRY_FLAG_DISABLE_ANYHIT,
+            OPTIX_GEOMETRY_FLAG_REQUIRE_SINGLE_ANYHIT_CALL
 
     cdef struct OptixBuildInputTriangleArray:
         const CUdeviceptr * vertexBuffers
@@ -162,13 +179,37 @@ cdef extern from "optix.h" nogil:
         unsigned int primitiveIndexOffset
         OptixTransformFormat transformFormat
 
-    cdef struct OptixBuildInput:
-        OptixBuildInputType type
-        # union
-        OptixBuildInputTriangleArray triangleArray
-        OptixBuildInputCurveArray curveArray
-        OptixBuildInputCustomPrimitiveArray customPrimitiveArray
-        OptixBuildInputInstanceArray instanceArray
+    IF _OPTIX_VERSION_MAJOR == 7 and _OPTIX_VERSION_MINOR > 4:  # switch to new geometry flags
+        cdef struct OptixBuildInputSphereArray:
+            const CUdeviceptr* vertexBuffers
+            unsigned int vertexStrideInBytes
+            unsigned int numVertices
+            const CUdeviceptr *radiusBuffers
+            unsigned int radiusStrideInBytes
+            int singleRadius
+            const unsigned int *flags
+            unsigned int numSbtRecords
+            CUdeviceptr sbtIndexOffsetBuffer
+            unsigned int sbtIndexOffsetSizeInBytes
+            unsigned int sbtIndexOffsetStrideInBytes
+            unsigned int primitiveIndexOffset
+
+        cdef struct OptixBuildInput:
+            OptixBuildInputType type
+            # union
+            OptixBuildInputTriangleArray triangleArray
+            OptixBuildInputCurveArray curveArray
+            OptixBuildInputSphereArray   sphereArray
+            OptixBuildInputCustomPrimitiveArray customPrimitiveArray
+            OptixBuildInputInstanceArray instanceArray
+    ELSE:
+        cdef struct OptixBuildInput:
+            OptixBuildInputType type
+            # union
+            OptixBuildInputTriangleArray triangleArray
+            OptixBuildInputCurveArray curveArray
+            OptixBuildInputCustomPrimitiveArray customPrimitiveArray
+            OptixBuildInputInstanceArray instanceArray
 
     cdef struct OptixAccelBufferSizes:
         size_t outputSizeInBytes
@@ -300,6 +341,15 @@ cdef class BuildInputCurveArray(BuildInputArray):
     cdef vector[CUdeviceptr] _d_normal_buffer_ptrs
     cdef object _d_index_buffer
 
+IF _OPTIX_VERSION > 70400:
+    cdef class BuildInputSphereArray(BuildInputArray):
+        cdef OptixBuildInputSphereArray build_input
+        cdef list _d_vertex_buffers
+        cdef vector[CUdeviceptr] _d_vertex_buffer_ptrs
+        cdef list _d_radius_buffers
+        cdef vector[CUdeviceptr] _d_radius_buffer_ptrs
+        cdef object _d_sbt_offset_buffer
+        cdef vector[unsigned int] _flags
 
 cdef class Instance(OptixObject):
     cdef OptixInstance instance

optix/build.pyx

@@ -23,6 +23,7 @@ __all__ = ['GeometryFlags',
            'CurveEndcapFlags'
            ]
 
+
 class GeometryFlags(IntEnum):
     """
     Wraps the OptixGeometryFlags enum.
@@ -31,6 +32,9 @@ class GeometryFlags(IntEnum):
     DISABLE_ANYHIT = OPTIX_GEOMETRY_FLAG_DISABLE_ANYHIT,
     REQUIRE_SINGLE_ANYHIT_CALL = OPTIX_GEOMETRY_FLAG_REQUIRE_SINGLE_ANYHIT_CALL
 
+    IF _OPTIX_VERSION_MAJOR == 7 and _OPTIX_VERSION_MINOR > 4:
+        DISABLE_TRIANGLE_FACE_CULLING = OPTIX_GEOMETRY_FLAG_DISABLE_TRIANGLE_FACE_CULLING
+
 
 class BuildFlags(IntFlag):
     """
@@ -45,34 +49,29 @@ class BuildFlags(IntFlag):
     ALLOW_RANDOM_INSTANCE_ACCESS = OPTIX_BUILD_FLAG_ALLOW_RANDOM_INSTANCE_ACCESS,
 
 
-IF _OPTIX_VERSION > 70300:  # switch to new instance flags
-    class PrimitiveType(IntEnum):
-        """
-        Wraps the OptixPrimitiveType enum.
-        """
-        CUSTOM = OPTIX_PRIMITIVE_TYPE_CUSTOM,
-        ROUND_QUADRATIC_BSPLINE = OPTIX_PRIMITIVE_TYPE_ROUND_QUADRATIC_BSPLINE,
-        ROUND_CUBIC_BSPLINE = OPTIX_PRIMITIVE_TYPE_ROUND_CUBIC_BSPLINE,
-        ROUND_LINEAR = OPTIX_PRIMITIVE_TYPE_ROUND_LINEAR,
-        ROUND_CATMULLROM = OPTIX_PRIMITIVE_TYPE_ROUND_CATMULLROM,
-        TRIANGLE = OPTIX_PRIMITIVE_TYPE_TRIANGLE
-
-    class CurveEndcapFlags(IntEnum):
+class PrimitiveType(IntEnum):
+    """
+    Wraps the OptixPrimitiveType enum.
+    """
+    CUSTOM = OPTIX_PRIMITIVE_TYPE_CUSTOM,
+    ROUND_QUADRATIC_BSPLINE = OPTIX_PRIMITIVE_TYPE_ROUND_QUADRATIC_BSPLINE,
+    ROUND_CUBIC_BSPLINE = OPTIX_PRIMITIVE_TYPE_ROUND_CUBIC_BSPLINE,
+    ROUND_LINEAR = OPTIX_PRIMITIVE_TYPE_ROUND_LINEAR
+
+    IF _OPTIX_VERSION > 70300:  # switch to new instance flags
+        ROUND_CATMULLROM = OPTIX_PRIMITIVE_TYPE_ROUND_CATMULLROM
+    IF _OPTIX_VERSION > 70400:  # switch to new instance flags
+        SPHERE = OPTIX_PRIMITIVE_TYPE_SPHERE
+
+    TRIANGLE = OPTIX_PRIMITIVE_TYPE_TRIANGLE
+
+
+class CurveEndcapFlags(IntEnum):
+    IF _OPTIX_VERSION > 70300:  # switch to new instance flags
         DEFAULT = OPTIX_CURVE_ENDCAP_DEFAULT,
         ON = OPTIX_CURVE_ENDCAP_ON
-ELSE:
-    class CurveEndcapFlags(IntEnum):
-        DEFAULT = 0 # only for interface. Ignored for Optix versions below 7.4
-
-    class PrimitiveType(IntEnum):
-        """
-        Wraps the OptixPrimitiveType enum.
-        """
-        CUSTOM = OPTIX_PRIMITIVE_TYPE_CUSTOM,
-        ROUND_QUADRATIC_BSPLINE = OPTIX_PRIMITIVE_TYPE_ROUND_QUADRATIC_BSPLINE,
-        ROUND_CUBIC_BSPLINE = OPTIX_PRIMITIVE_TYPE_ROUND_CUBIC_BSPLINE,
-        ROUND_LINEAR = OPTIX_PRIMITIVE_TYPE_ROUND_LINEAR,
-        TRIANGLE = OPTIX_PRIMITIVE_TYPE_TRIANGLE
+    ELSE:
+        DEFAULT = 0  # only for interface. Ignored for Optix versions below 7.4
 
 
 class InstanceFlags(IntFlag):
@@ -325,7 +324,6 @@ cdef class BuildInputCustomPrimitiveArray(BuildInputArray):
         return self.build_input.numPrimitives
 
 
-
 cdef class BuildInputCurveArray(BuildInputArray):
     """
     BuildInputArray for curve inputs. This class wraps the OptixBuildInputCurveArray struct.
@@ -430,6 +428,109 @@ cdef class BuildInputCurveArray(BuildInputArray):
         return self.build_input.numPrimitives
 
 
+IF _OPTIX_VERSION > 70400:
+    cdef class BuildInputSphereArray(BuildInputArray):
+        """
+            BuildInputArray for a sphere. This class wraps the OptixBuildInputSphereArray struct.
+            In Contrast to the behavior of the Optix C++ API, this Python class will automatically convert all numpy.ndarrays
+            to cupy.ndarrays and keep track of them.
+
+            Parameters
+            ----------
+            vertex_buffers:
+                List of vertex buffers (one for each motion step) or a single array.
+                All arrays will be converted to cupy.ndarrays before any further processing.
+            index_buffer: ndarray, optional
+                A single 2d array containing the indices of all triangles or None
+            num_sbt_records: int
+                The number of records in the ShaderBindingTable for this geometry
+            flags: GeometryFlags
+                Flags to use in this input for each motionstep
+            sbt_record_offset_buffer: ndarray, optional
+                Offsets into the ShaderBindingTable record for each primitive (index) or None
+            pre_transform: ndarray(3,4) or None
+                A transform to apply prior to processing
+            primitive_index_offset: int
+                The offset applied to the primitive index in device code
+            """
+        def __init__(self,
+                     vertex_buffers,
+                     radius_buffers,
+                     num_sbt_records = 1,
+                     flags = None,
+                     sbt_record_offset_buffer = None,
+                     pre_transform = None,
+                     primitive_index_offset = 0
+                     ):
+
+            self._d_vertex_buffers = [cp.asarray(vb) for vb in ensure_iterable(vertex_buffers)]
+            self._d_vertex_buffer_ptrs.reserve(len(self._d_vertex_buffers))
+
+            self._d_radius_buffers = [cp.asarray(vb) for vb in ensure_iterable(radius_buffers)]
+            self._d_radius_buffer_ptrs.reserve(len(self._d_radius_buffers))
+
+            if len(self._d_radius_buffers) != len(self._d_vertex_buffers):
+                raise ValueError("Argument radius_buffers must have the same number of arrays as vertex_buffers.")
+
+            if len(self._d_vertex_buffers) == 0:
+                raise ValueError("BuildInputSphereArray cannot be empty.")
+
+            dtype = self._d_vertex_buffers[0].dtype
+            shape = self._d_vertex_buffers[0].shape
+            strides = self._d_vertex_buffers[0].strides
+
+            radius_dtype = self._d_radius_buffers[0].dtype
+            radius_shape = self._d_radius_buffers[0].shape
+            strides = self._d_radius_buffers[0].strides
+
+            for vb, rb in zip(self._d_vertex_buffers, self._d_radius_buffers):
+                if vb.dtype != dtype or vb.shape != shape or vb.strides != strides:
+                    raise ValueError("All vertex buffers must have the same size and dtype.")
+                self._d_vertex_buffer_ptrs.push_back(vb.data.ptr)
+
+                if rb.dtype != dtype or rb.shape != shape or rb.strides != strides:
+                    raise ValueError("All radius buffers must have the same size and dtype.")
+                self._d_radius_buffer_ptrs.push_back(rb.data.ptr)
+
+            self.build_input.vertexBuffers = self._d_vertex_buffer_ptrs.const_data()
+            self.build_input.radiusBuffers = self._d_radius_buffer_ptrs.const_data()
+
+            self.build_input.vertexStrideInBytes = self._d_vertex_buffers[0].strides[0]
+            self.build_input.radiusStrideInBytes = self._d_radius_buffers[0].strides[0]
+
+            self.build_input.numVertices = shape[0]
+            self.build_input.singleRadius = 1 if self._d_radius_buffers[0].shape[0] == 1 else 0
+
+            self.build_input.numSbtRecords = num_sbt_records
+            self._flags.resize(num_sbt_records)
+
+            if flags is None:
+                for i in range(num_sbt_records):
+                    self._flags[i] = OPTIX_GEOMETRY_FLAG_NONE
+            else:
+                for i in range(num_sbt_records):
+                    self._flags[i] = flags[i].value
+
+            self.build_input.flags = self._flags.data()
+
+
+            if sbt_record_offset_buffer is not None:
+                self._d_sbt_offset_buffer = cp.asarray(sbt_record_offset_buffer).ravel()
+                self.build_input.sbtIndexOffsetBuffer = self._d_sbt_offset_buffer.data.ptr
+                itemsize = self._d_sbt_offset_buffer.itemsize
+                if itemsize > 4:
+                    raise ValueError("Only 32 bit allowed at max")
+                self.build_input.sbtIndexOffsetSizeInBytes = itemsize
+                self.build_input.sbtIndexOffsetStrideInBytes = self._d_sbt_offset_buffer.strides[0]
+            else:
+                self.build_input.sbtIndexOffsetBuffer = 0
+                self.build_input.sbtIndexOffsetStrideInBytes = 0
+                self.build_input.sbtIndexOffsetSizeInBytes = 0
+
+            self.build_input.primitiveIndexOffset = primitive_index_offset
+
+    __all__.append('BuildInputSphereArray')
+
 cdef class Instance(OptixObject):
     """
     Class representing a single instance (another AccelerationStructure) for use in a Instance level AccelerationStructure.