commit 72685bdf71d7dc6dc6e035b0493a441156f0499b
author Chia-I Wu <olv@google.com> Mon May 16 10:13:45 2016 +0800
committer Tobin Ehlis <tobine@google.com> Tue May 24 06:29:14 2016 -0600
tree b8960f56e9ab1b4e3deda7afa2060ebb843631a1
parent 33b4ce81ecc946dc3f031ecc4fabb2d277781948

threading: add threading::layerProps

Replace globalLayerProps and deviceLayerProps with layerProps.  There is
no plan to define more than one layer in the same namespace.

layers/threading.cpp

diff --git a/layers/threading.cpp b/layers/threading.cpp
index 0f8113f..c5242c7 100644
--- a/layers/threading.cpp
+++ b/layers/threading.cpp
@@ -161,17 +161,11 @@
 static const VkExtensionProperties threading_extensions[] = {
     {VK_EXT_DEBUG_REPORT_EXTENSION_NAME, VK_EXT_DEBUG_REPORT_SPEC_VERSION}};
 
-static const VkLayerProperties globalLayerProps[] = {{
+static const VkLayerProperties layerProps = {
     "VK_LAYER_GOOGLE_threading",
     VK_LAYER_API_VERSION, // specVersion
     1, "Google Validation Layer",
-}};
-
-static const VkLayerProperties deviceLayerProps[] = {{
-    "VK_LAYER_GOOGLE_threading",
-    VK_LAYER_API_VERSION, // specVersion
-    1, "Google Validation Layer",
-}};
+};
 
 static inline PFN_vkVoidFunction layer_intercept_proc(const char *name) {
     for (int i = 0; i < sizeof(procmap) / sizeof(procmap[0]); i++) {
@@ -365,12 +359,12 @@
 }
 
 VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceLayerProperties(uint32_t *pCount, VkLayerProperties *pProperties) {
-    return util_GetLayerProperties(ARRAY_SIZE(threading::globalLayerProps), threading::globalLayerProps, pCount, pProperties);
+    return util_GetLayerProperties(1, &threading::layerProps, pCount, pProperties);
 }
 
 VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL
 vkEnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, uint32_t *pCount, VkLayerProperties *pProperties) {
-    return util_GetLayerProperties(ARRAY_SIZE(threading::deviceLayerProps), threading::deviceLayerProps, pCount, pProperties);
+    return util_GetLayerProperties(1, &threading::layerProps, pCount, pProperties);
 }
 
 VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice,