summaryrefslogtreecommitdiffstats
path: root/include/vulkan
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2015-11-30 21:18:12 -0800
committerJason Ekstrand <jason.ekstrand@intel.com>2015-12-03 13:43:52 -0800
commit6a6da54ccb4b401e3a6675b15001854e10d94dbd (patch)
treec3f36bc2c0a460f9707b4377b146d269ffcb47af /include/vulkan
parentaadb7dce9b5dfc16878638580dc80759a45ca773 (diff)
downloadexternal_mesa3d-6a6da54ccb4b401e3a6675b15001854e10d94dbd.zip
external_mesa3d-6a6da54ccb4b401e3a6675b15001854e10d94dbd.tar.gz
external_mesa3d-6a6da54ccb4b401e3a6675b15001854e10d94dbd.tar.bz2
vk/0.210.0: Rename parameters to memory binding/mapping functions
Diffstat (limited to 'include/vulkan')
-rw-r--r--include/vulkan/vulkan.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 860df31..92eaaaa 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,