mirror of
https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git
synced 2025-05-15 09:18:49 +00:00
Move vk_safe_struct to VUL
This code was being generated in both Vulkan-ValidationLayers and Vulkan-ExtensionLayer. Further uses are on the horizon so lets stop the copypasta. Also, add functions to manipulate extension lists and pNext chains, since many client layers have been doing that themselves.
This commit is contained in:
Jeremy Gebben
parent
d90f5c7eb1
commit
cdd0e00cff
26 changed files with 91119 additions and 68 deletions
|
|
@ -1,25 +1,148 @@
|
|||
#!/usr/bin/python3 -i
|
||||
#
|
||||
# Copyright 2023 The Khronos Group Inc.
|
||||
# Copyright 2023 Valve Corporation
|
||||
# Copyright 2023 LunarG, Inc.
|
||||
# Copyright 2023 RasterGrid Kft.
|
||||
# Copyright (c) 2023-2024 Valve Corporation
|
||||
# Copyright (c) 2023-2024 LunarG, Inc.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
import os
|
||||
import sys
|
||||
import json
|
||||
|
||||
# Build a set of all vuid text strings found in validusage.json
|
||||
def buildListVUID(valid_usage_file: str) -> set:
|
||||
|
||||
# Walk the JSON-derived dict and find all "vuid" key values
|
||||
def ExtractVUIDs(vuid_dict):
|
||||
if hasattr(vuid_dict, 'items'):
|
||||
for key, value in vuid_dict.items():
|
||||
if key == "vuid":
|
||||
yield value
|
||||
elif isinstance(value, dict):
|
||||
for vuid in ExtractVUIDs(value):
|
||||
yield vuid
|
||||
elif isinstance (value, list):
|
||||
for listValue in value:
|
||||
for vuid in ExtractVUIDs(listValue):
|
||||
yield vuid
|
||||
|
||||
valid_vuids = set()
|
||||
if not os.path.isfile(valid_usage_file):
|
||||
print(f'Error: Could not find, or error loading {valid_usage_file}')
|
||||
sys.exit(1)
|
||||
json_file = open(valid_usage_file, 'r', encoding='utf-8')
|
||||
vuid_dict = json.load(json_file)
|
||||
json_file.close()
|
||||
if len(vuid_dict) == 0:
|
||||
print(f'Error: Failed to load {valid_usage_file}')
|
||||
sys.exit(1)
|
||||
for json_vuid_string in ExtractVUIDs(vuid_dict):
|
||||
valid_vuids.add(json_vuid_string)
|
||||
|
||||
# List of VUs that should exists, but have a spec bug
|
||||
for vuid in [
|
||||
# https://gitlab.khronos.org/vulkan/vulkan/-/issues/3582
|
||||
"VUID-VkCopyImageToImageInfoEXT-commonparent",
|
||||
"VUID-vkUpdateDescriptorSetWithTemplate-descriptorSet-parent",
|
||||
"VUID-vkUpdateVideoSessionParametersKHR-videoSessionParameters-parent",
|
||||
"VUID-vkDestroyVideoSessionParametersKHR-videoSessionParameters-parent",
|
||||
"VUID-vkGetDescriptorSetHostMappingVALVE-descriptorSet-parent",
|
||||
]:
|
||||
valid_vuids.add(vuid)
|
||||
|
||||
return valid_vuids
|
||||
|
||||
# Will do a sanity check the VUID exists
|
||||
def getVUID(valid_vuids: set, vuid: str, quotes: bool = True) -> str:
|
||||
if vuid not in valid_vuids:
|
||||
print(f'Warning: Could not find {vuid} in validusage.json')
|
||||
vuid = vuid.replace('VUID-', 'UNASSIGNED-')
|
||||
return vuid if not quotes else f'"{vuid}"'
|
||||
|
||||
class PlatformGuardHelper():
|
||||
"""Used to elide platform guards together, so redundant #endif then #ifdefs are removed
|
||||
Note - be sure to call addGuard(None) when done to add a trailing #endif if needed
|
||||
Note - be sure to call add_guard(None) when done to add a trailing #endif if needed
|
||||
"""
|
||||
def __init__(self):
|
||||
self.currentGuard = None
|
||||
self.current_guard = None
|
||||
|
||||
def addGuard(self, guard):
|
||||
def add_guard(self, guard, extra_newline = False):
|
||||
out = []
|
||||
if self.currentGuard != guard:
|
||||
if self.currentGuard != None:
|
||||
out.append(f'#endif // {self.currentGuard}\n')
|
||||
if guard != None:
|
||||
out.append(f'#ifdef {guard}\n')
|
||||
self.currentGuard = guard
|
||||
if self.current_guard != guard and self.current_guard is not None:
|
||||
out.append(f'#endif // {self.current_guard}\n')
|
||||
if extra_newline:
|
||||
out.append('\n')
|
||||
if self.current_guard != guard and guard is not None:
|
||||
out.append(f'#ifdef {guard}\n')
|
||||
self.current_guard = guard
|
||||
return out
|
||||
|
||||
# The SPIR-V grammar json doesn't have an easy way to detect these, so have listed by hand
|
||||
# If we are missing one, its not critical, the goal of this list is to reduce the generated output size
|
||||
def IsNonVulkanSprivCapability(capability):
|
||||
return capability in [
|
||||
'Kernel',
|
||||
'Vector16',
|
||||
'Float16Buffer',
|
||||
'ImageBasic',
|
||||
'ImageReadWrite',
|
||||
'ImageMipmap',
|
||||
'DeviceEnqueue',
|
||||
'SubgroupDispatch',
|
||||
'Pipes',
|
||||
'LiteralSampler',
|
||||
'NamedBarrier',
|
||||
'PipeStorage',
|
||||
'SubgroupShuffleINTEL',
|
||||
'SubgroupShuffleINTEL',
|
||||
'SubgroupBufferBlockIOINTEL',
|
||||
'SubgroupImageBlockIOINTEL',
|
||||
'SubgroupImageMediaBlockIOINTEL',
|
||||
'RoundToInfinityINTEL',
|
||||
'FloatingPointModeINTEL',
|
||||
'IndirectReferencesINTEL',
|
||||
'AsmINTEL',
|
||||
'VectorComputeINTEL',
|
||||
'VectorAnyINTEL',
|
||||
'SubgroupAvcMotionEstimationINTEL',
|
||||
'SubgroupAvcMotionEstimationIntraINTEL',
|
||||
'SubgroupAvcMotionEstimationChromaINTEL',
|
||||
'VariableLengthArrayINTEL',
|
||||
'FunctionFloatControlINTEL',
|
||||
'FPGAMemoryAttributesINTEL',
|
||||
'FPFastMathModeINTEL',
|
||||
'ArbitraryPrecisionIntegersINTEL',
|
||||
'ArbitraryPrecisionFloatingPointINTEL',
|
||||
'UnstructuredLoopControlsINTEL',
|
||||
'FPGALoopControlsINTEL',
|
||||
'KernelAttributesINTEL',
|
||||
'FPGAKernelAttributesINTEL',
|
||||
'FPGAMemoryAccessesINTEL',
|
||||
'FPGAClusterAttributesINTEL',
|
||||
'LoopFuseINTEL',
|
||||
'FPGADSPControlINTEL',
|
||||
'MemoryAccessAliasingINTEL',
|
||||
'FPGAInvocationPipeliningAttributesINTEL',
|
||||
'FPGABufferLocationINTEL',
|
||||
'ArbitraryPrecisionFixedPointINTEL',
|
||||
'USMStorageClassesINTEL',
|
||||
'RuntimeAlignedAttributeINTEL',
|
||||
'IOPipesINTEL',
|
||||
'BlockingPipesINTEL',
|
||||
'FPGARegINTEL',
|
||||
'LongCompositesINTEL',
|
||||
'OptNoneINTEL',
|
||||
'DebugInfoModuleINTEL',
|
||||
'BFloat16ConversionINTEL',
|
||||
'SplitBarrierINTEL',
|
||||
'FPGAClusterAttributesV2INTEL',
|
||||
'FPGAKernelAttributesv2INTEL',
|
||||
'FPMaxErrorINTEL',
|
||||
'FPGALatencyControlINTEL',
|
||||
'FPGAArgumentInterfacesINTEL',
|
||||
'GlobalVariableHostAccessINTEL',
|
||||
'GlobalVariableFPGADecorationsINTEL',
|
||||
'MaskedGatherScatterINTEL',
|
||||
'CacheControlsINTEL',
|
||||
'RegisterLimitsINTEL'
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue