From 9153c4bc54dc0810b33213e21e3ea2dbeb74a97b Mon Sep 17 00:00:00 2001 From: Tony Barbour Date: Tue, 12 Apr 2016 13:35:51 -0600 Subject: layers: Include all 4 Linux WSI interfaces Change-Id: I20b0d64c90e6da940f45b31abf0330b2a415655d --- CMakeLists.txt | 2 +- vk-layer-generate.py | 5 ++++- vulkan.py | 19 +++++-------------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35610fec..46940fbc 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") # TODO: Basic support is present for Xlib but is untested. # Mir support is stubbed in but unimplemented and untested. option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON) - option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" OFF) + option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON) option(BUILD_WSI_WAYLAND_SUPPORT "Build Wayland WSI support" OFF) option(BUILD_WSI_MIR_SUPPORT "Build Mir WSI support" OFF) diff --git a/vk-layer-generate.py b/vk-layer-generate.py index 2d04e2ef..205f2bc4 100755 --- a/vk-layer-generate.py +++ b/vk-layer-generate.py @@ -1541,7 +1541,10 @@ class UniqueObjectsSubcommand(Subcommand): # TODO : This is hacky, need to make this a more general-purpose solution for all layers ifdef_dict = {'CreateXcbSurfaceKHR': 'VK_USE_PLATFORM_XCB_KHR', 'CreateAndroidSurfaceKHR': 'VK_USE_PLATFORM_ANDROID_KHR', - 'CreateWin32SurfaceKHR': 'VK_USE_PLATFORM_WIN32_KHR'} + 'CreateWin32SurfaceKHR': 'VK_USE_PLATFORM_WIN32_KHR', + 'CreateXlibSurfaceKHR': 'VK_USE_PLATFORM_XLIB_KHR', + 'CreateWaylandSurfaceKHR': 'VK_USE_PLATFORM_WAYLAND_KHR', + 'CreateMirSurfaceKHR': 'VK_USE_PLATFORM_MIR_KHR'} # Give special treatment to create functions that return multiple new objects # This dict stores array name and size of array custom_create_dict = {'pDescriptorSets' : 'pAllocateInfo->descriptorSetCount'} diff --git a/vulkan.py b/vulkan.py index 11d196ab..ea4040eb 100755 --- a/vulkan.py +++ b/vulkan.py @@ -1233,8 +1233,8 @@ if len(sys.argv) > 3: extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_win32_surface] extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_win32_surface, lunarg_debug_report] elif sys.platform.startswith('linux') and sys.argv[1] != 'Android': - extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_xcb_surface] - extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_xcb_surface, lunarg_debug_report] + extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_xcb_surface, ext_khr_xlib_surface, ext_khr_wayland_surface, ext_khr_mir_surface] + extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_xcb_surface, ext_khr_xlib_surface, ext_khr_wayland_surface, ext_khr_mir_surface, lunarg_debug_report] else: # android extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_android_surface] extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_android_surface, lunarg_debug_report] @@ -1245,18 +1245,9 @@ else : elif sys.argv[1] == 'Android': extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_android_surface] extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_android_surface, lunarg_debug_report] - elif sys.argv[1] == 'Xcb': - extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_xcb_surface] - extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_xcb_surface, lunarg_debug_report] - elif sys.argv[1] == 'Xlib': - extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_xlib_surface] - extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_xlib_surface, lunarg_debug_report] - elif sys.argv[1] == 'Wayland': - extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_wayland_surface] - extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_wayland_surface, lunarg_debug_report] - elif sys.argv[1] == 'Mir': - extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_mir_surface] - extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_mir_surface, lunarg_debug_report] + elif sys.argv[1] == 'Xcb' or sys.argv[1] == 'Xlib' or sys.argv[1] == 'Wayland' or sys.argv[1] == 'Mir': + extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_xcb_surface, ext_khr_xlib_surface, ext_khr_wayland_surface, ext_khr_mir_surface] + extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_xcb_surface, ext_khr_xlib_surface, ext_khr_wayland_surface, ext_khr_mir_surface, lunarg_debug_report] else: print('Error: Undefined DisplayServer') extensions = [] -- cgit v1.2.3