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

Merge equivalent require blocks #2406

Merged
merged 2 commits into from
Aug 16, 2024
Merged

Merge equivalent require blocks #2406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24f7cc0
Merge equivalent require blocks
Waffl3x Aug 14, 2024
6ab8041
Add utility script
Waffl3x Aug 15, 2024
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
46 changes: 46 additions & 0 deletions scripts/find_equivalent_ext_require_blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#!/usr/bin/env python3
#
# Copyright 2024 Waffl3x
# SPDX-License-Identifier: Apache-2.0

import xml.etree.ElementTree as etree
import itertools

tree = etree.parse('vk.xml')
doc = tree.getroot()

extensions = doc.find('extensions')

def check_if_children_equal(req1, req2):
if len(req1) != len(req2):
return False
for child1, child2 in zip(req1, req2):
if child1.tag != child2.tag:
return False
if child1.attrib != child2.attrib:
return False
return True
# def check_if_children_equal

for ext in extensions:
req_with_depends = []
# put all candidates into a list
for req, count in zip(ext, itertools.count()):
if 'depends' in req.attrib:
req_with_depends.append((req, count))

# compare candidates in a pairwise manner
for tup1, it2_start in zip(req_with_depends[:-1], range(1, len(req_with_depends))):
for tup2 in req_with_depends[it2_start:]:
req1, req_count1 = tup1
req2, req_count2 = tup2
all_match = check_if_children_equal(req1, req2)
if all_match:
print('Found matching require block in extension {}:'.format(ext.attrib['name']))
print('blocks {} and {} are equal'.format(req_count1, req_count2))
print('require block {} attributes: {}'.format(req_count1, req1.attrib))
print('require block {} attributes: {}'.format(req_count2, req2.attrib))
print(' block children:')
for child1, child2 in zip(req1, req2):
print(' ', req_count1, ': ', child1.attrib)
print(' ', req_count2, ': ', child2.attrib)
11 changes: 2 additions & 9 deletions xml/vk.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18125,11 +18125,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
<command name="vkCmdPushDescriptorSetKHR"/>
<type name="VkPhysicalDevicePushDescriptorPropertiesKHR"/>
</require>
<require depends="VK_VERSION_1_1">
<command name="vkCmdPushDescriptorSetWithTemplateKHR"/>
<enum value="1" extends="VkDescriptorUpdateTemplateType" name="VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR" comment="Create descriptor update template for pushed descriptor updates"/>
</require>
<require depends="VK_KHR_descriptor_update_template">
<require depends="VK_VERSION_1_1,VK_KHR_descriptor_update_template">
<command name="vkCmdPushDescriptorSetWithTemplateKHR"/>
<enum value="1" extends="VkDescriptorUpdateTemplateType" name="VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR" comment="Create descriptor update template for pushed descriptor updates"/>
</require>
Expand Down Expand Up @@ -20515,10 +20511,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
<enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SURFACE_FULL_SCREEN_EXCLUSIVE_WIN32_INFO_EXT"/>
<type name="VkSurfaceFullScreenExclusiveWin32InfoEXT"/>
</require>
<require depends="VK_KHR_device_group">
<command name="vkGetDeviceGroupSurfacePresentModes2EXT"/>
</require>
<require depends="VK_VERSION_1_1">
<require depends="VK_KHR_device_group,VK_VERSION_1_1">
<command name="vkGetDeviceGroupSurfacePresentModes2EXT"/>
</require>
</extension>
Expand Down