diff options
| -rwxr-xr-x | vk-layer-generate.py | 66 |
1 files changed, 11 insertions, 55 deletions
diff --git a/vk-layer-generate.py b/vk-layer-generate.py index f3868b9f..6e4fb4bd 100755 --- a/vk-layer-generate.py +++ b/vk-layer-generate.py @@ -1418,7 +1418,7 @@ class ObjectTrackerSubcommand(Subcommand): 'vkGetPhysicalDeviceSurfaceFormatsKHR', 'vkGetPhysicalDeviceSurfacePresentModesKHR', 'vkCreateAndroidSurfaceKHR'])] - elif self.wsi == 'Xcb': + elif self.wsi == 'Xcb' or self.wsi == 'Xlib' or self.wsi == 'Wayland' or self.wsi == 'Mir': instance_extensions=[('msg_callback_get_proc_addr', []), ('wsi_enabled', ['vkDestroySurfaceKHR', @@ -1427,35 +1427,11 @@ class ObjectTrackerSubcommand(Subcommand): 'vkGetPhysicalDeviceSurfaceFormatsKHR', 'vkGetPhysicalDeviceSurfacePresentModesKHR', 'vkCreateXcbSurfaceKHR', - 'vkGetPhysicalDeviceXcbPresentationSupportKHR'])] - elif self.wsi == 'Xlib': - instance_extensions=[('msg_callback_get_proc_addr', []), - ('wsi_enabled', - ['vkDestroySurfaceKHR', - 'vkGetPhysicalDeviceSurfaceSupportKHR', - 'vkGetPhysicalDeviceSurfaceCapabilitiesKHR', - 'vkGetPhysicalDeviceSurfaceFormatsKHR', - 'vkGetPhysicalDeviceSurfacePresentModesKHR', + 'vkGetPhysicalDeviceXcbPresentationSupportKHR', 'vkCreateXlibSurfaceKHR', - 'vkGetPhysicalDeviceXlibPresentationSupportKHR'])] - elif self.wsi == 'Wayland': - instance_extensions=[('msg_callback_get_proc_addr', []), - ('wsi_enabled', - ['vkDestroySurfaceKHR', - 'vkGetPhysicalDeviceSurfaceSupportKHR', - 'vkGetPhysicalDeviceSurfaceCapabilitiesKHR', - 'vkGetPhysicalDeviceSurfaceFormatsKHR', - 'vkGetPhysicalDeviceSurfacePresentModesKHR', + 'vkGetPhysicalDeviceXlibPresentationSupportKHR', 'vkCreateWaylandSurfaceKHR', - 'vkGetPhysicalDeviceWaylandPresentationSupportKHR'])] - elif self.wsi == 'Mir': - instance_extensions=[('msg_callback_get_proc_addr', []), - ('wsi_enabled', - ['vkDestroySurfaceKHR', - 'vkGetPhysicalDeviceSurfaceSupportKHR', - 'vkGetPhysicalDeviceSurfaceCapabilitiesKHR', - 'vkGetPhysicalDeviceSurfaceFormatsKHR', - 'vkGetPhysicalDeviceSurfacePresentModesKHR', + 'vkGetPhysicalDeviceWaylandPresentationSupportKHR', 'vkCreateMirSurfaceKHR', 'vkGetPhysicalDeviceMirPresentationSupportKHR'])] else: @@ -1741,7 +1717,7 @@ class UniqueObjectsSubcommand(Subcommand): 'vkGetPhysicalDeviceSurfaceFormatsKHR', 'vkGetPhysicalDeviceSurfacePresentModesKHR', 'vkCreateAndroidSurfaceKHR'])] - elif self.wsi == 'Xcb': + elif self.wsi == 'Xcb' or self.wsi == 'Xlib' or self.wsi == 'Wayland' or self.wsi == 'Mir': instance_extensions=[('wsi_enabled', ['vkDestroySurfaceKHR', 'vkGetPhysicalDeviceSurfaceSupportKHR', @@ -1749,34 +1725,14 @@ class UniqueObjectsSubcommand(Subcommand): 'vkGetPhysicalDeviceSurfaceFormatsKHR', 'vkGetPhysicalDeviceSurfacePresentModesKHR', 'vkCreateXcbSurfaceKHR', - ])] - elif self.wsi == 'Xlib': - instance_extensions=[('wsi_enabled', - ['vkDestroySurfaceKHR', - 'vkGetPhysicalDeviceSurfaceSupportKHR', - 'vkGetPhysicalDeviceSurfaceCapabilitiesKHR', - 'vkGetPhysicalDeviceSurfaceFormatsKHR', - 'vkGetPhysicalDeviceSurfacePresentModesKHR', - 'vkCreateXlibSurfaceKHR' - ])] - elif self.wsi == 'Wayland': - instance_extensions=[('wsi_enabled', - ['vkDestroySurfaceKHR', - 'vkGetPhysicalDeviceSurfaceSupportKHR', - 'vkGetPhysicalDeviceSurfaceCapabilitiesKHR', - 'vkGetPhysicalDeviceSurfaceFormatsKHR', - 'vkGetPhysicalDeviceSurfacePresentModesKHR', - 'vkCreateWaylandSurfaceKHR' - ])] - else: #Mir - instance_extensions=[('wsi_enabled', - ['vkDestroySurfaceKHR', - 'vkGetPhysicalDeviceSurfaceSupportKHR', - 'vkGetPhysicalDeviceSurfaceCapabilitiesKHR', - 'vkGetPhysicalDeviceSurfaceFormatsKHR', - 'vkGetPhysicalDeviceSurfacePresentModesKHR', + 'vkCreateXlibSurfaceKHR', + 'vkCreateWaylandSurfaceKHR', 'vkCreateMirSurfaceKHR' ])] + else: + print('Error: Undefined DisplayServer') + instance_extensions=[] + body = [self._generate_dispatch_entrypoints("VK_LAYER_EXPORT"), self._generate_layer_gpa_function(extensions, instance_extensions)] |