From 6b0caf1faf85cd610b63fae31e3eb89833c94276 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Thu, 16 Apr 2015 13:38:46 -0600 Subject: bug 13632: Convert commands to plural form part of multiple commits to implement bug #13632. bug 13632 header version 82 svn version: 30446 This patch converts: vkCmdBindVertexBuffer -> vkCmdBindVertexBuffers vkQueueAddMemReference -> vkQueueAddMemReferences vkQueueRemoveMemReference -> vkQueueRemoveMemReferences --- include/vkLayer.h | 6 +++--- include/vulkan.h | 25 ++++++++++++++----------- 2 files changed, 17 insertions(+), 14 deletions(-) (limited to 'include') diff --git a/include/vkLayer.h b/include/vkLayer.h index 813e6872..53460c73 100644 --- a/include/vkLayer.h +++ b/include/vkLayer.h @@ -39,8 +39,8 @@ typedef struct VkLayerDispatchTable_ PFN_vkEnumerateLayers EnumerateLayers; PFN_vkGetDeviceQueue GetDeviceQueue; PFN_vkQueueSubmit QueueSubmit; - PFN_vkQueueAddMemReference QueueAddMemReference; - PFN_vkQueueRemoveMemReference QueueRemoveMemReference; + PFN_vkQueueAddMemReferences QueueAddMemReferences; + PFN_vkQueueRemoveMemReferences QueueRemoveMemReferences; PFN_vkQueueWaitIdle QueueWaitIdle; PFN_vkDeviceWaitIdle DeviceWaitIdle; PFN_vkAllocMemory AllocMemory; @@ -108,7 +108,7 @@ typedef struct VkLayerDispatchTable_ PFN_vkCmdBindPipeline CmdBindPipeline; PFN_vkCmdBindDynamicStateObject CmdBindDynamicStateObject; PFN_vkCmdBindDescriptorSets CmdBindDescriptorSets; - PFN_vkCmdBindVertexBuffer CmdBindVertexBuffer; + PFN_vkCmdBindVertexBuffers CmdBindVertexBuffers; PFN_vkCmdBindIndexBuffer CmdBindIndexBuffer; PFN_vkCmdDraw CmdDraw; PFN_vkCmdDrawIndexed CmdDrawIndexed; diff --git a/include/vulkan.h b/include/vulkan.h index 77b70102..0edbfcf8 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -2210,8 +2210,8 @@ typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceExtensionInfo)(VkPhysicalGpu gpu typedef VkResult (VKAPI *PFN_vkEnumerateLayers)(VkPhysicalGpu gpu, size_t maxLayerCount, size_t maxStringSize, size_t* pOutLayerCount, char* const* pOutLayers, void* pReserved); typedef VkResult (VKAPI *PFN_vkGetDeviceQueue)(VkDevice device, uint32_t queueNodeIndex, uint32_t queueIndex, VkQueue* pQueue); typedef VkResult (VKAPI *PFN_vkQueueSubmit)(VkQueue queue, uint32_t cmdBufferCount, const VkCmdBuffer* pCmdBuffers, VkFence fence); -typedef VkResult (VKAPI *PFN_vkQueueAddMemReference)(VkQueue queue, VkGpuMemory mem); -typedef VkResult (VKAPI *PFN_vkQueueRemoveMemReference)(VkQueue queue, VkGpuMemory mem); +typedef VkResult (VKAPI *PFN_vkQueueAddMemReferences)(VkQueue queue, uint32_t count, const VkGpuMemory* pMems); +typedef VkResult (VKAPI *PFN_vkQueueRemoveMemReferences)(VkQueue queue, uint32_t count, const VkGpuMemory* pMems); typedef VkResult (VKAPI *PFN_vkQueueWaitIdle)(VkQueue queue); typedef VkResult (VKAPI *PFN_vkDeviceWaitIdle)(VkDevice device); typedef VkResult (VKAPI *PFN_vkAllocMemory)(VkDevice device, const VkMemoryAllocInfo* pAllocInfo, VkGpuMemory* pMem); @@ -2280,7 +2280,7 @@ typedef void (VKAPI *PFN_vkCmdBindPipeline)(VkCmdBuffer cmdBuffer, VkPipelin typedef void (VKAPI *PFN_vkCmdBindDynamicStateObject)(VkCmdBuffer cmdBuffer, VkStateBindPoint stateBindPoint, VkDynamicStateObject state); typedef void (VKAPI *PFN_vkCmdBindDescriptorSets)(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, VkDescriptorSetLayoutChain layoutChain, uint32_t layoutChainSlot, uint32_t count, const VkDescriptorSet* pDescriptorSets, const uint32_t* pUserData); typedef void (VKAPI *PFN_vkCmdBindIndexBuffer)(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkGpuSize offset, VkIndexType indexType); -typedef void (VKAPI *PFN_vkCmdBindVertexBuffer)(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkGpuSize offset, uint32_t binding); +typedef void (VKAPI *PFN_vkCmdBindVertexBuffers)(VkCmdBuffer cmdBuffer, uint32_t startBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkGpuSize* pOffsets); typedef void (VKAPI *PFN_vkCmdDraw)(VkCmdBuffer cmdBuffer, uint32_t firstVertex, uint32_t vertexCount, uint32_t firstInstance, uint32_t instanceCount); typedef void (VKAPI *PFN_vkCmdDrawIndexed)(VkCmdBuffer cmdBuffer, uint32_t firstIndex, uint32_t indexCount, int32_t vertexOffset, uint32_t firstInstance, uint32_t instanceCount); typedef void (VKAPI *PFN_vkCmdDrawIndirect)(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkGpuSize offset, uint32_t count, uint32_t stride); @@ -2390,13 +2390,15 @@ VkResult VKAPI vkQueueSubmit( const VkCmdBuffer* pCmdBuffers, VkFence fence); -VkResult VKAPI vkQueueAddMemReference( +VkResult VKAPI vkQueueAddMemReferences( VkQueue queue, - VkGpuMemory mem); + uint32_t count, + const VkGpuMemory* pMems); -VkResult VKAPI vkQueueRemoveMemReference( +VkResult VKAPI vkQueueRemoveMemReferences( VkQueue queue, - VkGpuMemory mem); + uint32_t count, + const VkGpuMemory* pMems); VkResult VKAPI vkQueueWaitIdle( VkQueue queue); @@ -2783,11 +2785,12 @@ void VKAPI vkCmdBindIndexBuffer( VkGpuSize offset, VkIndexType indexType); -void VKAPI vkCmdBindVertexBuffer( +void VKAPI vkCmdBindVertexBuffers( VkCmdBuffer cmdBuffer, - VkBuffer buffer, - VkGpuSize offset, - uint32_t binding); + uint32_t startBinding, + uint32_t bindingCount, + const VkBuffer* pBuffers, + const VkGpuSize* pOffsets); void VKAPI vkCmdDraw( VkCmdBuffer cmdBuffer, -- cgit v1.2.3