From 08ccab2a7f42e5e0a82f30531d344df98daa432e Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 13 Dec 2019 11:09:57 +0000
Subject: [PATCH] Prefer VK_LAYER_KHRONOS_validation for debugging if available

---
 util/test/demos/vk/vk_test.cpp | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/util/test/demos/vk/vk_test.cpp b/util/test/demos/vk/vk_test.cpp
index 97a5b2764..fddb3bf75 100644
--- a/util/test/demos/vk/vk_test.cpp
+++ b/util/test/demos/vk/vk_test.cpp
@@ -108,14 +108,30 @@ void VulkanGraphicsTest::Prepare(int argc, char **argv)
 
       if(debugDevice)
       {
+        bool found = false;
+
         for(const VkLayerProperties &layer : supportedLayers)
         {
-          if(!strcmp(layer.layerName, "VK_LAYER_LUNARG_standard_validation"))
+          if(!strcmp(layer.layerName, "VK_LAYER_KHRONOS_validation"))
           {
-            enabledLayers.push_back("VK_LAYER_LUNARG_standard_validation");
+            enabledLayers.push_back("VK_LAYER_KHRONOS_validation");
+            found = true;
             break;
           }
         }
+
+        if(!found)
+        {
+          for(const VkLayerProperties &layer : supportedLayers)
+          {
+            if(!strcmp(layer.layerName, "VK_LAYER_LUNARG_standard_validation"))
+            {
+              enabledLayers.push_back("VK_LAYER_LUNARG_standard_validation");
+              found = true;
+              break;
+            }
+          }
+        }
       }
 
       std::vector<VkExtensionProperties> supportedExts;