commit 74c4ce9c4fa101c0989a29cf918e799fa67adcec
author Courtney Goeltzenleuchter <courtney@LunarG.com> Mon Sep 14 17:22:16 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Thu Sep 17 15:32:11 2015 -0600
tree 74f970f9374e371b243c3362600dfbb31936a668
parent d3e4a76112e2ff71bf6b7ae0510b1306bc087231

bug 14509: Rename Layer and Extension queries

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14509
https://gitlab.khronos.org/vulkan/vulkan/merge_requests/334

vk-generate.py

diff --git a/vk-generate.py b/vk-generate.py
index c127ea2..2d235ef 100755
--- a/vk-generate.py
+++ b/vk-generate.py
@@ -122,7 +122,7 @@
             stmts.append("memset(table, 0, sizeof(*table));")
             stmts.append("table->GetDeviceProcAddr =(PFN_vkGetDeviceProcAddr)  gpa(device,\"vkGetDeviceProcAddr\");")
             for proto in self.protos:
-                if proto.name == "CreateInstance" or proto.name == "GetGlobalExtensionProperties" or proto.name == "GetGlobalLayerProperties" or proto.params[0].ty == "VkInstance" or (proto.params[0].ty == "VkPhysicalDevice" and proto.name != "CreateDevice"):
+                if proto.name == "CreateInstance" or proto.name == "EnumerateInstanceExtensionProperties" or proto.name == "EnumerateInstanceLayerProperties" or proto.params[0].ty == "VkInstance" or (proto.params[0].ty == "VkPhysicalDevice" and proto.name != "CreateDevice"):
                     continue
                 if proto.name != "GetDeviceProcAddr" and 'KHR' not in proto.name:
                     stmts.append("table->%s = (PFN_vk%s) gpa(baseDevice, \"vk%s\");" %
@@ -255,8 +255,8 @@
                 "layer": [
                     "vkGetInstanceProcAddr",
                     "vkGetDeviceProcAddr",
-                    "vkGetGlobalLayerProperties",
-                    "vkGetGlobalExtensionProperties"
+                    "vkEnumerateInstanceLayerProperties",
+                    "vkEnumerateInstanceExtensionProperties"
                 ],
                 "layerMulti": [
                     "multi2GetInstanceProcAddr",