tests: Switch to m_use_glsl and cleanup option parsing
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 1269e82..a6b0d3a 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -1827,7 +1827,7 @@
     VK_DBG_MSG_TYPE msgType;
     std::string msgString;
     ASSERT_NO_FATAL_FAILURE(InitState());
-    ScopedUseSpv spv(true);
+    ScopedUseGlsl useGlsl(false);
 
     char const *vsSource =
         "#version 140\n"
@@ -1877,7 +1877,7 @@
     VK_DBG_MSG_TYPE msgType;
     std::string msgString;
     ASSERT_NO_FATAL_FAILURE(InitState());
-    ScopedUseSpv spv(true);
+    ScopedUseGlsl useGlsl(false);
 
     char const *vsSource =
         "#version 140\n"
@@ -1926,7 +1926,7 @@
     VK_DBG_MSG_TYPE msgType;
     std::string msgString;
     ASSERT_NO_FATAL_FAILURE(InitState());
-    ScopedUseSpv spv(true);
+    ScopedUseGlsl useGlsl(false);
 
     char const *vsSource =
         "#version 140\n"
@@ -1977,7 +1977,7 @@
     VK_DBG_MSG_TYPE msgType;
     std::string msgString;
     ASSERT_NO_FATAL_FAILURE(InitState());
-    ScopedUseSpv spv(true);
+    ScopedUseGlsl useGlsl(false);
 
     VkVertexInputBindingDescription input_binding;
     memset(&input_binding, 0, sizeof(input_binding));
@@ -2035,7 +2035,7 @@
     VK_DBG_MSG_TYPE msgType;
     std::string msgString;
     ASSERT_NO_FATAL_FAILURE(InitState());
-    ScopedUseSpv spv(true);
+    ScopedUseGlsl useGlsl(false);
 
     char const *vsSource =
         "#version 140\n"
@@ -2084,7 +2084,7 @@
     VK_DBG_MSG_TYPE msgType;
     std::string msgString;
     ASSERT_NO_FATAL_FAILURE(InitState());
-    ScopedUseSpv spv(true);
+    ScopedUseGlsl useGlsl(false);
 
     VkVertexInputBindingDescription input_binding;
     memset(&input_binding, 0, sizeof(input_binding));
@@ -2143,7 +2143,7 @@
     VK_DBG_MSG_TYPE msgType;
     std::string msgString;
     ASSERT_NO_FATAL_FAILURE(InitState());
-    ScopedUseSpv spv(true);
+    ScopedUseGlsl useGlsl(false);
 
     /* Two binding descriptions for binding 0 */
     VkVertexInputBindingDescription input_bindings[2];
@@ -2202,7 +2202,7 @@
     VK_DBG_MSG_TYPE msgType;
     std::string msgString;
     ASSERT_NO_FATAL_FAILURE(InitState());
-    ScopedUseSpv spv(true);
+    ScopedUseGlsl useGlsl(false);
 
     char const *vsSource =
         "#version 140\n"
@@ -2258,7 +2258,7 @@
     VK_DBG_MSG_TYPE msgType;
     std::string msgString;
     ASSERT_NO_FATAL_FAILURE(InitState());
-    ScopedUseSpv spv(true);
+    ScopedUseGlsl useGlsl(false);
 
     char const *vsSource =
         "#version 140\n"
@@ -2306,7 +2306,7 @@
     VK_DBG_MSG_TYPE msgType;
     std::string msgString;
     ASSERT_NO_FATAL_FAILURE(InitState());
-    ScopedUseSpv spv(true);
+    ScopedUseGlsl useGlsl(false);
 
     char const *vsSource =
         "#version 140\n"
@@ -2359,7 +2359,7 @@
     VK_DBG_MSG_TYPE msgType;
     std::string msgString;
     ASSERT_NO_FATAL_FAILURE(InitState());
-    ScopedUseSpv spv(true);
+    ScopedUseGlsl useGlsl(false);
 
     char const *vsSource =
         "#version 140\n"
@@ -2410,7 +2410,7 @@
     std::string msgString;
     ASSERT_NO_FATAL_FAILURE(InitState());
     /* Intentionally provided GLSL rather than compiling to SPIRV first */
-    ScopedUseSpv spv(false);
+    ScopedUseGlsl useGlsl(true);
 
     char const *vsSource =
         "#version 140\n"