layers: Do not advertise support for WSI

Layers that do not implement WSI features yet can 'trace'
WSI calls do not need to advertise WSI as an extension.
Any WSI calls made will land in the layer if it hooks
those calls. Otherwise should not care about WSI.
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index fe17fd2..817cb81 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1000,12 +1000,6 @@
         "Validation",
         0x10,
         "Validation layer: MemTracker",
-    },
-    {
-        VK_STRUCTURE_TYPE_EXTENSION_PROPERTIES,
-        VK_WSI_LUNARG_EXTENSION_NAME,
-        0x10,
-        "Validation layer: MemTracker",
     }
 };
 
diff --git a/layers/screenshot.cpp b/layers/screenshot.cpp
index a102169..d46205b 100644
--- a/layers/screenshot.cpp
+++ b/layers/screenshot.cpp
@@ -328,12 +328,6 @@
         "ScreenShot",
         0x10,
         "Layer: ScreenShot",
-    },
-    {
-        VK_STRUCTURE_TYPE_EXTENSION_PROPERTIES,
-        VK_WSI_LUNARG_EXTENSION_NAME,
-        0x10,
-        "Layer: Screenshot",
     }
 
 };
diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index de976cd..a9973c0 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -252,23 +252,17 @@
     def _gen_layer_get_physical_device_extension_props(self, layer="Generic"):
         gpdep_body = []
         if layer == 'APIDump' or layer == 'Generic':
-            gpdep_body.append('#define LAYER_DEV_EXT_ARRAY_SIZE 2')
+            gpdep_body.append('#define LAYER_DEV_EXT_ARRAY_SIZE 1')
             gpdep_body.append('static const VkExtensionProperties layerDevExts[LAYER_DEV_EXT_ARRAY_SIZE] = {')
             gpdep_body.append('    {')
             gpdep_body.append('        VK_STRUCTURE_TYPE_EXTENSION_PROPERTIES,')
             gpdep_body.append('        "%s",' % layer)
             gpdep_body.append('        0x10,')
             gpdep_body.append('        "layer: %s",' % layer)
-            gpdep_body.append('    },')
-            gpdep_body.append('    {')
-            gpdep_body.append('        VK_STRUCTURE_TYPE_EXTENSION_PROPERTIES,')
-            gpdep_body.append('        VK_WSI_LUNARG_EXTENSION_NAME,')
-            gpdep_body.append('        0x10,')
-            gpdep_body.append('        "layer: %s",' % layer)
             gpdep_body.append('    }')
             gpdep_body.append('};')
         elif layer == 'ObjectTracker':
-            gpdep_body.append('#define LAYER_DEV_EXT_ARRAY_SIZE 3')
+            gpdep_body.append('#define LAYER_DEV_EXT_ARRAY_SIZE 2')
             gpdep_body.append('static const VkExtensionProperties layerDevExts[LAYER_DEV_EXT_ARRAY_SIZE] = {')
             gpdep_body.append('    {')
             gpdep_body.append('        VK_STRUCTURE_TYPE_EXTENSION_PROPERTIES,')
@@ -278,12 +272,6 @@
             gpdep_body.append('    },')
             gpdep_body.append('    {')
             gpdep_body.append('        VK_STRUCTURE_TYPE_EXTENSION_PROPERTIES,')
-            gpdep_body.append('        VK_WSI_LUNARG_EXTENSION_NAME,')
-            gpdep_body.append('        0x10,')
-            gpdep_body.append('        "layer: %s",' % layer)
-            gpdep_body.append('    },')
-            gpdep_body.append('    {')
-            gpdep_body.append('        VK_STRUCTURE_TYPE_EXTENSION_PROPERTIES,')
             gpdep_body.append('        "Validation",')
             gpdep_body.append('        0x10,')
             gpdep_body.append('        "layer: %s",' % layer)