Set glslang SPV/Vulkan flags
authorJeff Bolz <jbolz@nvidia.com>
Thu, 17 Dec 2015 06:20:27 +0000 (06:20 +0000)
committerJeff Bolz <jbolz@nvidia.com>
Thu, 17 Dec 2015 06:20:27 +0000 (06:20 +0000)
external/vulkancts/framework/vulkan/vkGlslToSpirV.cpp

index 6ead17e..c98d50f 100644 (file)
@@ -233,7 +233,7 @@ void glslToSpirV (const glu::ProgramSources& program, std::vector<deUint8>* dst,
 
                        {
                                const deUint64  compileStartTime        = deGetMicroseconds();
-                               const int               compileRes                      = shader.parse(&builtinRes, 110, false, EShMsgSpvRules);
+                               const int               compileRes                      = shader.parse(&builtinRes, 110, false, (EShMessages)(EShMsgSpvRules | EShMsgVulkanRules));
                                glu::ShaderInfo shaderBuildInfo;
 
                                shaderBuildInfo.type                    = (glu::ShaderType)shaderType;
@@ -250,7 +250,7 @@ void glslToSpirV (const glu::ProgramSources& program, std::vector<deUint8>* dst,
 
                        {
                                const deUint64  linkStartTime   = deGetMicroseconds();
-                               const int               linkRes                 = program.link(EShMsgDefault);
+                               const int               linkRes                 = program.link((EShMessages)(EShMsgSpvRules | EShMsgVulkanRules));
 
                                buildInfo->program.infoLog              = program.getInfoLog(); // \todo [2015-11-05 scygan] Include debug log?
                                buildInfo->program.linkOk               = (linkRes != 0);