vulkan.h: V99 -- Remove vkSetMemoryPriority, Bug# 13925

Conflicts:
	layers/mem_tracker.cpp

12 files changed, 1 insertions, 82 deletions

diff --git a/demos/cube.c b/demos/cube.c
index cea5ffdb..5c93b933 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -658,7 +658,6 @@ static void demo_prepare_depth(struct demo *demo)
         .pNext = NULL,
         .allocationSize = 0,
         .memProps = VK_MEMORY_PROPERTY_DEVICE_ONLY,
-        .memPriority = VK_MEMORY_PRIORITY_NORMAL,
     };
     VkDepthStencilViewCreateInfo view = {
         .sType = VK_STRUCTURE_TYPE_DEPTH_STENCIL_VIEW_CREATE_INFO,
@@ -902,7 +901,6 @@ static void demo_prepare_texture_image(struct demo *demo,
         .pNext = NULL,
         .allocationSize = 0,
         .memProps = mem_props,
-        .memPriority = VK_MEMORY_PRIORITY_NORMAL,
     };
 
     VkMemoryRequirements mem_reqs;
@@ -1092,7 +1090,6 @@ void demo_prepare_cube_data_buffer(struct demo *demo)
         .pNext = NULL,
         .allocationSize = 0,
         .memProps = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
-        .memPriority = VK_MEMORY_PRIORITY_NORMAL,
     };
     VkMemoryRequirements mem_reqs;
     size_t mem_reqs_size = sizeof(VkMemoryRequirements);
diff --git a/demos/tri.c b/demos/tri.c
index 2dcfaa5f..4728d7cd 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -458,7 +458,6 @@ static void demo_prepare_depth(struct demo *demo)
         .pNext = NULL,
         .allocationSize = 0,
         .memProps = VK_MEMORY_PROPERTY_DEVICE_ONLY,
-        .memPriority = VK_MEMORY_PRIORITY_NORMAL,
     };
     VkDepthStencilViewCreateInfo view = {
         .sType = VK_STRUCTURE_TYPE_DEPTH_STENCIL_VIEW_CREATE_INFO,
@@ -542,7 +541,6 @@ static void demo_prepare_texture_image(struct demo *demo,
         .pNext = NULL,
         .allocationSize = 0,
         .memProps = mem_props,
-        .memPriority = VK_MEMORY_PRIORITY_NORMAL,
     };
 
     VkMemoryRequirements mem_reqs;
@@ -744,7 +742,6 @@ static void demo_prepare_vertices(struct demo *demo)
         .pNext = NULL,
         .allocationSize = 0,
         .memProps = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
-        .memPriority = VK_MEMORY_PRIORITY_NORMAL,
     };
     VkMemoryRequirements mem_reqs;
     size_t mem_reqs_size = sizeof(VkMemoryRequirements);
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index 05c9acb7..e1b1cf45 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -1668,15 +1668,6 @@ ICD_EXPORT VkResult VKAPI vkFreeMemory(
     return VK_SUCCESS;
 }
 
-ICD_EXPORT VkResult VKAPI vkSetMemoryPriority(
-    VkDevice                                    device,
-    VkDeviceMemory                              mem_,
-    VkMemoryPriority                            priority)
-{
-    NULLDRV_LOG_FUNC;
-    return VK_SUCCESS;
-}
-
 ICD_EXPORT VkResult VKAPI vkMapMemory(
     VkDevice                                    device,
     VkDeviceMemory                              mem_,
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,
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index 44fc5d95..ece8bc7a 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1105,17 +1105,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkFreeMemory(
     return result;
 }
 
-VK_LAYER_EXPORT VkResult VKAPI vkSetMemoryPriority(
-    VkDevice         device,
-    VkDeviceMemory   mem,
-    VkMemoryPriority priority)
-{
-    // TODO : Update tracking for this alloc
-    //  Make sure memory is not pinned, which can't have priority set
-    VkResult result = get_dispatch_table(mem_tracker_device_table_map, device)->SetMemoryPriority(device, mem, priority);
-    return result;
-}
-
 VK_LAYER_EXPORT VkResult VKAPI vkMapMemory(
     VkDevice         device,
     VkDeviceMemory   mem,
@@ -2212,8 +2201,6 @@ VK_LAYER_EXPORT void* VKAPI vkGetDeviceProcAddr(
         return (void*) vkAllocMemory;
     if (!strcmp(funcName, "vkFreeMemory"))
         return (void*) vkFreeMemory;
-    if (!strcmp(funcName, "vkSetMemoryPriority"))
-        return (void*) vkSetMemoryPriority;
     if (!strcmp(funcName, "vkMapMemory"))
         return (void*) vkMapMemory;
     if (!strcmp(funcName, "vkUnmapMemory"))
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 680c6373..5c92cb09 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -431,17 +431,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkFreeMemory(VkDevice device, VkDeviceMemory mem)
     return result;
 }
 
-VK_LAYER_EXPORT VkResult VKAPI vkSetMemoryPriority(VkDevice device, VkDeviceMemory mem, VkMemoryPriority priority)
-{
-    char str[1024];
-    if (!validate_VkMemoryPriority(priority)) {
-        sprintf(str, "Parameter priority to function SetMemoryPriority has invalid value of %i.", (int)priority);
-        layerCbMsg(VK_DBG_REPORT_ERROR_BIT, (VkObjectType) 0, NULL, 0, 1, "PARAMCHECK", str);
-    }
-    VkResult result = device_dispatch_table(device)->SetMemoryPriority(device, mem, priority);
-    return result;
-}
-
 VK_LAYER_EXPORT VkResult VKAPI vkMapMemory(VkDevice device, VkDeviceMemory mem, VkDeviceSize offset, VkDeviceSize size, VkFlags flags, void** ppData)
 {
 
@@ -1997,8 +1986,6 @@ static inline void* layer_intercept_proc(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/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
diff --git a/vulkan.py b/vulkan.py
index 97976c4d..ed224514 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -291,11 +291,6 @@ core = Extension(
             [Param("VkDevice", "device"),
              Param("VkDeviceMemory", "mem")]),
 
-        Proto("VkResult", "SetMemoryPriority",
-            [Param("VkDevice", "device"),
-             Param("VkDeviceMemory", "mem"),
-             Param("VkMemoryPriority", "priority")]),
-
         Proto("VkResult", "MapMemory",
             [Param("VkDevice", "device"),
              Param("VkDeviceMemory", "mem"),