status-im
/
Vulkan-Docs
mirror of https://github.com/status-im/Vulkan-Docs.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix autovalidity for output Flags pointers 

Previously
(`vkGetDeviceGroupSurfacePresentModesKHX::pModes` and
`vkGetDeviceGroupPeerMemoryFeaturesKHX::pPeerMemoryFeatures`)
required output flags pointer to be valid + non-0
This commit is contained in:
Petr Kraus 2017-10-11 21:06:02 +02:00
parent d2d907e4f3
commit 10720dd0b5
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/spec/validitygenerator.py
View File

@ -438,16 +438,17 @@ class ValidityOutputGenerator(OutputGenerator):
if asciidoc != '': if asciidoc != '':
asciidoc += '\n' asciidoc += '\n'
# Add additional line for non-optional bitmasks # Add additional line for non-optional bitmasks
if self.getTypeCategory(paramtype.text) == 'bitmask': if self.getTypeCategory(paramtype.text) == 'bitmask':
if param.attrib.get('optional') is None: isMandatory = param.attrib.get('optional') is None #TODO does not really handle if someone tries something like optional="true,false"
asciidoc += self.makeAnchor(blockname, paramname.text, 'requiredbitmask') if isMandatory:
if self.paramIsArray(param): asciidoc += self.makeAnchor(blockname, paramname.text, 'requiredbitmask')
asciidoc += 'Each element of ' if self.paramIsArray(param):
asciidoc += 'pname:' asciidoc += 'Each element of '
asciidoc += paramname.text asciidoc += 'pname:'
asciidoc += ' must: not be `0`' asciidoc += paramname.text
asciidoc += '\n' asciidoc += ' must: not be `0`'
asciidoc += '\n'
return asciidoc return asciidoc
@ -508,7 +509,16 @@ class ValidityOutputGenerator(OutputGenerator):
asciidoc += '\n' asciidoc += '\n'
else: else:
if self.paramIsArray(param): if self.paramIsArray(param):
asciidoc += self.makeAsciiDocLineForParameter(blockname, param, params, 'combinations of ' + self.makeEnumerationName(bitsname) + ' value') #
if param.text is not None and 'const' in param.text:
asciidoc += self.makeAsciiDocLineForParameter(blockname, param, params, 'combinations of ' + self.makeEnumerationName(bitsname) + ' value')
else:
asciidoc += self.makeAsciiDocLineForParameter(blockname, param, params, self.makeEnumerationName(paramtype.text) + ' value')
elif self.paramIsPointer(param):
if param.text is not None and 'const' in param.text:
asciidoc += self.makeAsciiDocLineForParameter(blockname, param, params, 'combination of ' + self.makeEnumerationName(bitsname) + ' values')
else:
asciidoc += self.makeAsciiDocLineForParameter(blockname, param, params, self.makeEnumerationName(paramtype.text) + ' value')
else: else:
asciidoc += self.makeAsciiDocLineForParameter(blockname, param, params, 'combination of ' + self.makeEnumerationName(bitsname) + ' values') asciidoc += self.makeAsciiDocLineForParameter(blockname, param, params, 'combination of ' + self.makeEnumerationName(bitsname) + ' values')
elif typecategory == 'handle': elif typecategory == 'handle':

4
src/spec/vk.xml
View File

@ -5151,7 +5151,7 @@ private version is maintained in the 1.0 branch of the member gitlab server.
<param><type>uint32_t</type> <name>heapIndex</name></param> <param><type>uint32_t</type> <name>heapIndex</name></param>
<param><type>uint32_t</type> <name>localDeviceIndex</name></param> <param><type>uint32_t</type> <name>localDeviceIndex</name></param>
<param><type>uint32_t</type> <name>remoteDeviceIndex</name></param> <param><type>uint32_t</type> <name>remoteDeviceIndex</name></param>
<param><type>VkPeerMemoryFeatureFlagsKHX</type>* <name>pPeerMemoryFeatures</name></param> <param optional="false,true"><type>VkPeerMemoryFeatureFlagsKHX</type>* <name>pPeerMemoryFeatures</name></param>
</command> </command>
<command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY">
<proto><type>VkResult</type> <name>vkBindBufferMemory2KHR</name></proto> <proto><type>VkResult</type> <name>vkBindBufferMemory2KHR</name></proto>
@ -5179,7 +5179,7 @@ private version is maintained in the 1.0 branch of the member gitlab server.
<proto><type>VkResult</type> <name>vkGetDeviceGroupSurfacePresentModesKHX</name></proto> <proto><type>VkResult</type> <name>vkGetDeviceGroupSurfacePresentModesKHX</name></proto>
<param><type>VkDevice</type> <name>device</name></param> <param><type>VkDevice</type> <name>device</name></param>
<param externsync="true"><type>VkSurfaceKHR</type> <name>surface</name></param> <param externsync="true"><type>VkSurfaceKHR</type> <name>surface</name></param>
<param><type>VkDeviceGroupPresentModeFlagsKHX</type>* <name>pModes</name></param> <param optional="false,true"><type>VkDeviceGroupPresentModeFlagsKHX</type>* <name>pModes</name></param>
</command> </command>
<command successcodes="VK_SUCCESS,VK_TIMEOUT,VK_NOT_READY,VK_SUBOPTIMAL_KHR" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST,VK_ERROR_OUT_OF_DATE_KHR,VK_ERROR_SURFACE_LOST_KHR"> <command successcodes="VK_SUCCESS,VK_TIMEOUT,VK_NOT_READY,VK_SUBOPTIMAL_KHR" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST,VK_ERROR_OUT_OF_DATE_KHR,VK_ERROR_SURFACE_LOST_KHR">
<proto><type>VkResult</type> <name>vkAcquireNextImage2KHX</name></proto> <proto><type>VkResult</type> <name>vkAcquireNextImage2KHX</name></proto>