Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MapPNextStructHandles should traverse chain till end #1994

Merged
merged 1 commit into from
Jan 28, 2025
Merged

MapPNextStructHandles should traverse chain till end #1994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion framework/decode/custom_vulkan_struct_handle_mappers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ void MapStructHandles(Decoded_VkWriteDescriptorSet* wrapper, const CommonObjectI

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_mapper);
MapPNextStructHandles(wrapper->pNext, object_mapper);
}

value->dstSet = handle_mapping::MapHandle<VulkanDescriptorSetInfo>(
Expand Down
68 changes: 35 additions & 33 deletions framework/generated/generated_vulkan_struct_handle_mappers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ void MapStructHandles(Decoded_VkDeviceCreateInfo* wrapper, const CommonObjectInf
{
if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}
}
}
Expand All @@ -79,7 +79,7 @@ void MapStructHandles(Decoded_VkSubmitInfo* wrapper, const CommonObjectInfoTable

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

value->pWaitSemaphores = handle_mapping::MapHandleArray<VulkanSemaphoreInfo>(&wrapper->pWaitSemaphores, object_info_table, &CommonObjectInfoTable::GetVkSemaphoreInfo);
Expand All @@ -106,7 +106,7 @@ void MapStructHandles(Decoded_VkMemoryAllocateInfo* wrapper, const CommonObjectI
{
if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}
}
}
Expand Down Expand Up @@ -175,7 +175,7 @@ void MapStructHandles(Decoded_VkBindSparseInfo* wrapper, const CommonObjectInfoT

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

value->pWaitSemaphores = handle_mapping::MapHandleArray<VulkanSemaphoreInfo>(&wrapper->pWaitSemaphores, object_info_table, &CommonObjectInfoTable::GetVkSemaphoreInfo);
Expand Down Expand Up @@ -206,7 +206,7 @@ void MapStructHandles(Decoded_VkImageCreateInfo* wrapper, const CommonObjectInfo
{
if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}
}
}
Expand All @@ -219,7 +219,7 @@ void MapStructHandles(Decoded_VkImageViewCreateInfo* wrapper, const CommonObject

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

value->image = handle_mapping::MapHandle<VulkanImageInfo>(wrapper->image, object_info_table, &CommonObjectInfoTable::GetVkImageInfo);
Expand All @@ -232,7 +232,7 @@ void MapStructHandles(Decoded_VkShaderModuleCreateInfo* wrapper, const CommonObj
{
if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}
}
}
Expand All @@ -245,7 +245,7 @@ void MapStructHandles(Decoded_VkPipelineShaderStageCreateInfo* wrapper, const Co

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

value->module = handle_mapping::MapHandle<VulkanShaderModuleInfo>(wrapper->module, object_info_table, &CommonObjectInfoTable::GetVkShaderModuleInfo);
Expand All @@ -260,7 +260,7 @@ void MapStructHandles(Decoded_VkComputePipelineCreateInfo* wrapper, const Common

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

MapStructHandles(wrapper->stage, object_info_table);
Expand All @@ -279,7 +279,7 @@ void MapStructHandles(Decoded_VkGraphicsPipelineCreateInfo* wrapper, const Commo

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

MapStructArrayHandles<Decoded_VkPipelineShaderStageCreateInfo>(wrapper->pStages->GetMetaStructPointer(), wrapper->pStages->GetLength(), object_info_table);
Expand Down Expand Up @@ -308,7 +308,7 @@ void MapStructHandles(Decoded_VkSamplerCreateInfo* wrapper, const CommonObjectIn
{
if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}
}
}
Expand Down Expand Up @@ -415,7 +415,7 @@ void MapStructHandles(Decoded_VkRenderPassBeginInfo* wrapper, const CommonObject

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

value->renderPass = handle_mapping::MapHandle<VulkanRenderPassInfo>(wrapper->renderPass, object_info_table, &CommonObjectInfoTable::GetVkRenderPassInfo);
Expand Down Expand Up @@ -444,7 +444,7 @@ void MapStructHandles(Decoded_VkBindImageMemoryInfo* wrapper, const CommonObject

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

value->image = handle_mapping::MapHandle<VulkanImageInfo>(wrapper->image, object_info_table, &CommonObjectInfoTable::GetVkImageInfo);
Expand Down Expand Up @@ -633,7 +633,7 @@ void MapStructHandles(Decoded_VkCommandBufferSubmitInfo* wrapper, const CommonOb

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

value->commandBuffer = handle_mapping::MapHandle<VulkanCommandBufferInfo>(wrapper->commandBuffer, object_info_table, &CommonObjectInfoTable::GetVkCommandBufferInfo);
Expand All @@ -646,7 +646,7 @@ void MapStructHandles(Decoded_VkSubmitInfo2* wrapper, const CommonObjectInfoTabl
{
if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

MapStructArrayHandles<Decoded_VkSemaphoreSubmitInfo>(wrapper->pWaitSemaphoreInfos->GetMetaStructPointer(), wrapper->pWaitSemaphoreInfos->GetLength(), object_info_table);
Expand Down Expand Up @@ -747,7 +747,7 @@ void MapStructHandles(Decoded_VkRenderingInfo* wrapper, const CommonObjectInfoTa
{
if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

MapStructArrayHandles<Decoded_VkRenderingAttachmentInfo>(wrapper->pColorAttachments->GetMetaStructPointer(), wrapper->pColorAttachments->GetLength(), object_info_table);
Expand Down Expand Up @@ -802,7 +802,7 @@ void MapStructHandles(Decoded_VkBindDescriptorSetsInfo* wrapper, const CommonObj

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

value->layout = handle_mapping::MapHandle<VulkanPipelineLayoutInfo>(wrapper->layout, object_info_table, &CommonObjectInfoTable::GetVkPipelineLayoutInfo);
Expand All @@ -819,7 +819,7 @@ void MapStructHandles(Decoded_VkPushConstantsInfo* wrapper, const CommonObjectIn

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

value->layout = handle_mapping::MapHandle<VulkanPipelineLayoutInfo>(wrapper->layout, object_info_table, &CommonObjectInfoTable::GetVkPipelineLayoutInfo);
Expand All @@ -834,7 +834,7 @@ void MapStructHandles(Decoded_VkPushDescriptorSetInfo* wrapper, const CommonObje

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

value->layout = handle_mapping::MapHandle<VulkanPipelineLayoutInfo>(wrapper->layout, object_info_table, &CommonObjectInfoTable::GetVkPipelineLayoutInfo);
Expand Down Expand Up @@ -905,7 +905,7 @@ void MapStructHandles(Decoded_VkPresentInfoKHR* wrapper, const CommonObjectInfoT

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

value->pWaitSemaphores = handle_mapping::MapHandleArray<VulkanSemaphoreInfo>(&wrapper->pWaitSemaphores, object_info_table, &CommonObjectInfoTable::GetVkSemaphoreInfo);
Expand Down Expand Up @@ -1050,7 +1050,7 @@ void MapStructHandles(Decoded_VkVideoDecodeInfoKHR* wrapper, const CommonObjectI

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

value->srcBuffer = handle_mapping::MapHandle<VulkanBufferInfo>(wrapper->srcBuffer, object_info_table, &CommonObjectInfoTable::GetVkBufferInfo);
Expand Down Expand Up @@ -1267,7 +1267,7 @@ void MapStructHandles(Decoded_VkVideoEncodeInfoKHR* wrapper, const CommonObjectI

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

value->dstBuffer = handle_mapping::MapHandle<VulkanBufferInfo>(wrapper->dstBuffer, object_info_table, &CommonObjectInfoTable::GetVkBufferInfo);
Expand Down Expand Up @@ -1358,7 +1358,7 @@ void MapStructHandles(Decoded_VkSetDescriptorBufferOffsetsInfoEXT* wrapper, cons

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

value->layout = handle_mapping::MapHandle<VulkanPipelineLayoutInfo>(wrapper->layout, object_info_table, &CommonObjectInfoTable::GetVkPipelineLayoutInfo);
Expand All @@ -1373,7 +1373,7 @@ void MapStructHandles(Decoded_VkBindDescriptorBufferEmbeddedSamplersInfoEXT* wra

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

value->layout = handle_mapping::MapHandle<VulkanPipelineLayoutInfo>(wrapper->layout, object_info_table, &CommonObjectInfoTable::GetVkPipelineLayoutInfo);
Expand Down Expand Up @@ -1890,7 +1890,7 @@ void MapStructHandles(Decoded_VkGeneratedCommandsMemoryRequirementsInfoEXT* wrap

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

value->indirectExecutionSet = handle_mapping::MapHandle<VulkanIndirectExecutionSetEXTInfo>(wrapper->indirectExecutionSet, object_info_table, &CommonObjectInfoTable::GetVkIndirectExecutionSetEXTInfo);
Expand Down Expand Up @@ -1939,7 +1939,7 @@ void MapStructHandles(Decoded_VkGeneratedCommandsInfoEXT* wrapper, const CommonO

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

value->indirectExecutionSet = handle_mapping::MapHandle<VulkanIndirectExecutionSetEXTInfo>(wrapper->indirectExecutionSet, object_info_table, &CommonObjectInfoTable::GetVkIndirectExecutionSetEXTInfo);
Expand All @@ -1966,7 +1966,7 @@ void MapStructHandles(Decoded_VkIndirectCommandsLayoutCreateInfoEXT* wrapper, co

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

value->pipelineLayout = handle_mapping::MapHandle<VulkanPipelineLayoutInfo>(wrapper->pipelineLayout, object_info_table, &CommonObjectInfoTable::GetVkPipelineLayoutInfo);
Expand Down Expand Up @@ -2009,7 +2009,7 @@ void MapStructHandles(Decoded_VkAccelerationStructureGeometryTrianglesDataKHR* w
{
if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}
}
}
Expand Down Expand Up @@ -2084,7 +2084,7 @@ void MapStructHandles(Decoded_VkRayTracingPipelineCreateInfoKHR* wrapper, const

if (wrapper->pNext)
{
MapPNextStructHandles(wrapper->pNext->GetPointer(), wrapper->pNext->GetMetaStructPointer(), object_info_table);
MapPNextStructHandles(wrapper->pNext, object_info_table);
}

MapStructArrayHandles<Decoded_VkPipelineShaderStageCreateInfo>(wrapper->pStages->GetMetaStructPointer(), wrapper->pStages->GetLength(), object_info_table);
Expand All @@ -2097,13 +2097,14 @@ void MapStructHandles(Decoded_VkRayTracingPipelineCreateInfoKHR* wrapper, const
}
}

void MapPNextStructHandles(const void* value, void* wrapper, const CommonObjectInfoTable& object_info_table)
void MapPNextStructHandles(PNextNode* pnext, const CommonObjectInfoTable& object_info_table)
{
if ((value != nullptr) && (wrapper != nullptr))
while (pnext)
{
const VkBaseInStructure* base = reinterpret_cast<const VkBaseInStructure*>(value);
void *wrapper = pnext->GetMetaStructPointer();
const auto* header = reinterpret_cast<const MetaStructHeader*>(pnext->GetMetaStructPointer());

switch (base->sType)
switch (*header->sType)
{
default:
// TODO: Report or raise fatal error for unrecognized sType?
Expand Down Expand Up @@ -2193,6 +2194,7 @@ void MapPNextStructHandles(const void* value, void* wrapper, const CommonObjectI
MapStructHandles(reinterpret_cast<Decoded_VkWriteDescriptorSetAccelerationStructureNV*>(wrapper), object_info_table);
break;
}
pnext = header->pNext;
}
}

Expand Down
2 changes: 1 addition & 1 deletion framework/generated/generated_vulkan_struct_handle_mappers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ void MapStructHandles(Decoded_VkCopyAccelerationStructureInfoKHR* wrapper, const

void MapStructHandles(Decoded_VkRayTracingPipelineCreateInfoKHR* wrapper, const CommonObjectInfoTable& object_info_table);

void MapPNextStructHandles(const void* value, void* wrapper, const CommonObjectInfoTable& object_info_table);
void MapPNextStructHandles(PNextNode* value, const CommonObjectInfoTable& object_info_table);

void AddStructHandles(format::HandleId parent_id, const Decoded_VkPhysicalDeviceGroupProperties* id_wrapper, const VkPhysicalDeviceGroupProperties* handle_struct, CommonObjectInfoTable* object_info_table);

Expand Down
15 changes: 7 additions & 8 deletions framework/generated/khronos_generators/khronos_base_struct_handle_mappers_body_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,21 +91,19 @@ def generate_handle_mappers(self):
extended_struct_func_name = self.get_extended_struct_func_prefix()
self.newline()
write(
'void Map{}StructHandles(const void* value, void* wrapper, const CommonObjectInfoTable& object_info_table)'.format(extended_struct_func_name),
'void Map{}StructHandles(PNextNode* pnext, const CommonObjectInfoTable& object_info_table)'.format(extended_struct_func_name),
file=self.outFile
)
write('{', file=self.outFile)
write(
' if ((value != nullptr) && (wrapper != nullptr))',
' while (pnext)',
file=self.outFile
)
write(' {', file=self.outFile)
write(
' const {struct}* base = reinterpret_cast<const {struct}*>(value);'.format(struct=self.get_base_input_structure_name()),
file=self.outFile
)
write(' void *wrapper = pnext->GetMetaStructPointer();', file=self.outFile)
write(' const auto* header = reinterpret_cast<const MetaStructHeader*>(pnext->GetMetaStructPointer());', file=self.outFile)
write('', file=self.outFile)
write(' switch (base->{})'.format(self.get_struct_type_var_name()), file=self.outFile)
write(' switch (*header->{})'.format(self.get_struct_type_var_name()), file=self.outFile)
write(' {', file=self.outFile)
write(' default:', file=self.outFile)
write(
Expand Down Expand Up @@ -134,6 +132,7 @@ def generate_handle_mappers(self):
write(' break;', file=self.outFile)

write(' }', file=self.outFile)
write(' pnext = header->pNext;', file=self.outFile)
write(' }', file=self.outFile)
write('}', file=self.outFile)

Expand Down Expand Up @@ -190,7 +189,7 @@ def make_struct_handle_mappings(
func_id = self.get_extended_struct_func_prefix()
body += f' if (wrapper->{member.name})\n'
body += ' {\n'
body += f' Map{func_id}StructHandles(wrapper->{member.name}->GetPointer(), wrapper->{member.name}->GetMetaStructPointer(), object_info_table);\n'
body += f' Map{func_id}StructHandles(wrapper->{member.name}, object_info_table);\n'
body += ' }\n'
elif map_func:
if member.is_array:
Expand Down
2 changes: 1 addition & 1 deletion ...ework/generated/khronos_generators/khronos_base_struct_handle_mappers_header_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def endFile(self):

self.newline()
write(
'void Map{}StructHandles(const void* value, void* wrapper, const CommonObjectInfoTable& object_info_table);'.format(extended_struct_func_name),
'void Map{}StructHandles(PNextNode* value, const CommonObjectInfoTable& object_info_table);'.format(extended_struct_func_name),
file=self.outFile
)
self.newline()
Expand Down
Loading