mirror/vk-bootstrap
1
0
Fork 0
mirror of https://github.com/charles-lunarg/vk-bootstrap.git synced 2024-11-22 07:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add exclusion list for alias in generator code

Browse Source 
Some alias types are not pure promotional types, and need to be excluded from the
code which replaces types with their alias.

This may be a stopgap solution for a larger underlying problem of not being able to
determine if an alias is promoted or not.
This commit is contained in:
Charles Giessen 2022-06-20 10:52:16 -05:00 committed by Charles Giessen
parent fc880eb598
commit f847ab8566
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
script/generate_dispatch.py
View File

@ -29,7 +29,7 @@
# User will be prompted to install if not detected # User will be prompted to install if not detected
# Command Line Arguments # Command Line Arguments
# [--auto] Don't ask for input from the command line # [--auto] Don't ask for input from the command line
# Exclusions # Exclusions
exclusions = [ exclusions = [
@ -43,6 +43,10 @@ excluded_extension_authors = [
'NVX' 'NVX'
] ]
excluded_alias_types = [
'VkPipelineInfoKHR'
]
# Check for/install xmltodict # Check for/install xmltodict
import sys import sys
import os import os
@ -288,7 +292,7 @@ for command in device_commands:
if i > 0: if i > 0:
args_names += ', ' args_names += ', '
else: else:
if arg_type in aliased_types: if arg_type in aliased_types and arg_type not in excluded_alias_types:
arg_type = aliased_types[arg_type] arg_type = aliased_types[arg_type]
args_full += arg_template.substitute(front_mods = front_mods, arg_type = arg_type, back_mods = back_mods, arg_name = arg_name, array = array) args_full += arg_template.substitute(front_mods = front_mods, arg_type = arg_type, back_mods = back_mods, arg_name = arg_name, array = array)
args_names += arg_name args_names += arg_name
@ -355,4 +359,4 @@ cmake_version_file.write(f'set(VK_BOOTSTRAP_SOURCE_HEADER_VERSION {version_tag})
cmake_version_file.write(f'set(VK_BOOTSTRAP_SOURCE_HEADER_VERSION_GIT_TAG v{version_tag})\n') cmake_version_file.write(f'set(VK_BOOTSTRAP_SOURCE_HEADER_VERSION_GIT_TAG v{version_tag})\n')
cmake_version_file.close() cmake_version_file.close()
print("Generation finished.") print("Generation finished.")

2
src/VkBootstrapDispatch.h
View File

@ -2318,7 +2318,7 @@ struct DispatchTable {
} }
#endif #endif
#if (defined(VK_KHR_pipeline_executable_properties)) #if (defined(VK_KHR_pipeline_executable_properties))
VkResult getPipelineExecutablePropertiesKHR(const VkPipelineInfoEXT* pPipelineInfo, uint32_t* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties) const noexcept { VkResult getPipelineExecutablePropertiesKHR(const VkPipelineInfoKHR* pPipelineInfo, uint32_t* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties) const noexcept {
return fp_vkGetPipelineExecutablePropertiesKHR(device, pPipelineInfo, pExecutableCount, pProperties); return fp_vkGetPipelineExecutablePropertiesKHR(device, pPipelineInfo, pExecutableCount, pProperties);
} }
#endif #endif