commit 7b76aeec4418dc955854685839685cab5df55f1a
author Courtney Goeltzenleuchter <courtneygo@google.com> Mon Feb 08 11:16:21 2016 -0700
committer Jon Ashburn <jon@lunarg.com> Thu Feb 18 14:49:36 2016 -0700
tree d6fc07f382707926bca0e8f142bc415353972630
parent c6c611a326ca2ba214cbb21b96ba548af4f796bf

layers: MR221: Correct name for unique_objects layer

vk-layer-generate.py

diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index 8f44ee1..d03029d 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -384,10 +384,16 @@
         ggep_body.append('%s' % self.lineinfo.get())
         ggep_body.append('static const VkLayerProperties globalLayerProps[] = {')
         ggep_body.append('    {')
-        ggep_body.append('        "VK_LAYER_LUNARG_%s",' % layer_name)
-        ggep_body.append('        VK_API_VERSION, // specVersion')
-        ggep_body.append('        1, // implementationVersion')
-        ggep_body.append('        "LunarG Validation Layer"')
+        if self.layer_name in ['threading', 'unique_objects']:
+          ggep_body.append('        "VK_LAYER_GOOGLE_%s",' % layer)
+          ggep_body.append('        VK_API_VERSION, // specVersion')
+          ggep_body.append('        1, // implementationVersion')
+          ggep_body.append('        "Google Validation Layer"')
+        else:
+          ggep_body.append('        "VK_LAYER_LUNARG_%s",' % layer)
+          ggep_body.append('        VK_API_VERSION, // specVersion')
+          ggep_body.append('        1, // implementationVersion')
+          ggep_body.append('        "LunarG Validation Layer"')
         ggep_body.append('    }')
         ggep_body.append('};')
         ggep_body.append('')
@@ -404,10 +410,16 @@
         gpdlp_body.append('%s' % self.lineinfo.get())
         gpdlp_body.append('static const VkLayerProperties deviceLayerProps[] = {')
         gpdlp_body.append('    {')
-        gpdlp_body.append('        "VK_LAYER_LUNARG_%s",' % layer)
-        gpdlp_body.append('        VK_API_VERSION,')
-        gpdlp_body.append('        1,')
-        gpdlp_body.append('        "LunarG Validation Layer"')
+        if self.layer_name in ['threading', 'unique_objects']:
+          gpdlp_body.append('        "VK_LAYER_GOOGLE_%s",' % layer)
+          gpdlp_body.append('        VK_API_VERSION, // specVersion')
+          gpdlp_body.append('        1, // implementationVersion')
+          gpdlp_body.append('        "Google Validation Layer"')
+        else:
+          gpdlp_body.append('        "VK_LAYER_LUNARG_%s",' % layer)
+          gpdlp_body.append('        VK_API_VERSION, // specVersion')
+          gpdlp_body.append('        1, // implementationVersion')
+          gpdlp_body.append('        "LunarG Validation Layer"')
         gpdlp_body.append('    }')
         gpdlp_body.append('};')
         gpdlp_body.append('VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, uint32_t *pCount, VkLayerProperties* pProperties)')

vulkan.py

diff --git a/vulkan.py b/vulkan.py
index 77fdffb..189be41 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -1203,10 +1203,7 @@
 if sys.platform.startswith('win32'):
     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, lunarg_debug_marker]
-elif sys.platform.startswith('linux'):
-    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, lunarg_debug_marker]
-else: # android
+else: # linux & android
     extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_xcb_surface, ext_khr_android_surface]
     extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_xcb_surface, ext_khr_android_surface, lunarg_debug_report, lunarg_debug_marker]