Take in more parameters for CmdBuildAccelerationStructure

This commit just changes build acceleration structure, to allow for the different options/parameters to be take into account. I plan to amend this commit.
KhronosGroup · Jul 12, 2023 · 257a75f · 257a75f
1 parent 9d1d547
commit 257a75f
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 9 deletions.
diff --git a/MoltenVK/MoltenVK/Commands/MVKCmdAccelerationStructure.mm b/MoltenVK/MoltenVK/Commands/MVKCmdAccelerationStructure.mm
@@ -39,22 +39,62 @@
 
 void MVKCmdBuildAccelerationStructure::encode(MVKCommandEncoder* cmdEncoder) {
     id<MTLAccelerationStructureCommandEncoder> accStructEncoder = cmdEncoder->getMTLAccelerationStructureEncoder(kMVKCommandUseNone);
-    id<MTLAccelerationStructure> srcAccelerationStructure = (id<MTLAccelerationStructure>)_geometryInfos.srcAccelerationStructure;
-    id<MTLAccelerationStructure> dstAccelerationStructure = (id<MTLAccelerationStructure>)_geometryInfos.dstAccelerationStructure;
 
-    MTLAccelerationStructureDescriptor* accStructDescriptor = [MTLAccelerationStructureDescriptor new];
-    accStructDescriptor.usage = MTLAccelerationStructureUsageNone;
+    MVKAccelerationStructure* mvkSrcAccelerationStructure = (MVKAccelerationStructure*)_geometryInfos.srcAccelerationStructure;
+    MVKAccelerationStructure* mvkDstAccelerationStructure =    (MVKAccelerationStructure*)_geometryInfos.dstAccelerationStructure;
+
+    id<MTLAccelerationStructure> srcAccelerationStructure = (id<MTLAccelerationStructure>)mvkSrcAccelerationStructure->getMTLAccelerationStructure();
+    id<MTLAccelerationStructure> dstAccelerationStructure = (id<MTLAccelerationStructure>)mvkDstAccelerationStructure->getMTLAccelerationStructure();
+
+    if(_geometryInfos.mode == VK_BUILD_ACCELERATION_STRUCTURE_MODE_UPDATE_KHR && !mvkDstAccelerationStructure->getAllowUpdate())
+    {
+        return;
+    }
 
     MVKDevice* mvkDvc = cmdEncoder->getDevice();
     MVKBuffer* mvkBuffer = mvkDvc->getBufferAtAddress(_geometryInfos.scratchData.deviceAddress);
 
     id<MTLBuffer> scratchBuffer = mvkBuffer->getMTLBuffer();
-    int scratchBufferOffset = 0;
+    NSInteger scratchBufferOffset = mvkBuffer->getMTLBufferOffset();
+
+    if(_geometryInfos.mode == VK_BUILD_ACCELERATION_STRUCTURE_MODE_BUILD_KHR)
+    {
+        MTLAccelerationStructureDescriptor* accStructBuildDescriptor = [MTLAccelerationStructureDescriptor new];
+
+        if(mvkIsAnyFlagEnabled(_geometryInfos.flags, VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_UPDATE_BIT_KHR)){
+            accStructBuildDescriptor.usage += MTLAccelerationStructureUsageRefit;
+            mvkDstAccelerationStructure->setAllowUpdate(true);
+        }else if(mvkIsAnyFlagEnabled(_geometryInfos.flags, VK_BUILD_ACCELERATION_STRUCTURE_PREFER_FAST_BUILD_BIT_KHR)){
+            accStructBuildDescriptor.usage += MTLAccelerationStructureUsagePreferFastBuild;
+        }else{
+            accStructBuildDescriptor.usage = MTLAccelerationStructureUsageNone;
+        }
+
+        [accStructEncoder buildAccelerationStructure:dstAccelerationStructure
+                                descriptor:accStructBuildDescriptor
+                                scratchBuffer:scratchBuffer
+                                scratchBufferOffset:scratchBufferOffset];
+        return;
+    }
+
+    if(_geometryInfos.mode == VK_BUILD_ACCELERATION_STRUCTURE_MODE_UPDATE_KHR)
+    {
+        MTLAccelerationStructureDescriptor* accStructRefitDescriptor = [MTLAccelerationStructureDescriptor new];
+
+        if(mvkIsAnyFlagEnabled(_geometryInfos.flags, VK_BUILD_ACCELERATION_STRUCTURE_PREFER_FAST_BUILD_BIT_KHR)){
+            accStructRefitDescriptor.usage += MTLAccelerationStructureUsagePreferFastBuild;
+        }
+
+        [accStructEncoder refitAccelerationStructure:srcAccelerationStructure
+                            descriptor:accStructRefitDescriptor
+                            destination:dstAccelerationStructure
+                            scratchBuffer:scratchBuffer
+                            scratchBufferOffset:scratchBufferOffset];
+
+        return;
+    }
 
-    [accStructEncoder buildAccelerationStructure:dstAccelerationStructure
-                                    descriptor:accStructDescriptor
-                                    scratchBuffer:scratchBuffer
-                                    scratchBufferOffset:scratchBufferOffset];
+    return;
 }
 
 #pragma mark -

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKAccelerationStructure.h b/MoltenVK/MoltenVK/GPUObjects/MVKAccelerationStructure.h
@@ -58,11 +58,18 @@ class MVKAccelerationStructure : public MVKVulkanAPIDeviceObject {
 
     /** Gets the device address of the acceleration structure*/
     uint64_t getDeviceAddress();
+
+    /** Used when building the acceleration structure, to mark whether or not an acceleration structure can be updated*/
+    void setAllowUpdate(bool value) { _allowUpdate = value; }
+
+    /** Checks if this acceleration structure is allowed to be updated*/
+    bool getAllowUpdate() { return _allowUpdate; }
 
 #pragma mark Construction
     MVKAccelerationStructure(MVKDevice* device) : MVKVulkanAPIDeviceObject(device) {}
 protected:
     void propagateDebugName() override {}
 
     id<MTLAccelerationStructure> _accelerationStructure;
+    bool _allowUpdate = false;
 };