From 488c8be618a9d8c93187044401228e207ab2be61 Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Thu, 7 Jan 2016 16:13:06 -0700 Subject: layers: Fix unique_object gpa function; no intercept of func without an NDO Also fix bug in list of KHR functions for table. --- vk-layer-generate.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/vk-layer-generate.py b/vk-layer-generate.py index 2f93a80a..b43632af 100755 --- a/vk-layer-generate.py +++ b/vk-layer-generate.py @@ -48,16 +48,16 @@ def proto_is_global(proto): "EnumerateDeviceLayerProperties", "EnumerateDeviceExtensionProperties", "CreateXcbSurfaceKHR", - "vkGetPhysicalDeviceXcbPresentationSupportKHR", + "GetPhysicalDeviceXcbPresentationSupportKHR", "CreateXlibSurfaceKHR", - "vkGetPhysicalDeviceXlibPresentationSupportKHR", + "GetPhysicalDeviceXlibPresentationSupportKHR", "CreateWaylandSurfaceKHR", - "vkGetPhysicalDeviceWaylandPresentationSupportKHR", + "GetPhysicalDeviceWaylandPresentationSupportKHR", "CreateMirSurfaceKHR", - "vkGetPhysicalDeviceMirPresentationSupportKHR", + "GetPhysicalDeviceMirPresentationSupportKHR", "CreateAndroidSurfaceKHR", "CreateWin32SurfaceKHR", - "vkGetPhysicalDeviceWin32PresentationSupportKHR" + "GetPhysicalDeviceWin32PresentationSupportKHR" ] if proto.params[0].ty == "VkInstance" or proto.params[0].ty == "VkPhysicalDevice" or proto.name in global_function_names: return True @@ -2230,16 +2230,16 @@ class UniqueObjectsSubcommand(Subcommand): 'vkGetPhysicalDeviceSurfaceCapabilitiesKHR', 'vkGetPhysicalDeviceSurfaceFormatsKHR', 'vkGetPhysicalDeviceSurfacePresentModesKHR', - 'vkCreateWin32SurfaceKHR', - 'vkGetPhysicalDeviceWin32PresentationSupportKHR'])] + 'vkCreateWin32SurfaceKHR' + ])] elif sys.platform.startswith('linux'): instance_extensions=[('wsi_enabled', ['vkGetPhysicalDeviceSurfaceSupportKHR', 'vkGetPhysicalDeviceSurfaceCapabilitiesKHR', 'vkGetPhysicalDeviceSurfaceFormatsKHR', 'vkGetPhysicalDeviceSurfacePresentModesKHR', - 'vkCreateXcbSurfaceKHR', - 'vkGetPhysicalDeviceXcbPresentationSupportKHR'])] + 'vkCreateXcbSurfaceKHR' + ])] # TODO: Add cases for Mir, Wayland and Xlib else: # android instance_extensions=[('wsi_enabled', -- cgit v1.2.3