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 /loader | |
| parent | a3cad0a72d86ed47490e7dee336b261293378506 (diff) | |
| download | usermoji-925320abcb1d91d0a0364fec2294121895bbfc82.tar.xz | |
vulkan.h: V99 -- Remove vkSetMemoryPriority, Bug# 13925
Conflicts:
layers/mem_tracker.cpp
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/gpa_helper.h | 2 | ||||
| -rw-r--r-- | loader/table_ops.h | 3 | ||||
| -rw-r--r-- | loader/trampoline.c | 9 | ||||
| -rw-r--r-- | loader/vulkan.def | 1 |
4 files changed, 0 insertions, 15 deletions
diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h index 4fe8d385..c02d74ff 100644 --- a/loader/gpa_helper.h +++ b/loader/gpa_helper.h @@ -63,8 +63,6 @@ static inline void* globalGetProcAddr(const char *name) return (void*) vkAllocMemory; if (!strcmp(name, "FreeMemory")) return (void*) vkFreeMemory; - if (!strcmp(name, "SetMemoryPriority")) - return (void*) vkSetMemoryPriority; if (!strcmp(name, "MapMemory")) return (void*) vkMapMemory; if (!strcmp(name, "UnmapMemory")) diff --git a/loader/table_ops.h b/loader/table_ops.h index 15a30070..2963b20f 100644 --- a/loader/table_ops.h +++ b/loader/table_ops.h @@ -44,7 +44,6 @@ static inline void loader_init_device_dispatch_table(VkLayerDispatchTable *table table->DeviceWaitIdle = (PFN_vkDeviceWaitIdle) gpa(dev, "vkDeviceWaitIdle"); table->AllocMemory = (PFN_vkAllocMemory) gpa(dev, "vkAllocMemory"); table->FreeMemory = (PFN_vkFreeMemory) gpa(dev, "vkFreeMemory"); - table->SetMemoryPriority = (PFN_vkSetMemoryPriority) gpa(dev, "vkSetMemoryPriority"); table->MapMemory = (PFN_vkMapMemory) gpa(dev, "vkMapMemory"); table->UnmapMemory = (PFN_vkUnmapMemory) gpa(dev, "vkUnmapMemory"); table->FlushMappedMemoryRanges = (PFN_vkFlushMappedMemoryRanges) gpa(dev, "vkFlushMappedMemoryRanges"); @@ -173,8 +172,6 @@ static inline void *loader_lookup_device_dispatch_table( return (void *) table->AllocMemory; if (!strcmp(name, "FreeMemory")) return (void *) table->FreeMemory; - if (!strcmp(name, "SetMemoryPriority")) - return (void *) table->SetMemoryPriority; if (!strcmp(name, "MapMemory")) return (void *) table->MapMemory; if (!strcmp(name, "UnmapMemory")) diff --git a/loader/trampoline.c b/loader/trampoline.c index 318fc646..a5cdc90b 100644 --- a/loader/trampoline.c +++ b/loader/trampoline.c @@ -280,15 +280,6 @@ LOADER_EXPORT VkResult VKAPI vkFreeMemory(VkDevice device, VkDeviceMemory mem) return disp->FreeMemory(device, mem); } -LOADER_EXPORT VkResult VKAPI vkSetMemoryPriority(VkDevice device, VkDeviceMemory mem, VkMemoryPriority priority) -{ - const VkLayerDispatchTable *disp; - - disp = loader_get_dispatch(device); - - return disp->SetMemoryPriority(device, mem, priority); -} - LOADER_EXPORT VkResult VKAPI vkMapMemory(VkDevice device, VkDeviceMemory mem, VkDeviceSize offset, VkDeviceSize size, VkFlags flags, void** ppData) { const VkLayerDispatchTable *disp; diff --git a/loader/vulkan.def b/loader/vulkan.def index d98c2e69..e44c07e2 100644 --- a/loader/vulkan.def +++ b/loader/vulkan.def @@ -42,7 +42,6 @@ EXPORTS vkDeviceWaitIdle vkAllocMemory vkFreeMemory - vkSetMemoryPriority vkMapMemory vkUnmapMemory vkFlushMappedMemoryRanges |