Change vkDebugMarker() functions to take structs not direct params

Conflicts:
	src/spec/vk.xml
This commit is contained in:
baldurk 2016-04-22 23:38:10 +02:00 committed by Jon Ashburn
parent bf57b21830
commit f6f4339f2a

View File

@ -4769,30 +4769,24 @@ maintained in the master branch of the Khronos Vulkan Github project.
<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>vkDebugMarkerSetObjectNameEXT</name></proto> <proto><type>VkResult</type> <name>vkDebugMarkerSetObjectNameEXT</name></proto>
<param><type>VkDevice</type> <name>device</name></param> <param><type>VkDevice</type> <name>device</name></param>
<param><type>VkDebugReportObjectTypeEXT</type> <name>objectType</name></param> <param externsync="pNameInfo.object"><type>VkDebugMarkerObjectNameInfoEXT</type>* <name>pNameInfo</name></param>
<param externsync="true"><type>uint64_t</type> <name>object</name></param>
<param len="null-terminated">const <type>char</type>* <name>pName</name></param>
<validity> <validity>
<usage>pname:object must: be a Vulkan object</usage> <usage>pname:pNameInfo.object must: be a Vulkan object</usage>
</validity> </validity>
</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>vkDebugMarkerSetObjectTagEXT</name></proto> <proto><type>VkResult</type> <name>vkDebugMarkerSetObjectTagEXT</name></proto>
<param><type>VkDevice</type> <name>device</name></param> <param><type>VkDevice</type> <name>device</name></param>
<param><type>VkDebugReportObjectTypeEXT</type> <name>objectType</name></param> <param externsync="pTagInfo.object"><type>VkDebugMarkerObjectTagInfoEXT</type>* <name>pTagInfo</name></param>
<param externsync="true"><type>uint64_t</type> <name>object</name></param>
<param><type>uint64_t</type> <name>tagName</name></param>
<param><type>size_t</type> <name>tagSize</name></param>
<param len="tagSize">const <type>void</type>* <name>pTag</name></param>
<validity> <validity>
<usage>pname:object must: be a Vulkan object</usage> <usage>pname:pTagInfo.object must: be a Vulkan object</usage>
<usage>pname:tagName mustnot: be `0`</usage> <usage>pname:pTagInfo.tagName mustnot: be `0`</usage>
</validity> </validity>
</command> </command>
<command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary">
<proto><type>void</type> <name>vkCmdDebugMarkerBeginEXT</name></proto> <proto><type>void</type> <name>vkCmdDebugMarkerBeginEXT</name></proto>
<param><type>VkCommandBuffer</type> <name>commandBuffer</name></param> <param><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
<param len="null-terminated">const <type>char</type>* <name>pMarker</name></param> <param><type>VkDebugMarkerMarkerInfoEXT</type>* <name>pMarkerInfo</name></param>
</command> </command>
<command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary">
<proto><type>void</type> <name>vkCmdDebugMarkerEndEXT</name></proto> <proto><type>void</type> <name>vkCmdDebugMarkerEndEXT</name></proto>
@ -4806,6 +4800,7 @@ maintained in the master branch of the Khronos Vulkan Github project.
<command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary">
<proto><type>void</type> <name>vkCmdDebugMarkerInsertEXT</name></proto> <proto><type>void</type> <name>vkCmdDebugMarkerInsertEXT</name></proto>
<param><type>VkCommandBuffer</type> <name>commandBuffer</name></param> <param><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
<param><type>VkDebugMarkerMarkerInfoEXT</type>* <name>pMarkerInfo</name></param>
</command> </command>
</commands> </commands>
@ -5276,7 +5271,7 @@ maintained in the master branch of the Khronos Vulkan Github project.
</extension> </extension>
<extension name="VK_EXT_debug_marker" number="23" author="Baldur Karlsson" contact="baldurk@baldurk.org" supported="vulkan"> <extension name="VK_EXT_debug_marker" number="23" author="Baldur Karlsson" contact="baldurk@baldurk.org" supported="vulkan">
<require> <require>
<enum value="1" name="VK_EXT_DEBUG_MARKER_SPEC_VERSION"/> <enum value="3" name="VK_EXT_DEBUG_MARKER_SPEC_VERSION"/>
<enum value="&quot;VK_EXT_debug_marker&quot;" name="VK_EXT_DEBUG_MARKER_EXTENSION_NAME"/> <enum value="&quot;VK_EXT_debug_marker&quot;" name="VK_EXT_DEBUG_MARKER_EXTENSION_NAME"/>
<enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT"/> <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT"/>
<enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_TAG_INFO_EXT"/> <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_TAG_INFO_EXT"/>