Add DeadBranchElim before MergeReturn in legalization.
authorGregF <greg@LunarG.com>
Thu, 8 Nov 2018 17:35:45 +0000 (10:35 -0700)
committerGregF <greg@LunarG.com>
Thu, 8 Nov 2018 17:35:45 +0000 (10:35 -0700)
MergeReturn now requires this or could throw an error.

SPIRV/SpvTools.cpp

index bc9bf9e..05f234c 100755 (executable)
@@ -152,6 +152,7 @@ void SpirvToolsLegalize(const glslang::TIntermediate&, std::vector<unsigned int>
             out << std::endl;
         });
 
+    optimizer.RegisterPass(spvtools::CreateDeadBranchElimPass());
     optimizer.RegisterPass(spvtools::CreateMergeReturnPass());
     optimizer.RegisterPass(spvtools::CreateInlineExhaustivePass());
     optimizer.RegisterPass(spvtools::CreateEliminateDeadFunctionsPass());