Fix handle mapping/unwrapping for acceleration structure building (#1590

) Change-Id: I526eb16c866785c60aab0121dd21df2131ba6893
LunarG · Jul 11, 2024 · f9b6598 · f9b6598
1 parent 6b1fc0b
commit f9b6598
Show file tree

Hide file tree

Showing 15 changed files with 119 additions and 27 deletions.
diff --git a/framework/decode/custom_vulkan_struct_handle_mappers.cpp b/framework/decode/custom_vulkan_struct_handle_mappers.cpp
@@ -113,5 +113,60 @@ void MapStructHandles(Decoded_VkWriteDescriptorSet* wrapper, const VulkanObjectI
     }
 }
 
+void MapStructHandles(Decoded_VkAccelerationStructureGeometryKHR* wrapper,
+                      const VulkanObjectInfoTable&                object_info_table)
+{
+    if ((wrapper != nullptr) && (wrapper->decoded_value != nullptr))
+    {
+        VkAccelerationStructureGeometryKHR* value = wrapper->decoded_value;
+
+        switch (value->geometryType)
+        {
+            case VK_GEOMETRY_TYPE_TRIANGLES_KHR:
+                MapStructHandles(wrapper->geometry->triangles, object_info_table);
+                break;
+            case VK_GEOMETRY_TYPE_AABBS_KHR:
+                // No handle there so the map func doesn't exist
+                break;
+            case VK_GEOMETRY_TYPE_INSTANCES_KHR:
+                // No handle there so the map func doesn't exist
+                break;
+            default:
+                GFXRECON_LOG_WARNING("Attempting to map unknown acceleration structure geometry type");
+                break;
+        }
+    }
+}
+
+void MapStructHandles(Decoded_VkAccelerationStructureBuildGeometryInfoKHR* wrapper,
+                      const VulkanObjectInfoTable&                         object_info_table)
+{
+    if ((wrapper != nullptr) && (wrapper->decoded_value != nullptr))
+    {
+        VkAccelerationStructureBuildGeometryInfoKHR* value = wrapper->decoded_value;
+
+        value->srcAccelerationStructure = handle_mapping::MapHandle<AccelerationStructureKHRInfo>(
+            wrapper->srcAccelerationStructure,
+            object_info_table,
+            &VulkanObjectInfoTable::GetAccelerationStructureKHRInfo);
+
+        value->dstAccelerationStructure = handle_mapping::MapHandle<AccelerationStructureKHRInfo>(
+            wrapper->dstAccelerationStructure,
+            object_info_table,
+            &VulkanObjectInfoTable::GetAccelerationStructureKHRInfo);
+
+        MapStructArrayHandles<Decoded_VkAccelerationStructureGeometryKHR>(
+            wrapper->pGeometries->GetMetaStructPointer(), wrapper->pGeometries->GetLength(), object_info_table);
+
+        if (wrapper->ppGeometries->GetMetaStructPointer() != nullptr)
+        {
+            for (size_t i = 0; i < wrapper->ppGeometries->GetLength(); ++i)
+            {
+                MapStructHandles(wrapper->ppGeometries->GetMetaStructPointer()[i], object_info_table);
+            }
+        }
+    }
+}
+
 GFXRECON_END_NAMESPACE(decode)
 GFXRECON_END_NAMESPACE(gfxrecon)
diff --git a/framework/decode/custom_vulkan_struct_handle_mappers.h b/framework/decode/custom_vulkan_struct_handle_mappers.h
@@ -39,6 +39,12 @@ void MapStructHandles(VkDescriptorType               type,
 
 void MapStructHandles(Decoded_VkWriteDescriptorSet* wrapper, const VulkanObjectInfoTable& object_info_table);
 
+void MapStructHandles(Decoded_VkAccelerationStructureGeometryKHR* wrapper,
+                      const VulkanObjectInfoTable&                object_info_table);
+
+void MapStructHandles(Decoded_VkAccelerationStructureBuildGeometryInfoKHR* wrapper,
+                      const VulkanObjectInfoTable&                         object_info_table);
+
 GFXRECON_END_NAMESPACE(decode)
 GFXRECON_END_NAMESPACE(gfxrecon)
 

diff --git a/framework/decode/vulkan_handle_mapping_util.cpp b/framework/decode/vulkan_handle_mapping_util.cpp
@@ -147,6 +147,9 @@ uint64_t MapHandle(uint64_t object, VkObjectType object_type, const VulkanObject
         case VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NV:
             return format::ToHandleId(MapHandle<IndirectCommandsLayoutNVInfo>(
                 object, object_info_table, &VulkanObjectInfoTable::GetIndirectCommandsLayoutNVInfo));
+        case VK_OBJECT_TYPE_MICROMAP_EXT:
+            return format::ToHandleId(
+                MapHandle<MicromapEXTInfo>(object, object_info_table, &VulkanObjectInfoTable::GetMicromapEXTInfo));
         case VK_OBJECT_TYPE_PRIVATE_DATA_SLOT_EXT:
             return format::ToHandleId(MapHandle<PrivateDataSlotEXTInfo>(
                 object, object_info_table, &VulkanObjectInfoTable::GetPrivateDataSlotInfo));

diff --git a/framework/encode/custom_vulkan_struct_handle_wrappers.cpp b/framework/encode/custom_vulkan_struct_handle_wrappers.cpp
@@ -106,6 +106,48 @@ void UnwrapStructHandles(VkWriteDescriptorSet* value, HandleUnwrapMemory* unwrap
     }
 }
 
+void UnwrapStructHandles(VkAccelerationStructureGeometryKHR* value, HandleUnwrapMemory* unwrap_memory)
+{
+    if (value != nullptr)
+    {
+        switch (value->geometryType)
+        {
+            case VK_GEOMETRY_TYPE_TRIANGLES_KHR:
+                UnwrapStructHandles(&value->geometry.triangles, unwrap_memory);
+                break;
+            case VK_GEOMETRY_TYPE_AABBS_KHR:
+                // No handle there so the unwrap func doesn't exist
+                break;
+            case VK_GEOMETRY_TYPE_INSTANCES_KHR:
+                // No handle there so the unwrap func doesn't exist
+                break;
+            default:
+                GFXRECON_LOG_WARNING("Attempting to unwrap unknown acceleration structure geometry type");
+                break;
+        }
+    }
+}
+
+void UnwrapStructHandles(VkAccelerationStructureBuildGeometryInfoKHR* value, HandleUnwrapMemory* unwrap_memory)
+{
+    if (value != nullptr)
+    {
+        value->pGeometries = UnwrapStructArrayHandles(value->pGeometries, value->geometryCount, unwrap_memory);
+
+        if ((value->ppGeometries != nullptr) && (value->geometryCount > 0))
+        {
+            auto unwrapped_structs = MakeUnwrapStructs(value->ppGeometries, value->geometryCount, unwrap_memory);
+
+            for (size_t i = 0; i < value->geometryCount; ++i)
+            {
+                unwrapped_structs[i] = UnwrapStructArrayHandles(value->ppGeometries[i], 1, unwrap_memory);
+            }
+
+            value->ppGeometries = unwrapped_structs;
+        }
+    }
+}
+
 GFXRECON_END_NAMESPACE(vulkan_wrappers)
 GFXRECON_END_NAMESPACE(encode)
 GFXRECON_END_NAMESPACE(gfxrecon)
diff --git a/framework/encode/custom_vulkan_struct_handle_wrappers.h b/framework/encode/custom_vulkan_struct_handle_wrappers.h
@@ -38,6 +38,10 @@ void UnwrapStructHandles(VkDescriptorType type, VkDescriptorImageInfo* value, Ha
 
 void UnwrapStructHandles(VkWriteDescriptorSet* value, HandleUnwrapMemory* unwrap_memory);
 
+void UnwrapStructHandles(VkAccelerationStructureGeometryKHR* value, HandleUnwrapMemory* unwrap_memory);
+
+void UnwrapStructHandles(VkAccelerationStructureBuildGeometryInfoKHR* value, HandleUnwrapMemory* unwrap_memory);
+
 GFXRECON_END_NAMESPACE(vulkan_wrappers)
 GFXRECON_END_NAMESPACE(encode)
 GFXRECON_END_NAMESPACE(gfxrecon)

diff --git a/framework/encode/vulkan_handle_wrapper_util.cpp b/framework/encode/vulkan_handle_wrapper_util.cpp
@@ -112,6 +112,8 @@ uint64_t GetWrappedId(uint64_t object, VkObjectType object_type)
         case VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NV:
             return GetWrappedId<IndirectCommandsLayoutNVWrapper>(
                 format::FromHandleId<VkIndirectCommandsLayoutNV>(object));
+        case VK_OBJECT_TYPE_MICROMAP_EXT:
+            return GetWrappedId<MicromapEXTWrapper>(format::FromHandleId<VkMicromapEXT>(object));
         case VK_OBJECT_TYPE_PRIVATE_DATA_SLOT_EXT:
             return GetWrappedId<PrivateDataSlotEXTWrapper>(format::FromHandleId<VkPrivateDataSlotEXT>(object));
         case VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV:

diff --git a/framework/generated/base_generators/base_struct_handle_mappers_body_generator.py b/framework/generated/base_generators/base_struct_handle_mappers_body_generator.py
@@ -110,7 +110,7 @@ def generate_feature(self):
                 (struct in self.structs_with_handles)
                 or (struct in self.GENERIC_HANDLE_STRUCTS)
                 or (struct in self.structs_with_map_data)
-            ):
+            ) and (struct not in self.STRUCT_MAPPERS_BLACKLIST):
                 handle_members = list()
                 generic_handle_members = dict()
 

diff --git a/framework/generated/base_generators/base_struct_handle_mappers_header_generator.py b/framework/generated/base_generators/base_struct_handle_mappers_header_generator.py
@@ -159,7 +159,7 @@ def generate_feature(self):
                 (struct in self.structs_with_handles)
                 or (struct in self.GENERIC_HANDLE_STRUCTS)
                 or (struct in self.structs_with_map_data)
-            ):
+            ) and (struct not in self.STRUCT_MAPPERS_BLACKLIST):
                 body = '\n'
                 body += 'void MapStruct{}(Decoded_{}* wrapper, const {}ObjectInfoTable& object_info_table{});'.format(
                     map_type, struct, platform_type, map_table

diff --git a/framework/generated/generated_vulkan_struct_handle_mappers.cpp b/framework/generated/generated_vulkan_struct_handle_mappers.cpp
@@ -1823,18 +1823,6 @@ void MapStructHandles(Decoded_VkAccelerationStructureGeometryTrianglesDataKHR* w
     }
 }
 
-void MapStructHandles(Decoded_VkAccelerationStructureBuildGeometryInfoKHR* wrapper, const VulkanObjectInfoTable& object_info_table)
-{
-    if ((wrapper != nullptr) && (wrapper->decoded_value != nullptr))
-    {
-        VkAccelerationStructureBuildGeometryInfoKHR* value = wrapper->decoded_value;
-
-        value->srcAccelerationStructure = handle_mapping::MapHandle<AccelerationStructureKHRInfo>(wrapper->srcAccelerationStructure, object_info_table, &VulkanObjectInfoTable::GetAccelerationStructureKHRInfo);
-
-        value->dstAccelerationStructure = handle_mapping::MapHandle<AccelerationStructureKHRInfo>(wrapper->dstAccelerationStructure, object_info_table, &VulkanObjectInfoTable::GetAccelerationStructureKHRInfo);
-    }
-}
-
 void MapStructHandles(Decoded_VkAccelerationStructureCreateInfoKHR* wrapper, const VulkanObjectInfoTable& object_info_table)
 {
     if ((wrapper != nullptr) && (wrapper->decoded_value != nullptr))

diff --git a/framework/generated/generated_vulkan_struct_handle_mappers.h b/framework/generated/generated_vulkan_struct_handle_mappers.h
@@ -367,8 +367,6 @@ void MapStructHandles(Decoded_VkLatencySleepInfoNV* wrapper, const VulkanObjectI
 
 void MapStructHandles(Decoded_VkAccelerationStructureGeometryTrianglesDataKHR* wrapper, const VulkanObjectInfoTable& object_info_table);
 
-void MapStructHandles(Decoded_VkAccelerationStructureBuildGeometryInfoKHR* wrapper, const VulkanObjectInfoTable& object_info_table);
-
 void MapStructHandles(Decoded_VkAccelerationStructureCreateInfoKHR* wrapper, const VulkanObjectInfoTable& object_info_table);
 
 void MapStructHandles(Decoded_VkWriteDescriptorSetAccelerationStructureKHR* wrapper, const VulkanObjectInfoTable& object_info_table);

diff --git a/framework/generated/generated_vulkan_struct_handle_wrappers.cpp b/framework/generated/generated_vulkan_struct_handle_wrappers.cpp
@@ -1283,13 +1283,6 @@ void UnwrapStructHandles(VkAccelerationStructureGeometryTrianglesDataKHR* value,
     }
 }
 
-void UnwrapStructHandles(VkAccelerationStructureBuildGeometryInfoKHR* value, HandleUnwrapMemory* unwrap_memory)
-{
-    if (value != nullptr)
-    {
-    }
-}
-
 void UnwrapStructHandles(VkAccelerationStructureCreateInfoKHR* value, HandleUnwrapMemory* unwrap_memory)
 {
     if (value != nullptr)

diff --git a/framework/generated/generated_vulkan_struct_handle_wrappers.h b/framework/generated/generated_vulkan_struct_handle_wrappers.h
@@ -367,8 +367,6 @@ void UnwrapStructHandles(VkLatencySleepInfoNV* value, HandleUnwrapMemory* unwrap
 
 void UnwrapStructHandles(VkAccelerationStructureGeometryTrianglesDataKHR* value, HandleUnwrapMemory* unwrap_memory);
 
-void UnwrapStructHandles(VkAccelerationStructureBuildGeometryInfoKHR* value, HandleUnwrapMemory* unwrap_memory);
-
 void UnwrapStructHandles(VkAccelerationStructureCreateInfoKHR* value, HandleUnwrapMemory* unwrap_memory);
 
 void UnwrapStructHandles(VkWriteDescriptorSetAccelerationStructureKHR* value, HandleUnwrapMemory* unwrap_memory);

diff --git a/framework/generated/vulkan_generators/base_generator.py b/framework/generated/vulkan_generators/base_generator.py
@@ -306,6 +306,9 @@ def __init__(
         # These structures should not be processed by the code generator.  They require special implementations.
         self.STRUCT_BLACKLIST = []
 
+        # These structures should be ignored for handle mapping/unwrapping. They require special implementations.
+        self.STRUCT_MAPPERS_BLACKLIST = ['VkAccelerationStructureBuildGeometryInfoKHR']
+
         # Platform specific basic types that have been defined extarnally to the Vulkan header.
         self.PLATFORM_TYPES = {}
 

diff --git a/framework/generated/vulkan_generators/vulkan_struct_handle_wrappers_body_generator.py b/framework/generated/vulkan_generators/vulkan_struct_handle_wrappers_body_generator.py
@@ -242,7 +242,7 @@ def generate_feature(self):
             if (
                 (struct in self.structs_with_handles)
                 or (struct in self.GENERIC_HANDLE_STRUCTS)
-            ):
+            ) and (struct not in self.STRUCT_MAPPERS_BLACKLIST):
                 handle_members = dict()
                 generic_handle_members = dict()
 

diff --git a/framework/generated/vulkan_generators/vulkan_struct_handle_wrappers_header_generator.py b/framework/generated/vulkan_generators/vulkan_struct_handle_wrappers_header_generator.py
@@ -257,7 +257,7 @@ def generate_feature(self):
             if (
                 (struct in self.structs_with_handles)
                 or (struct in self.GENERIC_HANDLE_STRUCTS)
-            ):
+            ) and (struct not in self.STRUCT_MAPPERS_BLACKLIST):
                 body = '\n'
                 body += 'void UnwrapStructHandles({}* value, HandleUnwrapMemory* unwrap_memory);'.format(
                     struct