diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2015-06-11 15:37:55 -0500 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-06-18 10:22:57 -0600 |
| commit | 925320abcb1d91d0a0364fec2294121895bbfc82 (patch) | |
| tree | 85319ca811500726d8c9886a9286066970fc9b23 /include | |
| parent | a3cad0a72d86ed47490e7dee336b261293378506 (diff) | |
| download | usermoji-925320abcb1d91d0a0364fec2294121895bbfc82.tar.xz | |
vulkan.h: V99 -- Remove vkSetMemoryPriority, Bug# 13925
Conflicts:
layers/mem_tracker.cpp
Diffstat (limited to 'include')
| -rw-r--r-- | include/vkLayer.h | 1 | ||||
| -rw-r--r-- | include/vulkan.h | 21 |
2 files changed, 1 insertions, 21 deletions
diff --git a/include/vkLayer.h b/include/vkLayer.h index 745fe149..6c60af8b 100644 --- a/include/vkLayer.h +++ b/include/vkLayer.h @@ -36,7 +36,6 @@ typedef struct VkLayerDispatchTable_ PFN_vkDeviceWaitIdle DeviceWaitIdle; PFN_vkAllocMemory AllocMemory; PFN_vkFreeMemory FreeMemory; - PFN_vkSetMemoryPriority SetMemoryPriority; PFN_vkMapMemory MapMemory; PFN_vkUnmapMemory UnmapMemory; PFN_vkFlushMappedMemoryRanges FlushMappedMemoryRanges; diff --git a/include/vulkan.h b/include/vulkan.h index 73ca57e4..113ed415 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -33,7 +33,7 @@ #include "vk_platform.h" // Vulkan API version supported by this file -#define VK_API_VERSION VK_MAKE_VERSION(0, 98, 0) +#define VK_API_VERSION VK_MAKE_VERSION(0, 99, 0) #ifdef __cplusplus extern "C" @@ -135,18 +135,6 @@ VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkRenderPass, VkNonDispatchable) // ------------------------------------------------------------------------------------------------ // Enumerations -typedef enum VkMemoryPriority_ -{ - VK_MEMORY_PRIORITY_UNUSED = 0x00000000, - VK_MEMORY_PRIORITY_VERY_LOW = 0x00000001, - VK_MEMORY_PRIORITY_LOW = 0x00000002, - VK_MEMORY_PRIORITY_NORMAL = 0x00000003, - VK_MEMORY_PRIORITY_HIGH = 0x00000004, - VK_MEMORY_PRIORITY_VERY_HIGH = 0x00000005, - - VK_ENUM_RANGE(MEMORY_PRIORITY, UNUSED, VERY_HIGH) -} VkMemoryPriority; - typedef enum VkImageLayout_ { VK_IMAGE_LAYOUT_UNDEFINED = 0x00000000, // Implicit layout an image is when its contents are undefined due to various reasons (e.g. right after creation) @@ -1360,7 +1348,6 @@ typedef struct VkMemoryAllocInfo_ const void* pNext; // Pointer to next structure VkDeviceSize allocationSize; // Size of memory allocation VkMemoryPropertyFlags memProps; // Memory property flags - VkMemoryPriority memPriority; } VkMemoryAllocInfo; typedef struct VkMemoryOpenInfo_ @@ -2092,7 +2079,6 @@ typedef VkResult (VKAPI *PFN_vkQueueWaitIdle)(VkQueue queue); typedef VkResult (VKAPI *PFN_vkDeviceWaitIdle)(VkDevice device); typedef VkResult (VKAPI *PFN_vkAllocMemory)(VkDevice device, const VkMemoryAllocInfo* pAllocInfo, VkDeviceMemory* pMem); typedef VkResult (VKAPI *PFN_vkFreeMemory)(VkDevice device, VkDeviceMemory mem); -typedef VkResult (VKAPI *PFN_vkSetMemoryPriority)(VkDevice device, VkDeviceMemory mem, VkMemoryPriority priority); typedef VkResult (VKAPI *PFN_vkMapMemory)(VkDevice device, VkDeviceMemory mem, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void** ppData); typedef VkResult (VKAPI *PFN_vkUnmapMemory)(VkDevice device, VkDeviceMemory mem); typedef VkResult (VKAPI *PFN_vkFlushMappedMemoryRanges)(VkDevice device, uint32_t memRangeCount, const VkMappedMemoryRange* pMemRanges); @@ -2275,11 +2261,6 @@ VkResult VKAPI vkFreeMemory( VkDevice device, VkDeviceMemory mem); -VkResult VKAPI vkSetMemoryPriority( - VkDevice device, - VkDeviceMemory mem, - VkMemoryPriority priority); - VkResult VKAPI vkMapMemory( VkDevice device, VkDeviceMemory mem, |