Added Get Acceleration structure function

Simply added the vulkan function GetAccelerationStructureDeviceAddress, next I'll be adding 2 more copy commands.
KhronosGroup · Jul 14, 2023 · 8effe9a · 8effe9a
1 parent 5a85fdd
commit 8effe9a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKAccelerationStructure.h b/MoltenVK/MoltenVK/GPUObjects/MVKAccelerationStructure.h
@@ -28,7 +28,7 @@
  vkCreateAccelerationStructureKHR - DONE
  vkDestroyAccelerationStructureKHR - DONE
  vkGetAccelerationStructureBuildSizesKHR - DONE
- vkGetAccelerationStructureDeviceAddressKHR
+ vkGetAccelerationStructureDeviceAddressKHR - DONE
  vkGetDeviceAccelerationStructureCompatibilityKHR - DONE
  vkWriteAccelerationStructuresPropertiesKHR
 */
@@ -40,6 +40,7 @@
 #import <Metal/MTLAccelerationStructure.h>
 #import <Metal/MTLAccelerationStructureTypes.h>
 
+#pragma mark -
 #pragma mark MVKAccelerationStructure
 
 class MVKAccelerationStructure : public MVKVulkanAPIDeviceObject {
@@ -58,7 +59,9 @@ class MVKAccelerationStructure : public MVKVulkanAPIDeviceObject {
 
     /** Gets the actual size of the acceleration structure*/
     uint64_t getMTLSize();
-
+
+#pragma mark -
+#pragma mark Getters and Setters
     /** Used when building the acceleration structure, to mark whether or not an acceleration structure can be updated*/
     void setAllowUpdate(bool value) { _allowUpdate = value; }
 
@@ -76,6 +79,7 @@ class MVKAccelerationStructure : public MVKVulkanAPIDeviceObject {
 
     /** Gets the address of the acceleration structure*/
     uint64_t getDeviceAddress() { return _address; }
+#pragma mark -
 #pragma mark Construction
     MVKAccelerationStructure(MVKDevice* device) : MVKVulkanAPIDeviceObject(device) {}
 
@@ -86,5 +90,5 @@ class MVKAccelerationStructure : public MVKVulkanAPIDeviceObject {
     id<MTLAccelerationStructure> _accelerationStructure;
     bool _allowUpdate = false;
     bool _built = false;
-    uint64_t _address;
+    uint64_t _address = 0;
 };
diff --git a/MoltenVK/MoltenVK/Vulkan/vulkan.mm b/MoltenVK/MoltenVK/Vulkan/vulkan.mm
@@ -2639,16 +2639,17 @@ MVK_PUBLIC_VULKAN_SYMBOL VkResult vkCreateAccelerationStructureKHR(
     return rslt;
 }
 
-MVK_PUBLIC_VULKAN_SYMBOL void vkDestroyAccelerationStructureKHR(
-    VkDevice                     device,
-    VkAccelerationStructureKHR   accelerationStructure,
-    const VkAllocationCallbacks* pAllocator) {
+MVK_PUBLIC_VULKAN_SYMBOL VkDeviceAddress vkGetAccelerationStructureDeviceAddressKHR(
+    VkDevice                                            device,
+    const VkAccelerationStructureDeviceAddressInfoKHR*  pInfo) {
 
     MVKTraceVulkanCallStart();
     MVKDevice* mvkDev = MVKDevice::getMVKDevice(device);
-    MVKAccelerationStructure* mvkAccelerationStructure = (MVKAccelerationStructure*)accelerationStructure;
-    mvkDev->destroyAccelerationStructure(mvkAccelerationStructure, pAllocator);
+    MVKAccelerationStructure* mvkAccelerationStructure = (MVKAccelerationStructure*)pInfo->accelerationStructure;
+    uint64_t result = mvkAccelerationStructure->getDeviceAddress();
     MVKTraceVulkanCallEnd();
+
+    return (VkDeviceAddress)result;
 }
 
 MVK_PUBLIC_VULKAN_SYMBOL void vkGetAccelerationStructureBuildSizesKHR(