From: Jason Ekstrand Date: Wed, 8 Jul 2015 16:16:48 +0000 (-0700) Subject: vk/vulkan.h: Remove the MemoryRange stubs and add sparse stubs X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3c65a1ac143277382dd48015570b602965ba5954;p=mesa.git vk/vulkan.h: Remove the MemoryRange stubs and add sparse stubs --- diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index c0e087aae06..35876502d2e 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -1919,8 +1919,8 @@ typedef VkResult (VKAPI *PFN_vkInvalidateMappedMemoryRanges)(VkDevice device, ui typedef VkResult (VKAPI *PFN_vkDestroyObject)(VkDevice device, VkObjectType objType, VkObject object); typedef VkResult (VKAPI *PFN_vkBindObjectMemory)(VkDevice device, VkObjectType objType, VkObject object, VkDeviceMemory mem, VkDeviceSize memOffset); typedef VkResult (VKAPI *PFN_vkGetObjectMemoryRequirements)(VkDevice device, VkObjectType objType, VkObject object, VkMemoryRequirements* pMemoryRequirements); -typedef VkResult (VKAPI *PFN_vkQueueBindObjectMemoryRange)(VkQueue queue, VkObjectType objType, VkObject object, uint32_t allocationIdx, VkDeviceSize rangeOffset, VkDeviceSize rangeSize, VkDeviceMemory mem, VkDeviceSize memOffset); -typedef VkResult (VKAPI *PFN_vkQueueBindImageMemoryRange)(VkQueue queue, VkImage image, uint32_t allocationIdx, const VkImageMemoryBindInfo* pBindInfo, VkDeviceMemory mem, VkDeviceSize memOffset); +typedef VkResult (VKAPI *PFN_vkQueueBindSparseBufferMemory)(VkQueue queue, VkBuffer buffer, VkDeviceSize rangeOffset, VkDeviceSize rangeSize, VkDeviceMemory mem, VkDeviceSize memOffset); +typedef VkResult (VKAPI *PFN_vkQueueBindSparseImageMemory)(VkQueue queue, VkImage image, const VkImageMemoryBindInfo* pBindInfo, VkDeviceMemory mem, VkDeviceSize memOffset); typedef VkResult (VKAPI *PFN_vkCreateFence)(VkDevice device, const VkFenceCreateInfo* pCreateInfo, VkFence* pFence); typedef VkResult (VKAPI *PFN_vkResetFences)(VkDevice device, uint32_t fenceCount, const VkFence* pFences); typedef VkResult (VKAPI *PFN_vkGetFenceStatus)(VkDevice device, VkFence fence); @@ -2126,20 +2126,17 @@ VkResult VKAPI vkGetObjectMemoryRequirements( VkObject object, VkMemoryRequirements* pMemoryRequirements); -VkResult VKAPI vkQueueBindObjectMemoryRange( +VkResult VKAPI vkQueueBindSparseBufferMemory( VkQueue queue, - VkObjectType objType, - VkObject object, - uint32_t allocationIdx, + VkBuffer buffer, VkDeviceSize rangeOffset, VkDeviceSize rangeSize, VkDeviceMemory mem, VkDeviceSize memOffset); -VkResult VKAPI vkQueueBindImageMemoryRange( +VkResult VKAPI vkQueueBindSparseImageMemory( VkQueue queue, VkImage image, - uint32_t allocationIdx, const VkImageMemoryBindInfo* pBindInfo, VkDeviceMemory mem, VkDeviceSize memOffset); diff --git a/src/vulkan/device.c b/src/vulkan/device.c index 0963acf9856..8e4694b1beb 100644 --- a/src/vulkan/device.c +++ b/src/vulkan/device.c @@ -1147,11 +1147,9 @@ VkResult anv_BindObjectMemory( return VK_SUCCESS; } -VkResult anv_QueueBindObjectMemoryRange( +VkResult anv_QueueBindSparseBufferMemory( VkQueue queue, - VkObjectType objType, - VkObject object, - uint32_t allocationIdx, + VkBuffer buffer, VkDeviceSize rangeOffset, VkDeviceSize rangeSize, VkDeviceMemory mem, @@ -1160,10 +1158,9 @@ VkResult anv_QueueBindObjectMemoryRange( stub_return(VK_UNSUPPORTED); } -VkResult anv_QueueBindImageMemoryRange( +VkResult anv_QueueBindSparseImageMemory( VkQueue queue, VkImage image, - uint32_t allocationIdx, const VkImageMemoryBindInfo* pBindInfo, VkDeviceMemory mem, VkDeviceSize memOffset)