From 6a6da54ccb4b401e3a6675b15001854e10d94dbd Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 30 Nov 2015 21:18:12 -0800 Subject: [PATCH] vk/0.210.0: Rename parameters to memory binding/mapping functions --- include/vulkan/vulkan.h | 32 ++++++++++++++++---------------- src/vulkan/anv_device.c | 34 +++++++++++++++++----------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index 860df312735..92eaaaa0b9e 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -2165,13 +2165,13 @@ typedef VkResult (VKAPI_PTR *PFN_vkQueueWaitIdle)(VkQueue queue); typedef VkResult (VKAPI_PTR *PFN_vkDeviceWaitIdle)(VkDevice device); typedef VkResult (VKAPI_PTR *PFN_vkAllocMemory)(VkDevice device, const VkMemoryAllocInfo* pAllocInfo, VkDeviceMemory* pMem); typedef void (VKAPI_PTR *PFN_vkFreeMemory)(VkDevice device, VkDeviceMemory mem); -typedef VkResult (VKAPI_PTR *PFN_vkMapMemory)(VkDevice device, VkDeviceMemory mem, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void** ppData); -typedef void (VKAPI_PTR *PFN_vkUnmapMemory)(VkDevice device, VkDeviceMemory mem); -typedef VkResult (VKAPI_PTR *PFN_vkFlushMappedMemoryRanges)(VkDevice device, uint32_t memRangeCount, const VkMappedMemoryRange* pMemRanges); -typedef VkResult (VKAPI_PTR *PFN_vkInvalidateMappedMemoryRanges)(VkDevice device, uint32_t memRangeCount, const VkMappedMemoryRange* pMemRanges); +typedef VkResult (VKAPI_PTR *PFN_vkMapMemory)(VkDevice device, VkDeviceMemory memory, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void** ppData); +typedef void (VKAPI_PTR *PFN_vkUnmapMemory)(VkDevice device, VkDeviceMemory memory); +typedef VkResult (VKAPI_PTR *PFN_vkFlushMappedMemoryRanges)(VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges); +typedef VkResult (VKAPI_PTR *PFN_vkInvalidateMappedMemoryRanges)(VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges); typedef void (VKAPI_PTR *PFN_vkGetDeviceMemoryCommitment)(VkDevice device, VkDeviceMemory memory, VkDeviceSize* pCommittedMemoryInBytes); -typedef VkResult (VKAPI_PTR *PFN_vkBindBufferMemory)(VkDevice device, VkBuffer buffer, VkDeviceMemory mem, VkDeviceSize memOffset); -typedef VkResult (VKAPI_PTR *PFN_vkBindImageMemory)(VkDevice device, VkImage image, VkDeviceMemory mem, VkDeviceSize memOffset); +typedef VkResult (VKAPI_PTR *PFN_vkBindBufferMemory)(VkDevice device, VkBuffer buffer, VkDeviceMemory memory, VkDeviceSize memoryOffset); +typedef VkResult (VKAPI_PTR *PFN_vkBindImageMemory)(VkDevice device, VkImage image, VkDeviceMemory memory, VkDeviceSize memoryOffset); typedef void (VKAPI_PTR *PFN_vkGetBufferMemoryRequirements)(VkDevice device, VkBuffer buffer, VkMemoryRequirements* pMemoryRequirements); typedef void (VKAPI_PTR *PFN_vkGetImageMemoryRequirements)(VkDevice device, VkImage image, VkMemoryRequirements* pMemoryRequirements); typedef void (VKAPI_PTR *PFN_vkGetImageSparseMemoryRequirements)(VkDevice device, VkImage image, uint32_t* pNumRequirements, VkSparseImageMemoryRequirements* pSparseMemoryRequirements); @@ -2394,7 +2394,7 @@ VKAPI_ATTR void VKAPI_CALL vkFreeMemory( VKAPI_ATTR VkResult VKAPI_CALL vkMapMemory( VkDevice device, - VkDeviceMemory mem, + VkDeviceMemory memory, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, @@ -2402,17 +2402,17 @@ VKAPI_ATTR VkResult VKAPI_CALL vkMapMemory( VKAPI_ATTR void VKAPI_CALL vkUnmapMemory( VkDevice device, - VkDeviceMemory mem); + VkDeviceMemory memory); VKAPI_ATTR VkResult VKAPI_CALL vkFlushMappedMemoryRanges( VkDevice device, - uint32_t memRangeCount, - const VkMappedMemoryRange* pMemRanges); + uint32_t memoryRangeCount, + const VkMappedMemoryRange* pMemoryRanges); VKAPI_ATTR VkResult VKAPI_CALL vkInvalidateMappedMemoryRanges( VkDevice device, - uint32_t memRangeCount, - const VkMappedMemoryRange* pMemRanges); + uint32_t memoryRangeCount, + const VkMappedMemoryRange* pMemoryRanges); VKAPI_ATTR void VKAPI_CALL vkGetDeviceMemoryCommitment( VkDevice device, @@ -2422,14 +2422,14 @@ VKAPI_ATTR void VKAPI_CALL vkGetDeviceMemoryCommitment( VKAPI_ATTR VkResult VKAPI_CALL vkBindBufferMemory( VkDevice device, VkBuffer buffer, - VkDeviceMemory mem, - VkDeviceSize memOffset); + VkDeviceMemory memory, + VkDeviceSize memoryOffset); VKAPI_ATTR VkResult VKAPI_CALL vkBindImageMemory( VkDevice device, VkImage image, - VkDeviceMemory mem, - VkDeviceSize memOffset); + VkDeviceMemory memory, + VkDeviceSize memoryOffset); VKAPI_ATTR void VKAPI_CALL vkGetBufferMemoryRequirements( VkDevice device, diff --git a/src/vulkan/anv_device.c b/src/vulkan/anv_device.c index e0a6ed62ebd..c3dcd9f56cc 100644 --- a/src/vulkan/anv_device.c +++ b/src/vulkan/anv_device.c @@ -999,14 +999,14 @@ void anv_FreeMemory( VkResult anv_MapMemory( VkDevice _device, - VkDeviceMemory _mem, + VkDeviceMemory _memory, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void** ppData) { ANV_FROM_HANDLE(anv_device, device, _device); - ANV_FROM_HANDLE(anv_device_memory, mem, _mem); + ANV_FROM_HANDLE(anv_device_memory, mem, _memory); /* FIXME: Is this supposed to be thread safe? Since vkUnmapMemory() only * takes a VkDeviceMemory pointer, it seems like only one map of the memory @@ -1024,17 +1024,17 @@ VkResult anv_MapMemory( void anv_UnmapMemory( VkDevice _device, - VkDeviceMemory _mem) + VkDeviceMemory _memory) { - ANV_FROM_HANDLE(anv_device_memory, mem, _mem); + ANV_FROM_HANDLE(anv_device_memory, mem, _memory); anv_gem_munmap(mem->map, mem->map_size); } VkResult anv_FlushMappedMemoryRanges( VkDevice device, - uint32_t memRangeCount, - const VkMappedMemoryRange* pMemRanges) + uint32_t memoryRangeCount, + const VkMappedMemoryRange* pMemoryRanges) { /* clflush here for !llc platforms */ @@ -1043,10 +1043,10 @@ VkResult anv_FlushMappedMemoryRanges( VkResult anv_InvalidateMappedMemoryRanges( VkDevice device, - uint32_t memRangeCount, - const VkMappedMemoryRange* pMemRanges) + uint32_t memoryRangeCount, + const VkMappedMemoryRange* pMemoryRanges) { - return anv_FlushMappedMemoryRanges(device, memRangeCount, pMemRanges); + return anv_FlushMappedMemoryRanges(device, memoryRangeCount, pMemoryRanges); } void anv_GetBufferMemoryRequirements( @@ -1113,14 +1113,14 @@ void anv_GetDeviceMemoryCommitment( VkResult anv_BindBufferMemory( VkDevice device, VkBuffer _buffer, - VkDeviceMemory _mem, - VkDeviceSize memOffset) + VkDeviceMemory _memory, + VkDeviceSize memoryOffset) { - ANV_FROM_HANDLE(anv_device_memory, mem, _mem); + ANV_FROM_HANDLE(anv_device_memory, mem, _memory); ANV_FROM_HANDLE(anv_buffer, buffer, _buffer); buffer->bo = &mem->bo; - buffer->offset = memOffset; + buffer->offset = memoryOffset; return VK_SUCCESS; } @@ -1128,14 +1128,14 @@ VkResult anv_BindBufferMemory( VkResult anv_BindImageMemory( VkDevice device, VkImage _image, - VkDeviceMemory _mem, - VkDeviceSize memOffset) + VkDeviceMemory _memory, + VkDeviceSize memoryOffset) { - ANV_FROM_HANDLE(anv_device_memory, mem, _mem); + ANV_FROM_HANDLE(anv_device_memory, mem, _memory); ANV_FROM_HANDLE(anv_image, image, _image); image->bo = &mem->bo; - image->offset = memOffset; + image->offset = memoryOffset; return VK_SUCCESS; } -- 2.30.2