vk/vulkan.h: Remove the MemoryRange stubs and add sparse stubs

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index c0e087aae06548dd5bef881eac2bb42d8b5f1e89..35876502d2edb951cbc3ab1f45c82c9267a74c6c 100644 (file)
--- 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 0963acf9856239eadda05f80dc0909e58479685d..8e4694b1bebed06e5248d160f8325c144f4576f4 100644 (file)
--- 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)