vulkan.h: V99 -- Remove vkPinSystemMemory, Bug# 13926

11 files changed, 0 insertions, 64 deletions

diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c
index d9ade739..69f46aad 100644
--- a/demos/vulkaninfo.c
+++ b/demos/vulkaninfo.c
@@ -757,7 +757,6 @@ static void app_gpu_dump_memory_props(const struct app_gpu *gpu)
 
     printf("VkPhysicalDeviceMemoryProperties\n");
     printf("\tsupportsMigration = %u\n",                props->supportsMigration);
-    printf("\tsupportsPinning = %u\n",                  props->supportsPinning);
 }
 
 static void app_gpu_dump(const struct app_gpu *gpu)
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index e1b1cf45..5a62a402 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -1711,16 +1711,6 @@ ICD_EXPORT VkResult VKAPI vkInvalidateMappedMemoryRanges(
     return VK_SUCCESS;
 }
 
-ICD_EXPORT VkResult VKAPI vkPinSystemMemory(
-    VkDevice                                  device,
-    const void*                                 pSysMem,
-    size_t                                      memSize,
-    VkDeviceMemory*                             pMem)
-{
-    NULLDRV_LOG_FUNC;
-    return VK_SUCCESS;
-}
-
 ICD_EXPORT VkResult VKAPI vkOpenSharedMemory(
     VkDevice                                  device,
     const VkMemoryOpenInfo*                 pOpenInfo,
diff --git a/include/vkLayer.h b/include/vkLayer.h
index 6c60af8b..209a0880 100644
--- a/include/vkLayer.h
+++ b/include/vkLayer.h
@@ -40,7 +40,6 @@ typedef struct VkLayerDispatchTable_
     PFN_vkUnmapMemory UnmapMemory;
     PFN_vkFlushMappedMemoryRanges FlushMappedMemoryRanges;
     PFN_vkInvalidateMappedMemoryRanges InvalidateMappedMemoryRanges;
-    PFN_vkPinSystemMemory PinSystemMemory;
     PFN_vkOpenSharedMemory OpenSharedMemory;
     PFN_vkOpenSharedSemaphore OpenSharedSemaphore;
     PFN_vkOpenPeerMemory OpenPeerMemory;
diff --git a/include/vulkan.h b/include/vulkan.h
index 113ed415..3aa7411c 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -1339,7 +1339,6 @@ typedef struct VkPhysicalDeviceQueueProperties_
 typedef struct VkPhysicalDeviceMemoryProperties_
 {
     bool32_t                                    supportsMigration;
-    bool32_t                                    supportsPinning;
 } VkPhysicalDeviceMemoryProperties;
 
 typedef struct VkMemoryAllocInfo_
@@ -2083,7 +2082,6 @@ typedef VkResult (VKAPI *PFN_vkMapMemory)(VkDevice device, VkDeviceMemory mem, V
 typedef VkResult (VKAPI *PFN_vkUnmapMemory)(VkDevice device, VkDeviceMemory mem);
 typedef VkResult (VKAPI *PFN_vkFlushMappedMemoryRanges)(VkDevice device, uint32_t memRangeCount, const VkMappedMemoryRange* pMemRanges);
 typedef VkResult (VKAPI *PFN_vkInvalidateMappedMemoryRanges)(VkDevice device, uint32_t memRangeCount, const VkMappedMemoryRange* pMemRanges);
-typedef VkResult (VKAPI *PFN_vkPinSystemMemory)(VkDevice device, const void* pSysMem, size_t memSize, VkDeviceMemory* pMem);
 typedef VkResult (VKAPI *PFN_vkGetMultiDeviceCompatibility)(VkPhysicalDevice physicalDevice0, VkPhysicalDevice physicalDevice1, VkPhysicalDeviceCompatibilityInfo* pInfo);
 typedef VkResult (VKAPI *PFN_vkOpenSharedMemory)(VkDevice device, const VkMemoryOpenInfo* pOpenInfo, VkDeviceMemory* pMem);
 typedef VkResult (VKAPI *PFN_vkOpenSharedSemaphore)(VkDevice device, const VkSemaphoreOpenInfo* pOpenInfo, VkSemaphore* pSemaphore);
@@ -2283,12 +2281,6 @@ VkResult VKAPI vkInvalidateMappedMemoryRanges(
     uint32_t                                    memRangeCount,
     const VkMappedMemoryRange*                  pMemRanges);
 
-VkResult VKAPI vkPinSystemMemory(
-    VkDevice                                    device,
-    const void*                                 pSysMem,
-    size_t                                      memSize,
-    VkDeviceMemory*                             pMem);
-
 // Multi-device functions
 
 VkResult VKAPI vkGetMultiDeviceCompatibility(
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index ece8bc7a..81962b38 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1135,18 +1135,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkUnmapMemory(
     return result;
 }
 
-VK_LAYER_EXPORT VkResult VKAPI vkPinSystemMemory(
-    VkDevice        device,
-    const void     *pSysMem,
-    size_t          memSize,
-    VkDeviceMemory *pMem)
-{
-    // TODO : Track this
-    //  Verify that memory is actually pinnable
-    VkResult result = get_dispatch_table(mem_tracker_device_table_map, device)->PinSystemMemory(device, pSysMem, memSize, pMem);
-    return result;
-}
-
 VK_LAYER_EXPORT VkResult VKAPI vkOpenSharedMemory(
     VkDevice                device,
     const VkMemoryOpenInfo *pOpenInfo,
@@ -2205,8 +2193,6 @@ VK_LAYER_EXPORT void* VKAPI vkGetDeviceProcAddr(
         return (void*) vkMapMemory;
     if (!strcmp(funcName, "vkUnmapMemory"))
         return (void*) vkUnmapMemory;
-    if (!strcmp(funcName, "vkPinSystemMemory"))
-        return (void*) vkPinSystemMemory;
     if (!strcmp(funcName, "vkOpenSharedMemory"))
         return (void*) vkOpenSharedMemory;
     if (!strcmp(funcName, "vkOpenPeerMemory"))
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 5c92cb09..20608ede 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -465,13 +465,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkInvalidateMappedMemoryRanges(
     return result;
 }
 
-VK_LAYER_EXPORT VkResult VKAPI vkPinSystemMemory(VkDevice device, const void* pSysMem, size_t memSize, VkDeviceMemory* pMem)
-{
-
-    VkResult result = device_dispatch_table(device)->PinSystemMemory(device, pSysMem, memSize, pMem);
-    return result;
-}
-
 VK_LAYER_EXPORT VkResult VKAPI vkGetMultiDeviceCompatibility(VkPhysicalDevice gpu0, VkPhysicalDevice gpu1, VkPhysicalDeviceCompatibilityInfo* pInfo)
 {
 
@@ -1994,8 +1987,6 @@ static inline void* layer_intercept_proc(const char *name)
         return (void*) vkFlushMappedMemoryRanges;
     if (!strcmp(name, "InvalidateMappedMemoryRanges"))
         return (void*) vkInvalidateMappedMemoryRanges;
-    if (!strcmp(name, "PinSystemMemory"))
-        return (void*) vkPinSystemMemory;
     if (!strcmp(name, "OpenSharedMemory"))
         return (void*) vkOpenSharedMemory;
     if (!strcmp(name, "OpenSharedSemaphore"))
diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h
index c02d74ff..3b2d0989 100644
--- a/loader/gpa_helper.h
+++ b/loader/gpa_helper.h
@@ -71,8 +71,6 @@ static inline void* globalGetProcAddr(const char *name)
         return (void*) vkFlushMappedMemoryRanges;
     if (!strcmp(name, "InvalidateMappedMemoryRanges"))
         return (void*) vkInvalidateMappedMemoryRanges;
-    if (!strcmp(name, "PinSystemMemory"))
-        return (void*) vkPinSystemMemory;
     if (!strcmp(name, "GetMultiDeviceCompatibility"))
         return (void*) vkGetMultiDeviceCompatibility;
     if (!strcmp(name, "OpenSharedMemory"))
diff --git a/loader/table_ops.h b/loader/table_ops.h
index 2963b20f..d7dcdf83 100644
--- a/loader/table_ops.h
+++ b/loader/table_ops.h
@@ -48,7 +48,6 @@ static inline void loader_init_device_dispatch_table(VkLayerDispatchTable *table
     table->UnmapMemory = (PFN_vkUnmapMemory) gpa(dev, "vkUnmapMemory");
     table->FlushMappedMemoryRanges = (PFN_vkFlushMappedMemoryRanges) gpa(dev, "vkFlushMappedMemoryRanges");
     table->InvalidateMappedMemoryRanges = (PFN_vkInvalidateMappedMemoryRanges) gpa(dev, "vkInvalidateMappedMemoryRanges");
-    table->PinSystemMemory = (PFN_vkPinSystemMemory) gpa(dev, "vkPinSystemMemory");
     table->OpenSharedMemory = (PFN_vkOpenSharedMemory) gpa(dev, "vkOpenSharedMemory");
     table->OpenSharedSemaphore = (PFN_vkOpenSharedSemaphore) gpa(dev, "vkOpenSharedSemaphore");
     table->OpenPeerMemory = (PFN_vkOpenPeerMemory) gpa(dev, "vkOpenPeerMemory");
@@ -180,8 +179,6 @@ static inline void *loader_lookup_device_dispatch_table(
         return (void *) table->FlushMappedMemoryRanges;
     if (!strcmp(name, "InvalidateMappedMemoryRanges"))
         return (void *) table->InvalidateMappedMemoryRanges;
-    if (!strcmp(name, "PinSystemMemory"))
-        return (void *) table->PinSystemMemory;
     if (!strcmp(name, "OpenSharedMemory"))
         return (void *) table->OpenSharedMemory;
     if (!strcmp(name, "OpenSharedSemaphore"))
diff --git a/loader/trampoline.c b/loader/trampoline.c
index a5cdc90b..5392b119 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -316,15 +316,6 @@ LOADER_EXPORT VkResult VKAPI vkInvalidateMappedMemoryRanges(VkDevice device, uin
     return disp->InvalidateMappedMemoryRanges(device, memRangeCount, pMemRanges);
 }
 
-LOADER_EXPORT VkResult VKAPI vkPinSystemMemory(VkDevice device, const void* pSysMem, size_t memSize, VkDeviceMemory* pMem)
-{
-    const VkLayerDispatchTable *disp;
-
-    disp = loader_get_dispatch(device);
-
-    return disp->PinSystemMemory(device, pSysMem, memSize, pMem);
-}
-
 LOADER_EXPORT VkResult VKAPI vkGetMultiDeviceCompatibility(VkPhysicalDevice gpu0, VkPhysicalDevice gpu1, VkPhysicalDeviceCompatibilityInfo* pInfo)
 {
     const VkLayerInstanceDispatchTable *disp;
diff --git a/loader/vulkan.def b/loader/vulkan.def
index e44c07e2..e6c6930d 100644
--- a/loader/vulkan.def
+++ b/loader/vulkan.def
@@ -46,7 +46,6 @@ EXPORTS
    vkUnmapMemory
    vkFlushMappedMemoryRanges
    vkInvalidateMappedMemoryRanges
-   vkPinSystemMemory
    vkGetMultiDeviceCompatibility
    vkOpenSharedMemory
    vkOpenSharedSemaphore
diff --git a/vulkan.py b/vulkan.py
index ed224514..ec7f681a 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -313,12 +313,6 @@ core = Extension(
              Param("uint32_t", "memRangeCount"),
              Param("const VkMappedMemoryRange*", "pMemRanges")]),
 
-        Proto("VkResult", "PinSystemMemory",
-            [Param("VkDevice", "device"),
-             Param("const void*", "pSysMem"),
-             Param("size_t", "memSize"),
-             Param("VkDeviceMemory*", "pMem")]),
-
         Proto("VkResult", "GetMultiDeviceCompatibility",
             [Param("VkPhysicalDevice", "gpu0"),
              Param("VkPhysicalDevice", "gpu1"),