aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCourtney Goeltzenleuchter <courtney@LunarG.com>2015-06-26 16:43:44 -0600
committerCourtney Goeltzenleuchter <courtney@LunarG.com>2015-06-29 11:28:17 -0600
commit1f221b264ed51952fcecd34af0bfa405b0f27734 (patch)
treeef9ef26220d3d259c84f71cc01840b553fa6cd69
parent0ddf06ff5c6d5991a8d5906acd6e0b687211c47c (diff)
downloadusermoji-1f221b264ed51952fcecd34af0bfa405b0f27734.tar.xz
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.
-rw-r--r--layers/mem_tracker.cpp6
-rw-r--r--layers/screenshot.cpp6
-rwxr-xr-xvk-layer-generate.py16
3 files changed, 2 insertions, 26 deletions
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index fe17fd22..817cb81a 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1000,12 +1000,6 @@ static const VkExtensionProperties mtDevExts[MEM_TRACKER_LAYER_DEV_EXT_ARRAY_SIZ
"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 a1021698..d46205b3 100644
--- a/layers/screenshot.cpp
+++ b/layers/screenshot.cpp
@@ -328,12 +328,6 @@ static const VkExtensionProperties ssExts[SCREENSHOT_LAYER_EXT_ARRAY_SIZE] = {
"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 de976cd8..a9973c00 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -252,23 +252,17 @@ class Subcommand(object):
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 @@ class Subcommand(object):
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)