commit a1a497ffe79218d8239a913d29ee26e74d201220
author johnkslang <john@johnkgo.com> Tue Aug 04 03:00:32 2020 -0600
committer johnkslang <john@johnkgo.com> Tue Aug 04 03:00:32 2020 -0600
tree 8c870b4e1e33e4ed5680307abdeff80646c54950
parent f881f08358b098b8bd1e3b402ab35b5177aa76b9

SPV: Use more correct SPV-Tools environment, partially addressing #2290

SPIRV/SpvTools.cpp

diff --git a/SPIRV/SpvTools.cpp b/SPIRV/SpvTools.cpp
index 6d4d9ef..112ac33 100644
--- a/SPIRV/SpvTools.cpp
+++ b/SPIRV/SpvTools.cpp
@@ -165,7 +165,7 @@
 void SpirvToolsTransform(const glslang::TIntermediate& intermediate, std::vector<unsigned int>& spirv,
                          spv::SpvBuildLogger* logger, const SpvOptions* options)
 {
-    spv_target_env target_env = SPV_ENV_UNIVERSAL_1_2;
+    spv_target_env target_env = MapToSpirvToolsEnv(intermediate.getSpv(), logger);
 
     spvtools::Optimizer optimizer(target_env);
     optimizer.SetMessageConsumer(OptimizerMesssageConsumer);
@@ -223,7 +223,7 @@
 void SpirvToolsStripDebugInfo(const glslang::TIntermediate& intermediate,
         std::vector<unsigned int>& spirv, spv::SpvBuildLogger* logger)
 {
-    spv_target_env target_env = SPV_ENV_UNIVERSAL_1_2;
+    spv_target_env target_env = MapToSpirvToolsEnv(intermediate.getSpv(), logger);
 
     spvtools::Optimizer optimizer(target_env);
     optimizer.SetMessageConsumer(OptimizerMesssageConsumer);