aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorChia-I Wu <olv@lunarg.com>2015-10-31 00:31:16 +0800
committerCourtney Goeltzenleuchter <courtney@LunarG.com>2015-11-03 15:19:07 -0700
commit95a799dee5d15cff133af1956c77211194197a82 (patch)
tree51e8443fd567573d23c22082d6d71998615af6b5 /include
parent0e76e3fd433cc1e36428296deb09910ca9dc17c7 (diff)
downloadusermoji-95a799dee5d15cff133af1956c77211194197a82.tar.xz
bug 12921 part 2: Memory callback (WIP)
Minor cleanups. s/VK_SYSTEM_ALLOCATION_SCOPE_FUNCTION/VK_SYSTEM_ALLOCATION_SCOPE_COMMAND/g https://cvs.khronos.org/bugzilla/show_bug.cgi?id=12921
Diffstat (limited to 'include')
-rw-r--r--include/vulkan.h44
1 files changed, 22 insertions, 22 deletions
diff --git a/include/vulkan.h b/include/vulkan.h
index 6963cfa4..ede2022d 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -187,14 +187,14 @@ typedef enum VkStructureType {
} VkStructureType;
typedef enum VkSystemAllocationScope {
- VK_SYSTEM_ALLOCATION_SCOPE_FUNCTION = 0,
+ VK_SYSTEM_ALLOCATION_SCOPE_COMMAND = 0,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT = 1,
VK_SYSTEM_ALLOCATION_SCOPE_CACHE = 2,
VK_SYSTEM_ALLOCATION_SCOPE_DEVICE = 3,
VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE = 4,
- VK_SYSTEM_ALLOCATION_SCOPE_BEGIN_RANGE = VK_SYSTEM_ALLOCATION_SCOPE_FUNCTION,
+ VK_SYSTEM_ALLOCATION_SCOPE_BEGIN_RANGE = VK_SYSTEM_ALLOCATION_SCOPE_COMMAND,
VK_SYSTEM_ALLOCATION_SCOPE_END_RANGE = VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE,
- VK_SYSTEM_ALLOCATION_SCOPE_RANGE_SIZE = (VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE - VK_SYSTEM_ALLOCATION_SCOPE_FUNCTION + 1),
+ VK_SYSTEM_ALLOCATION_SCOPE_RANGE_SIZE = (VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE - VK_SYSTEM_ALLOCATION_SCOPE_COMMAND + 1),
VK_SYSTEM_ALLOCATION_SCOPE_MAX_ENUM = 0x7FFFFFFF
} VkSystemAllocationScope;
@@ -1044,33 +1044,33 @@ typedef enum VkQueryControlFlagBits {
typedef VkFlags VkQueryControlFlags;
typedef void* (VKAPI *PFN_vkAllocationFunction)(
- void* pUserData,
- size_t size,
- size_t alignment,
- VkSystemAllocationScope allocationScope);
+ void* pUserData,
+ size_t size,
+ size_t alignment,
+ VkSystemAllocationScope allocationScope);
typedef void* (VKAPI *PFN_vkReallocationFunction)(
- void* pUserData,
- void* pOriginal,
- size_t size,
- size_t alignment,
- VkSystemAllocationScope allocationScope);
+ void* pUserData,
+ void* pOriginal,
+ size_t size,
+ size_t alignment,
+ VkSystemAllocationScope allocationScope);
typedef void (VKAPI *PFN_vkFreeFunction)(
- void* pUserData,
- void* pMemory);
+ void* pUserData,
+ void* pMemory);
typedef void (VKAPI *PFN_vkInternalAllocationNotification)(
- void* pUserData,
- size_t size,
- VkInternalAllocationType allocationType,
- VkSystemAllocationScope allocationScope);
+ void* pUserData,
+ size_t size,
+ VkInternalAllocationType allocationType,
+ VkSystemAllocationScope allocationScope);
typedef void (VKAPI *PFN_vkInternalFreeNotification)(
- void* pUserData,
- size_t size,
- VkInternalAllocationType allocationType,
- VkSystemAllocationScope allocationScope);
+ void* pUserData,
+ size_t size,
+ VkInternalAllocationType allocationType,
+ VkSystemAllocationScope allocationScope);
typedef void (VKAPI *PFN_vkVoidFunction)(void);