layers: Rename ambiguous 'wsi_enabled' to 'surface_enabled' in PV
authorChris Forbes <chrisforbes@google.com>
Wed, 2 Nov 2016 04:36:42 +0000 (17:36 +1300)
committerChris Forbes <chrisforbes@google.com>
Mon, 7 Nov 2016 02:25:05 +0000 (15:25 +1300)
Signed-off-by: Chris Forbes <chrisforbes@google.com>
layers/parameter_validation.cpp
layers/parameter_validation_utils.h

index 3e1812e..fe6f925 100644 (file)
@@ -1576,7 +1576,7 @@ static void CheckInstanceRegisterExtensions(const VkInstanceCreateInfo *pCreateI
 
     for (uint32_t i = 0; i < pCreateInfo->enabledExtensionCount; i++) {
         if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_SURFACE_EXTENSION_NAME) == 0) {
-            instance_extension_map[dispatch_table].wsi_enabled = true;
+            instance_extension_map[dispatch_table].surface_enabled = true;
         }
 #ifdef VK_USE_PLATFORM_XLIB_KHR
         if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_XLIB_SURFACE_EXTENSION_NAME) == 0) {
@@ -5608,7 +5608,7 @@ static PFN_vkVoidFunction InterceptWsiEnabledCommand(const char *name, VkInstanc
     };
 
     VkLayerInstanceDispatchTable *pTable = get_dispatch_table(pc_instance_table_map, instance);
-    if (instance_extension_map[pTable].wsi_enabled) {
+    if (instance_extension_map[pTable].surface_enabled) {
         for (size_t i = 0; i < ARRAY_SIZE(wsi_instance_commands); i++) {
             if (!strcmp(wsi_instance_commands[i].name, name))
                 return wsi_instance_commands[i].proc;
index be27cbf..a3aa113 100644 (file)
@@ -73,7 +73,7 @@ const char LayerName[] = "ParameterValidation";
 
 // Enables for display-related instance extensions
 struct instance_extension_enables {
-    bool wsi_enabled;
+    bool surface_enabled;
     bool xlib_enabled;
     bool xcb_enabled;
     bool wayland_enabled;