commit 9d09ee9df581475932d4bc537ec5b6f4a72ae732
author Karl Schultz <karl@lunarg.com> Fri Oct 19 14:31:49 2018 -0600
committer Karl Schultz <karl@lunarg.com> Mon Jan 14 12:18:03 2019 -0700
tree e07638d59e8e6d7502e95ee7bf63b34819b198e9
parent 7b024b45a0a796ba271795435fe75a323ff87a75

tests: Add features to support GPU validation tests

- Add Instance pNext init to RenderFramework
- Add function to check if using the Mock ICD
- Add "-g" option to VkShaderObj

tests/vktestframework.cpp

diff --git a/tests/vktestframework.cpp b/tests/vktestframework.cpp
index 6a065cd..9819a3b 100644
--- a/tests/vktestframework.cpp
+++ b/tests/vktestframework.cpp
@@ -754,7 +754,8 @@
 // Compile a given string containing GLSL into SPV for use by VK
 // Return value of false means an error was encountered.
 //
-bool VkTestFramework::GLSLtoSPV(const VkShaderStageFlagBits shader_type, const char *pshader, std::vector<unsigned int> &spirv) {
+bool VkTestFramework::GLSLtoSPV(const VkShaderStageFlagBits shader_type, const char *pshader, std::vector<unsigned int> &spirv,
+                                bool debug) {
     glslang::TProgram program;
     const char *shaderStrings[1];
 
@@ -767,6 +768,9 @@
     EShMessages messages = EShMsgDefault;
     SetMessageOptions(messages);
     messages = static_cast<EShMessages>(messages | EShMsgSpvRules | EShMsgVulkanRules);
+    if (debug) {
+        messages = static_cast<EShMessages>(messages | EShMsgDebugInfo);
+    }
 
     EShLanguage stage = FindLanguage(shader_type);
     glslang::TShader *shader = new glslang::TShader(stage);
@@ -803,7 +807,11 @@
         program.dumpReflection();
     }
 
-    glslang::GlslangToSpv(*program.getIntermediate(stage), spirv);
+    glslang::SpvOptions spv_options;
+    if (debug) {
+        spv_options.generateDebugInfo = true;
+    }
+    glslang::GlslangToSpv(*program.getIntermediate(stage), spirv, &spv_options);
 
     //
     // Test the different modes of SPIR-V modification