cmake: GH PR17, Improve error detection for displayserver selection

3 files changed, 13 insertions, 4 deletions

diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index ce117564..9ddb2c1c 100644
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -7,9 +7,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 		set(ENV{VULKAN_WSI} "Xlib")
 	elseif (BUILD_WSI_WAYLAND_SUPPORT)
 		set(ENV{VULKAN_WSI} "Wayland")
-	else()
-		# Mir WSI Case
+	elseif (BUILD_WSI_MIR_SUPPORT)
 		set(ENV{VULKAN_WSI} "Mir")
+    else()
+        message(FATAL_ERROR "Undefined DisplayServer Type")
 	endif()
 endif()
 
diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index c16c6bcf..01b040b1 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -1443,7 +1443,7 @@ class ObjectTrackerSubcommand(Subcommand):
                                    'vkGetPhysicalDeviceSurfacePresentModesKHR',
                                    'vkCreateWaylandSurfaceKHR',
                                    'vkGetPhysicalDeviceWaylandPresentationSupportKHR'])]
-        else: #Mir
+        elif self.wsi == 'Mir':
             instance_extensions=[('msg_callback_get_proc_addr', []),
                                   ('wsi_enabled',
                                   ['vkGetPhysicalDeviceSurfaceSupportKHR',
@@ -1452,6 +1452,10 @@ class ObjectTrackerSubcommand(Subcommand):
                                    'vkGetPhysicalDeviceSurfacePresentModesKHR',
                                    'vkCreateMirSurfaceKHR',
                                    'vkGetPhysicalDeviceMirPresentationSupportKHR'])]
+        else:
+            print('Error: Undefined DisplayServer')
+            instance_extensions=[]
+
         body = [self.generate_maps(),
                 self.generate_procs(),
                 self.generate_destroy_instance(),
diff --git a/vulkan.py b/vulkan.py
index 683f8acf..6a538dba 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -1280,9 +1280,13 @@ else :
     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, lunarg_debug_marker]
-    else: #Mir
+    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, lunarg_debug_marker]
+    else:
+        print('Error: Undefined DisplayServer')
+        extensions = []
+        extensions_all = []
 
 object_dispatch_list = [
     "VkInstance",