bug 13038: Remove support for multiple GPUs

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=13038

5 files changed, 0 insertions, 97 deletions

diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h
index 20b0b519..52afa9bd 100644
--- a/loader/gpa_helper.h
+++ b/loader/gpa_helper.h
@@ -71,16 +71,6 @@ static inline void* globalGetProcAddr(const char *name)
         return (void*) vkFlushMappedMemoryRanges;
     if (!strcmp(name, "InvalidateMappedMemoryRanges"))
         return (void*) vkInvalidateMappedMemoryRanges;
-    if (!strcmp(name, "GetMultiDeviceCompatibility"))
-        return (void*) vkGetMultiDeviceCompatibility;
-    if (!strcmp(name, "OpenSharedMemory"))
-        return (void*) vkOpenSharedMemory;
-    if (!strcmp(name, "OpenSharedSemaphore"))
-        return (void*) vkOpenSharedSemaphore;
-    if (!strcmp(name, "OpenPeerMemory"))
-        return (void*) vkOpenPeerMemory;
-    if (!strcmp(name, "OpenPeerImage"))
-        return (void*) vkOpenPeerImage;
     if (!strcmp(name, "DestroyObject"))
         return (void*) vkDestroyObject;
     if (!strcmp(name, "GetObjectInfo"))
diff --git a/loader/loader.c b/loader/loader.c
index 1c6e3fb3..57956aef 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -90,7 +90,6 @@ const VkLayerInstanceDispatchTable instance_disp = {
     .GetPhysicalDeviceInfo = loader_GetPhysicalDeviceInfo,
     .CreateDevice = loader_CreateDevice,
     .GetPhysicalDeviceExtensionInfo = loader_GetPhysicalDeviceExtensionInfo,
-    .GetMultiDeviceCompatibility = loader_GetMultiDeviceCompatibility,
     .DbgCreateMsgCallback = loader_DbgCreateMsgCallback,
     .DbgDestroyMsgCallback = loader_DbgDestroyMsgCallback,
 };
@@ -721,7 +720,6 @@ static void loader_icd_init_entrys(struct loader_icd *icd,
     LOOKUP(GetPhysicalDeviceInfo);
     LOOKUP(CreateDevice);
     LOOKUP(GetPhysicalDeviceExtensionInfo);
-    LOOKUP(GetMultiDeviceCompatibility);
     LOOKUP(DbgCreateMsgCallback);
     LOOKUP(DbgDestroyMsgCallback);
 #undef LOOKUP
@@ -1920,18 +1918,3 @@ VkResult loader_GetPhysicalDeviceExtensionInfo(
 
     return VK_SUCCESS;
 }
-
-VkResult loader_GetMultiDeviceCompatibility(
-        VkPhysicalDevice                        gpu0,
-        VkPhysicalDevice                        gpu1,
-        VkPhysicalDeviceCompatibilityInfo*      pInfo)
-{
-    uint32_t gpu_index;
-    struct loader_icd *icd = loader_get_icd(gpu0, &gpu_index);
-    VkResult res = VK_ERROR_INITIALIZATION_FAILED;
-
-    if (icd->GetMultiDeviceCompatibility)
-        res = icd->GetMultiDeviceCompatibility(gpu0, gpu1, pInfo);
-
-    return res;
-}
diff --git a/loader/loader.h b/loader/loader.h
index dfb04b08..72a21d4f 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -119,7 +119,6 @@ struct loader_icd {
     PFN_vkGetPhysicalDeviceInfo GetPhysicalDeviceInfo;
     PFN_vkCreateDevice CreateDevice;
     PFN_vkGetPhysicalDeviceExtensionInfo GetPhysicalDeviceExtensionInfo;
-    PFN_vkGetMultiDeviceCompatibility GetMultiDeviceCompatibility;
     PFN_vkDbgCreateMsgCallback DbgCreateMsgCallback;
     PFN_vkDbgDestroyMsgCallback DbgDestroyMsgCallback;
     /*
@@ -339,11 +338,6 @@ VkResult loader_CreateDevice(
         const VkDeviceCreateInfo*               pCreateInfo,
         VkDevice*                               pDevice);
 
-VkResult loader_GetMultiDeviceCompatibility(
-        VkPhysicalDevice                        gpu0,
-        VkPhysicalDevice                        gpu1,
-        VkPhysicalDeviceCompatibilityInfo*      pInfo);
-
 /* helper function definitions */
 bool has_vk_extension_property(
         const VkExtensionProperties *vk_ext_prop,
diff --git a/loader/table_ops.h b/loader/table_ops.h
index 45f411ed..360406a2 100644
--- a/loader/table_ops.h
+++ b/loader/table_ops.h
@@ -48,10 +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->OpenSharedMemory = (PFN_vkOpenSharedMemory) gpa(dev, "vkOpenSharedMemory");
-    table->OpenSharedSemaphore = (PFN_vkOpenSharedSemaphore) gpa(dev, "vkOpenSharedSemaphore");
-    table->OpenPeerMemory = (PFN_vkOpenPeerMemory) gpa(dev, "vkOpenPeerMemory");
-    table->OpenPeerImage = (PFN_vkOpenPeerImage) gpa(dev, "vkOpenPeerImage");
     table->DestroyObject = (PFN_vkDestroyObject) gpa(dev, "vkDestroyObject");
     table->GetObjectInfo = (PFN_vkGetObjectInfo) gpa(dev, "vkGetObjectInfo");
     table->BindObjectMemory = (PFN_vkBindObjectMemory) gpa(dev, "vkBindObjectMemory");
@@ -178,14 +174,6 @@ static inline void *loader_lookup_device_dispatch_table(
         return (void *) table->FlushMappedMemoryRanges;
     if (!strcmp(name, "InvalidateMappedMemoryRanges"))
         return (void *) table->InvalidateMappedMemoryRanges;
-    if (!strcmp(name, "OpenSharedMemory"))
-        return (void *) table->OpenSharedMemory;
-    if (!strcmp(name, "OpenSharedSemaphore"))
-        return (void *) table->OpenSharedSemaphore;
-    if (!strcmp(name, "OpenPeerMemory"))
-        return (void *) table->OpenPeerMemory;
-    if (!strcmp(name, "OpenPeerImage"))
-        return (void *) table->OpenPeerImage;
     if (!strcmp(name, "DestroyObject"))
         return (void *) table->DestroyObject;
     if (!strcmp(name, "GetObjectInfo"))
@@ -375,7 +363,6 @@ static inline void loader_init_instance_core_dispatch_table(VkLayerInstanceDispa
     table->GetPhysicalDeviceInfo = (PFN_vkGetPhysicalDeviceInfo) gpa(inst, "vkGetPhysicalDeviceInfo");
     table->CreateDevice = (PFN_vkCreateDevice) gpa(inst, "vkCreateDevice");
     table->GetPhysicalDeviceExtensionInfo = (PFN_vkGetPhysicalDeviceExtensionInfo) gpa(inst, "vkGetPhysicalDeviceExtensionInfo");
-    table->GetMultiDeviceCompatibility = (PFN_vkGetMultiDeviceCompatibility) gpa(inst, "vkGetMultiDeviceCompatibility");
 }
 
 static inline void loader_init_instance_extension_dispatch_table(
@@ -409,8 +396,6 @@ static inline void *loader_lookup_instance_dispatch_table(
         return (void *) table->CreateDevice;
     if (!strcmp(name, "GetPhysicalDeviceExtensionInfo"))
         return (void *) table->GetPhysicalDeviceExtensionInfo;
-    if (!strcmp(name, "GetMultiDeviceCompatibility"))
-        return (void *) table->GetMultiDeviceCompatibility;
     if (!strcmp(name, "DbgCreateMsgCallback"))
         return (void *) table->DbgCreateMsgCallback;
     if (!strcmp(name, "DbgDestroyMsgCallback"))
diff --git a/loader/trampoline.c b/loader/trampoline.c
index cee2eac7..c5eb01ad 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -306,55 +306,6 @@ LOADER_EXPORT VkResult VKAPI vkInvalidateMappedMemoryRanges(VkDevice device, uin
     return disp->InvalidateMappedMemoryRanges(device, memRangeCount, pMemRanges);
 }
 
-LOADER_EXPORT VkResult VKAPI vkGetMultiDeviceCompatibility(VkPhysicalDevice gpu0, VkPhysicalDevice gpu1, VkPhysicalDeviceCompatibilityInfo* pInfo)
-{
-    const VkLayerInstanceDispatchTable *disp;
-    VkResult res;
-
-    disp = loader_get_instance_dispatch(gpu0);
-
-    loader_platform_thread_lock_mutex(&loader_lock);
-    res = disp->GetMultiDeviceCompatibility(gpu0, gpu1, pInfo);
-    loader_platform_thread_unlock_mutex(&loader_lock);
-    return res;
-}
-
-LOADER_EXPORT VkResult VKAPI vkOpenSharedMemory(VkDevice device, const VkMemoryOpenInfo* pOpenInfo, VkDeviceMemory* pMem)
-{
-    const VkLayerDispatchTable *disp;
-
-    disp = loader_get_dispatch(device);
-
-    return disp->OpenSharedMemory(device, pOpenInfo, pMem);
-}
-
-LOADER_EXPORT VkResult VKAPI vkOpenSharedSemaphore(VkDevice device, const VkSemaphoreOpenInfo* pOpenInfo, VkSemaphore* pSemaphore)
-{
-    const VkLayerDispatchTable *disp;
-
-    disp = loader_get_dispatch(device);
-
-    return disp->OpenSharedSemaphore(device, pOpenInfo, pSemaphore);
-}
-
-LOADER_EXPORT VkResult VKAPI vkOpenPeerMemory(VkDevice device, const VkPeerMemoryOpenInfo* pOpenInfo, VkDeviceMemory* pMem)
-{
-    const VkLayerDispatchTable *disp;
-
-    disp = loader_get_dispatch(device);
-
-    return disp->OpenPeerMemory(device, pOpenInfo, pMem);
-}
-
-LOADER_EXPORT VkResult VKAPI vkOpenPeerImage(VkDevice device, const VkPeerImageOpenInfo* pOpenInfo, VkImage* pImage, VkDeviceMemory* pMem)
-{
-    const VkLayerDispatchTable *disp;
-
-    disp = loader_get_dispatch(device);
-
-    return disp->OpenPeerImage(device, pOpenInfo, pImage, pMem);
-}
-
 LOADER_EXPORT VkResult VKAPI vkDestroyObject(VkDevice device, VkObjectType objType, VkObject object)
 {
     const VkLayerDispatchTable *disp;