From fc3b08cd1673c15ec5742d31356e1cd941c01e08 Mon Sep 17 00:00:00 2001
From: Jon Ashburn <jon@lunarg.com>
Date: Mon, 8 Jun 2015 14:38:28 -0600
Subject: loader: Remove GetGlobalExtensionInfo from dispatch table

No way to reliably dispatch this entry point in layers; will not be recursive.

Conflicts:
	loader/loader.c
---
 include/vkLayer.h  | 2 +-
 loader/loader.c    | 1 -
 loader/table_ops.h | 3 ---
 vk-generate.py     | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/vkLayer.h b/include/vkLayer.h
index 468d4355..745fe149 100644
--- a/include/vkLayer.h
+++ b/include/vkLayer.h
@@ -151,7 +151,7 @@ typedef struct VkLayerInstanceDispatchTable_
     PFN_vkEnumeratePhysicalDevices EnumeratePhysicalDevices;
     PFN_vkGetPhysicalDeviceInfo GetPhysicalDeviceInfo;
     PFN_vkCreateDevice CreateDevice;
-    PFN_vkGetGlobalExtensionInfo GetGlobalExtensionInfo;
+    /* PFN_vkGetGlobalExtensionInfo GetGlobalExtensionInfo; non-dispatchable */
     PFN_vkGetPhysicalDeviceExtensionInfo GetPhysicalDeviceExtensionInfo;
     PFN_vkGetMultiDeviceCompatibility GetMultiDeviceCompatibility;
     PFN_vkGetDisplayInfoWSI GetDisplayInfoWSI;
diff --git a/loader/loader.c b/loader/loader.c
index bedf27d9..315b8580 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -89,7 +89,6 @@ const VkLayerInstanceDispatchTable instance_disp = {
     .EnumeratePhysicalDevices = loader_EnumeratePhysicalDevices,
     .GetPhysicalDeviceInfo = loader_GetPhysicalDeviceInfo,
     .CreateDevice = loader_CreateDevice,
-    .GetGlobalExtensionInfo = vkGetGlobalExtensionInfo,
     .GetPhysicalDeviceExtensionInfo = loader_GetPhysicalDeviceExtensionInfo,
     .GetMultiDeviceCompatibility = loader_GetMultiDeviceCompatibility,
     .GetDisplayInfoWSI = loader_GetDisplayInfoWSI,
diff --git a/loader/table_ops.h b/loader/table_ops.h
index e4c39f2e..15a30070 100644
--- a/loader/table_ops.h
+++ b/loader/table_ops.h
@@ -383,7 +383,6 @@ static inline void loader_init_instance_core_dispatch_table(VkLayerInstanceDispa
     table->EnumeratePhysicalDevices = (PFN_vkEnumeratePhysicalDevices) gpa(inst, "vkEnumeratePhysicalDevices");
     table->GetPhysicalDeviceInfo = (PFN_vkGetPhysicalDeviceInfo) gpa(inst, "vkGetPhysicalDeviceInfo");
     table->CreateDevice = (PFN_vkCreateDevice) gpa(inst, "vkCreateDevice");
-    table->GetGlobalExtensionInfo = (PFN_vkGetGlobalExtensionInfo) gpa(inst,"vkGetGlobalExtensionInfo");
     table->GetPhysicalDeviceExtensionInfo = (PFN_vkGetPhysicalDeviceExtensionInfo) gpa(inst, "vkGetPhysicalDeviceExtensionInfo");
     table->GetMultiDeviceCompatibility = (PFN_vkGetMultiDeviceCompatibility) gpa(inst, "vkGetMultiDeviceCompatibility");
     table->GetDisplayInfoWSI = (PFN_vkGetDisplayInfoWSI) gpa(inst, "vkGetDisplayInfoWSI");
@@ -418,8 +417,6 @@ static inline void *loader_lookup_instance_dispatch_table(
         return (void *) table->GetInstanceProcAddr;
     if (!strcmp(name, "CreateDevice"))
         return (void *) table->CreateDevice;
-    if (!strcmp(name, "GetGlobalExtensionInfo"))
-        return (void *) table->GetGlobalExtensionInfo;
     if (!strcmp(name, "GetPhysicalDeviceExtensionInfo"))
         return (void *) table->GetPhysicalDeviceExtensionInfo;
     if (!strcmp(name, "GetMultiDeviceCompatibility"))
diff --git a/vk-generate.py b/vk-generate.py
index 790a543f..a0165c7e 100755
--- a/vk-generate.py
+++ b/vk-generate.py
@@ -138,7 +138,7 @@ class DispatchTableOpsSubcommand(Subcommand):
             stmts.append("// GPA has to be first entry inited and uses wrapped object since it triggers init")
             stmts.append("table->GetInstanceProcAddr =(PFN_vkGetInstanceProcAddr)  gpa(instance,\"vkGetInstanceProcAddr\");")
             for proto in self.protos:
-                if proto.name != "CreateInstance"  and proto.name != "GetGlobalExtensionInfo" and proto.name != "GetDisplayInfoWSI" and proto.params[0].ty != "VkInstance" and proto.params[0].ty != "VkPhysicalDevice":
+                if proto.name != "CreateInstance"  and proto.name != "GetDisplayInfoWSI" and proto.params[0].ty != "VkInstance" and proto.params[0].ty != "VkPhysicalDevice":
                     continue
                 if proto.name != "GetInstanceProcAddr":
                     stmts.append("table->%s = (PFN_vk%s) gpa(baseInstance, \"vk%s\");" %
-- 
cgit v1.2.3