diff options
author | James Farrell <jamesfarrell@google.com> | 2023-01-19 20:23:21 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-01-19 20:23:29 +0000 |
commit | 2222fa5818324771ceb99fd8802e54a50a2fb1a4 (patch) | |
tree | 1ae91df59da342959b75efa0a6bfa467038a78de /SPIRV/SpvTools.cpp | |
parent | 3413ac75f77bea1fb8cc7f04fd83a62384e1d34e (diff) | |
download | glslang-master-ndk.tar.gz |
Revert "Merge remote-tracking branch 'aosp/upstream-master' into..."ndk-r27-rc1ndk-r26dndk-r26cndk-r26bndk-r26-rc1ndk-r26-beta1ndk-r26ndk-r27-releasendk-r26-releasemaster-ndk
Revert submission 2388945-update-shaderc
Reason for revert: Breaks NDK build on darwin.
Reverted changes: /q/submissionid:2388945-update-shaderc
Change-Id: I7e65acd5f2a56fdd82f921a7cdce50e24c68e553
Diffstat (limited to 'SPIRV/SpvTools.cpp')
-rw-r--r-- | SPIRV/SpvTools.cpp | 52 |
1 files changed, 1 insertions, 51 deletions
diff --git a/SPIRV/SpvTools.cpp b/SPIRV/SpvTools.cpp index ff04f4f9..8cc17cca 100644 --- a/SPIRV/SpvTools.cpp +++ b/SPIRV/SpvTools.cpp @@ -212,7 +212,7 @@ void SpirvToolsTransform(const glslang::TIntermediate& intermediate, std::vector optimizer.RegisterPass(spvtools::CreateInterpolateFixupPass()); if (options->optimizeSize) { optimizer.RegisterPass(spvtools::CreateRedundancyEliminationPass()); - optimizer.RegisterPass(spvtools::CreateEliminateDeadInputComponentsSafePass()); + optimizer.RegisterPass(spvtools::CreateEliminateDeadInputComponentsPass()); } optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass()); optimizer.RegisterPass(spvtools::CreateCFGCleanupPass()); @@ -223,56 +223,6 @@ void SpirvToolsTransform(const glslang::TIntermediate& intermediate, std::vector optimizer.Run(spirv.data(), spirv.size(), &spirv, spvOptOptions); } -bool SpirvToolsAnalyzeDeadOutputStores(spv_target_env target_env, std::vector<unsigned int>& spirv, - std::unordered_set<uint32_t>* live_locs, - std::unordered_set<uint32_t>* live_builtins, - spv::SpvBuildLogger*) -{ - spvtools::Optimizer optimizer(target_env); - optimizer.SetMessageConsumer(OptimizerMesssageConsumer); - - optimizer.RegisterPass(spvtools::CreateAnalyzeLiveInputPass(live_locs, live_builtins)); - - spvtools::OptimizerOptions spvOptOptions; - optimizer.SetTargetEnv(target_env); - spvOptOptions.set_run_validator(false); - return optimizer.Run(spirv.data(), spirv.size(), &spirv, spvOptOptions); -} - -void SpirvToolsEliminateDeadOutputStores(spv_target_env target_env, std::vector<unsigned int>& spirv, - std::unordered_set<uint32_t>* live_locs, - std::unordered_set<uint32_t>* live_builtins, - spv::SpvBuildLogger*) -{ - spvtools::Optimizer optimizer(target_env); - optimizer.SetMessageConsumer(OptimizerMesssageConsumer); - - optimizer.RegisterPass(spvtools::CreateEliminateDeadOutputStoresPass(live_locs, live_builtins)); - optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass(false, true)); - optimizer.RegisterPass(spvtools::CreateEliminateDeadOutputComponentsPass()); - optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass(false, true)); - - spvtools::OptimizerOptions spvOptOptions; - optimizer.SetTargetEnv(target_env); - spvOptOptions.set_run_validator(false); - optimizer.Run(spirv.data(), spirv.size(), &spirv, spvOptOptions); -} - -void SpirvToolsEliminateDeadInputComponents(spv_target_env target_env, std::vector<unsigned int>& spirv, - spv::SpvBuildLogger*) -{ - spvtools::Optimizer optimizer(target_env); - optimizer.SetMessageConsumer(OptimizerMesssageConsumer); - - optimizer.RegisterPass(spvtools::CreateEliminateDeadInputComponentsPass()); - optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass()); - - spvtools::OptimizerOptions spvOptOptions; - optimizer.SetTargetEnv(target_env); - spvOptOptions.set_run_validator(false); - optimizer.Run(spirv.data(), spirv.size(), &spirv, spvOptOptions); -} - // Apply the SPIRV-Tools optimizer to strip debug info from SPIR-V. This is implicitly done by // SpirvToolsTransform if spvOptions->stripDebugInfo is set, but can be called separately if // optimization is disabled. |