commit 1245cec54fd74fea87bc95913788726054a91518
author Jon Ashburn <jon@lunarg.com> Mon May 18 13:20:15 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Jun 17 19:47:02 2015 -0600
tree 5aef685172e6119dfd5393785f1c074dbe8e4758
parent 530d0e5c7f57095a6f70e59db82335b53c732d7d

misc: Change vkGetProcAddr to vkGetDeviceProcAddr

Also cleanup layer/loader GPA's to only return device level entrypoints.

loader/vk-loader-generate.py

diff --git a/loader/vk-loader-generate.py b/loader/vk-loader-generate.py
index 1d55d56..f0fcbdb 100755
--- a/loader/vk-loader-generate.py
+++ b/loader/vk-loader-generate.py
@@ -56,7 +56,7 @@
            return False
 
     def _is_loader_non_trampoline_entrypoint(self, proto):
-        if proto.name in ["GetProcAddr", "EnumeratePhysicalDevices", "EnumerateLayers", "DbgRegisterMsgCallback", "DbgUnregisterMsgCallback", "DbgSetGlobalOption", "DestroyInstance"]:
+        if proto.name in ["GetDeviceProcAddr", "EnumeratePhysicalDevices", "EnumerateLayers", "DbgRegisterMsgCallback", "DbgUnregisterMsgCallback", "DbgSetGlobalOption", "DestroyInstance"]:
             return True
         return not self.is_dispatchable_object_first_param(proto)
 
@@ -250,7 +250,7 @@
                              (proto.name, proto.name))
             func.append("static inline void %s_init_device_dispatch_table(VkLayerDispatchTable *table,"
                 % self.prefix)
-            func.append("%s                                              PFN_vkGetProcAddr gpa,"
+            func.append("%s                                              PFN_vkGetDeviceProcAddr gpa,"
                 % (" " * len(self.prefix)))
             func.append("%s                                              VkPhysicalDevice gpu)"
                 % (" " * len(self.prefix)))
@@ -365,7 +365,7 @@
         self.intercepted = [proto.name for proto in self.protos]
 
         for proto in self.protos:
-            if proto.name == "GetProcAddr":
+            if proto.name == "GetDeviceProcAddr":
                 self.gpa = proto
 
         super().run()