diff options
| author | Courtney Goeltzenleuchter <courtneygo@google.com> | 2016-02-08 11:16:21 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2016-02-18 14:49:36 -0700 |
| commit | ff0f00213f973bb000aadd671898b0f9d356d4df (patch) | |
| tree | 645d780958c5a7c71b5443fe5b6026d10d06f3fb | |
| parent | 5170a4c0028632ebb3fa197c22970aed9215f817 (diff) | |
| download | usermoji-ff0f00213f973bb000aadd671898b0f9d356d4df.tar.xz | |
layers: MR221: Correct name for unique_objects layer
| -rwxr-xr-x | vk-layer-generate.py | 28 | ||||
| -rwxr-xr-x | vulkan.py | 5 |
2 files changed, 21 insertions, 12 deletions
diff --git a/vk-layer-generate.py b/vk-layer-generate.py index 8f44ee1a..d03029d3 100755 --- a/vk-layer-generate.py +++ b/vk-layer-generate.py @@ -384,10 +384,16 @@ class Subcommand(object): 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 @@ class Subcommand(object): 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)') @@ -1203,10 +1203,7 @@ import sys 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] |