commit 2cf94fd0f4a68c6f762bf18097e8f91a1119798c
author Mark Lobodzinski <mark@lunarg.com> Mon Mar 18 14:53:33 2019 -0600
committer Mark Lobodzinski <mark@lunarg.com> Tue Mar 19 15:44:51 2019 -0600
tree ab4ae59541d6f7ec446b6c3b6d76ad68a3c2a6b5
parent aa6fd7b8afb5c53e01f56b0badd92d3a8813330b

tests: Make khronos layer default for LVTs

The option has changed to '--uberlayer_disable', which if used will
explicitly load the old five individual layers.

Change-Id: Ieddb56ed28000c381f1a3bfd90189168f6c873be

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 2af46c7..cbfb262 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -468,16 +468,14 @@
         // Add default instance extensions to the list
         m_instance_extension_names.push_back(VK_EXT_DEBUG_REPORT_EXTENSION_NAME);
 
-        // Use Threading layer first to protect others from
-        // ThreadCommandBufferCollision test
-        if (VkTestFramework::m_khronos_layer) {
-            m_instance_layer_names.push_back("VK_LAYER_KHRONOS_validation");
-        } else {
+        if (VkTestFramework::m_khronos_layer_disable) {
             m_instance_layer_names.push_back("VK_LAYER_GOOGLE_threading");
             m_instance_layer_names.push_back("VK_LAYER_LUNARG_parameter_validation");
             m_instance_layer_names.push_back("VK_LAYER_LUNARG_object_tracker");
             m_instance_layer_names.push_back("VK_LAYER_LUNARG_core_validation");
             m_instance_layer_names.push_back("VK_LAYER_GOOGLE_unique_objects");
+        } else {
+            m_instance_layer_names.push_back("VK_LAYER_KHRONOS_validation");
         }
         if (VkTestFramework::m_devsim_layer) {
             if (InstanceLayerSupported("VK_LAYER_LUNARG_device_simulation")) {

tests/vktestframework.cpp

diff --git a/tests/vktestframework.cpp b/tests/vktestframework.cpp
index 6620c7f..0d9dd58 100644
--- a/tests/vktestframework.cpp
+++ b/tests/vktestframework.cpp
@@ -144,7 +144,7 @@
 bool VkTestFramework::m_strip_spv = false;
 bool VkTestFramework::m_do_everything_spv = false;
 bool VkTestFramework::m_devsim_layer = false;
-bool VkTestFramework::m_khronos_layer = false;
+bool VkTestFramework::m_khronos_layer_disable = false;
 int VkTestFramework::m_width = 0;
 int VkTestFramework::m_height = 0;
 
@@ -165,8 +165,8 @@
             m_canonicalize_spv = true;
         else if (optionMatch("--devsim", argv[i]))
             m_devsim_layer = true;
-        else if (optionMatch("--uberlayer", argv[i]))
-            m_khronos_layer = true;
+        else if (optionMatch("--disable_uberlayer", argv[i]))
+            m_khronos_layer_disable = true;
         else if (optionMatch("--help", argv[i]) || optionMatch("-h", argv[i])) {
             printf("\nOther options:\n");
             printf(

tests/vktestframework.h

diff --git a/tests/vktestframework.h b/tests/vktestframework.h
index 577a66f..552432f 100644
--- a/tests/vktestframework.h
+++ b/tests/vktestframework.h
@@ -74,7 +74,7 @@
     static bool m_strip_spv;
     static bool m_do_everything_spv;
     static bool m_devsim_layer;
-    static bool m_khronos_layer;
+    static bool m_khronos_layer_disable;
 
     char **ReadFileData(const char *fileName);
     void FreeFileData(char **data);

tests/vktestframeworkandroid.cpp

diff --git a/tests/vktestframeworkandroid.cpp b/tests/vktestframeworkandroid.cpp
index bcf3592..bdfb405 100644
--- a/tests/vktestframeworkandroid.cpp
+++ b/tests/vktestframeworkandroid.cpp
@@ -26,7 +26,7 @@
 
 // Define static elements
 bool VkTestFramework::m_devsim_layer = false;
-bool VkTestFramework::m_khronos_layer = false;
+bool VkTestFramework::m_khronos_layer_disable = false;
 
 VkFormat VkTestFramework::GetFormat(VkInstance instance, vk_testing::Device *device) {
     VkFormatProperties format_props;

tests/vktestframeworkandroid.h

diff --git a/tests/vktestframeworkandroid.h b/tests/vktestframeworkandroid.h
index 72fd56a..06dcb22 100644
--- a/tests/vktestframeworkandroid.h
+++ b/tests/vktestframeworkandroid.h
@@ -47,7 +47,7 @@
                    bool debug = false);
     bool ASMtoSPV(const spv_target_env target_env, const uint32_t options, const char *pasm, std::vector<unsigned int> &spv);
     static bool m_devsim_layer;
-    static bool m_khronos_layer;
+    static bool m_khronos_layer_disable;
 };
 
 class TestEnvironment : public ::testing::Environment {