Use the new VK_LAYER_KHRONOS_validation layer

In more recent SDKs the VK_LAYER_LUNARG_standard_validation
meta layer has been replaced by the VK_LAYER_KHRONOS_validation
layer.

The latest SDK documentation about this can be found here:
https://vulkan.lunarg.com/doc/sdk/1.1.121.2/windows/validation_layers.html

It also notes that a bunch of the other individual validation layers
have also been deprecated. I've commented this fact in CTS, but
have not removed them because CTS might be used with older SDKs.

Affects all CTS with --deqp-validation=enable:

dEQP-VK.*

Components: Framework, Vulkan

VK-GL-CTS issue: -1

Change-Id: I6925f7dc55f10d7a00d1089effe491b9caebe909

diff --git a/external/vulkancts/modules/vulkan/vktCustomInstancesDevices.cpp b/external/vulkancts/modules/vulkan/vktCustomInstancesDevices.cpp
index ef13a91..f2473a3 100644 (file)
--- a/external/vulkancts/modules/vulkan/vktCustomInstancesDevices.cpp
+++ b/external/vulkancts/modules/vulkan/vktCustomInstancesDevices.cpp
@@ -45,17 +45,18 @@ namespace
 
 vector<const char*> getValidationLayers (const vector<vk::VkLayerProperties>& supportedLayers)
 {
-       static const char*      s_magicLayer            = "VK_LAYER_LUNARG_standard_validation";
+       static const char*      s_magicLayer            = "VK_LAYER_KHRONOS_validation";
        static const char*      s_defaultLayers[]       =
        {
-               "VK_LAYER_GOOGLE_threading",
-               "VK_LAYER_LUNARG_parameter_validation",
+               "VK_LAYER_LUNARG_standard_validation",          // Deprecated by at least Vulkan SDK 1.1.121.
+               "VK_LAYER_GOOGLE_threading",                            // Deprecated by at least Vulkan SDK 1.1.121.
+               "VK_LAYER_LUNARG_parameter_validation",         // Deprecated by at least Vulkan SDK 1.1.121.
                "VK_LAYER_LUNARG_device_limits",
-               "VK_LAYER_LUNARG_object_tracker",
+               "VK_LAYER_LUNARG_object_tracker",                       // Deprecated by at least Vulkan SDK 1.1.121.
                "VK_LAYER_LUNARG_image",
-               "VK_LAYER_LUNARG_core_validation",
+               "VK_LAYER_LUNARG_core_validation",                      // Deprecated by at least Vulkan SDK 1.1.121.
                "VK_LAYER_LUNARG_swapchain",
-               "VK_LAYER_GOOGLE_unique_objects"
+               "VK_LAYER_GOOGLE_unique_objects"                        // Deprecated by at least Vulkan SDK 1.1.121.
        };
 
        vector<const char*>     enabledLayers;