gl_shader_decompiler: Mark ASTDecompiler/ExprDecompiler parameters as const references where applicable

These member functions don't actually modify the input parameter, so we
can make this explicit with the use of const.
master
Lioncash 2019-10-15 18:49:36 +07:00
parent b8a62adcf1
commit 2f2ab9b5bc
1 changed files with 21 additions and 21 deletions

@ -2281,7 +2281,7 @@ class ExprDecompiler {
public: public:
explicit ExprDecompiler(GLSLDecompiler& decomp) : decomp{decomp} {} explicit ExprDecompiler(GLSLDecompiler& decomp) : decomp{decomp} {}
void operator()(VideoCommon::Shader::ExprAnd& expr) { void operator()(const ExprAnd& expr) {
inner += "( "; inner += "( ";
std::visit(*this, *expr.operand1); std::visit(*this, *expr.operand1);
inner += " && "; inner += " && ";
@ -2289,7 +2289,7 @@ public:
inner += ')'; inner += ')';
} }
void operator()(VideoCommon::Shader::ExprOr& expr) { void operator()(const ExprOr& expr) {
inner += "( "; inner += "( ";
std::visit(*this, *expr.operand1); std::visit(*this, *expr.operand1);
inner += " || "; inner += " || ";
@ -2297,17 +2297,17 @@ public:
inner += ')'; inner += ')';
} }
void operator()(VideoCommon::Shader::ExprNot& expr) { void operator()(const ExprNot& expr) {
inner += '!'; inner += '!';
std::visit(*this, *expr.operand1); std::visit(*this, *expr.operand1);
} }
void operator()(VideoCommon::Shader::ExprPredicate& expr) { void operator()(const ExprPredicate& expr) {
const auto pred = static_cast<Tegra::Shader::Pred>(expr.predicate); const auto pred = static_cast<Tegra::Shader::Pred>(expr.predicate);
inner += decomp.GetPredicate(pred); inner += decomp.GetPredicate(pred);
} }
void operator()(VideoCommon::Shader::ExprCondCode& expr) { void operator()(const ExprCondCode& expr) {
const Node cc = decomp.ir.GetConditionCode(expr.cc); const Node cc = decomp.ir.GetConditionCode(expr.cc);
std::string target; std::string target;
@ -2329,11 +2329,11 @@ public:
inner += target; inner += target;
} }
void operator()(VideoCommon::Shader::ExprVar& expr) { void operator()(const ExprVar& expr) {
inner += GetFlowVariable(expr.var_index); inner += GetFlowVariable(expr.var_index);
} }
void operator()(VideoCommon::Shader::ExprBoolean& expr) { void operator()(const ExprBoolean& expr) {
inner += expr.value ? "true" : "false"; inner += expr.value ? "true" : "false";
} }
@ -2350,7 +2350,7 @@ class ASTDecompiler {
public: public:
explicit ASTDecompiler(GLSLDecompiler& decomp) : decomp{decomp} {} explicit ASTDecompiler(GLSLDecompiler& decomp) : decomp{decomp} {}
void operator()(VideoCommon::Shader::ASTProgram& ast) { void operator()(const ASTProgram& ast) {
ASTNode current = ast.nodes.GetFirst(); ASTNode current = ast.nodes.GetFirst();
while (current) { while (current) {
Visit(current); Visit(current);
@ -2358,7 +2358,7 @@ public:
} }
} }
void operator()(VideoCommon::Shader::ASTIfThen& ast) { void operator()(const ASTIfThen& ast) {
ExprDecompiler expr_parser{decomp}; ExprDecompiler expr_parser{decomp};
std::visit(expr_parser, *ast.condition); std::visit(expr_parser, *ast.condition);
decomp.code.AddLine("if ({}) {{", expr_parser.GetResult()); decomp.code.AddLine("if ({}) {{", expr_parser.GetResult());
@ -2372,7 +2372,7 @@ public:
decomp.code.AddLine("}}"); decomp.code.AddLine("}}");
} }
void operator()(VideoCommon::Shader::ASTIfElse& ast) { void operator()(const ASTIfElse& ast) {
decomp.code.AddLine("else {{"); decomp.code.AddLine("else {{");
decomp.code.scope++; decomp.code.scope++;
ASTNode current = ast.nodes.GetFirst(); ASTNode current = ast.nodes.GetFirst();
@ -2384,29 +2384,29 @@ public:
decomp.code.AddLine("}}"); decomp.code.AddLine("}}");
} }
void operator()(VideoCommon::Shader::ASTBlockEncoded& ast) { void operator()([[maybe_unused]] const ASTBlockEncoded& ast) {
UNREACHABLE(); UNREACHABLE();
} }
void operator()(VideoCommon::Shader::ASTBlockDecoded& ast) { void operator()(const ASTBlockDecoded& ast) {
decomp.VisitBlock(ast.nodes); decomp.VisitBlock(ast.nodes);
} }
void operator()(VideoCommon::Shader::ASTVarSet& ast) { void operator()(const ASTVarSet& ast) {
ExprDecompiler expr_parser{decomp}; ExprDecompiler expr_parser{decomp};
std::visit(expr_parser, *ast.condition); std::visit(expr_parser, *ast.condition);
decomp.code.AddLine("{} = {};", GetFlowVariable(ast.index), expr_parser.GetResult()); decomp.code.AddLine("{} = {};", GetFlowVariable(ast.index), expr_parser.GetResult());
} }
void operator()(VideoCommon::Shader::ASTLabel& ast) { void operator()(const ASTLabel& ast) {
decomp.code.AddLine("// Label_{}:", ast.index); decomp.code.AddLine("// Label_{}:", ast.index);
} }
void operator()(VideoCommon::Shader::ASTGoto& ast) { void operator()([[maybe_unused]] const ASTGoto& ast) {
UNREACHABLE(); UNREACHABLE();
} }
void operator()(VideoCommon::Shader::ASTDoWhile& ast) { void operator()(const ASTDoWhile& ast) {
ExprDecompiler expr_parser{decomp}; ExprDecompiler expr_parser{decomp};
std::visit(expr_parser, *ast.condition); std::visit(expr_parser, *ast.condition);
decomp.code.AddLine("do {{"); decomp.code.AddLine("do {{");
@ -2420,7 +2420,7 @@ public:
decomp.code.AddLine("}} while({});", expr_parser.GetResult()); decomp.code.AddLine("}} while({});", expr_parser.GetResult());
} }
void operator()(VideoCommon::Shader::ASTReturn& ast) { void operator()(const ASTReturn& ast) {
const bool is_true = VideoCommon::Shader::ExprIsTrue(ast.condition); const bool is_true = VideoCommon::Shader::ExprIsTrue(ast.condition);
if (!is_true) { if (!is_true) {
ExprDecompiler expr_parser{decomp}; ExprDecompiler expr_parser{decomp};
@ -2440,7 +2440,7 @@ public:
} }
} }
void operator()(VideoCommon::Shader::ASTBreak& ast) { void operator()(const ASTBreak& ast) {
const bool is_true = VideoCommon::Shader::ExprIsTrue(ast.condition); const bool is_true = VideoCommon::Shader::ExprIsTrue(ast.condition);
if (!is_true) { if (!is_true) {
ExprDecompiler expr_parser{decomp}; ExprDecompiler expr_parser{decomp};
@ -2455,7 +2455,7 @@ public:
} }
} }
void Visit(VideoCommon::Shader::ASTNode& node) { void Visit(const ASTNode& node) {
std::visit(*this, *node->GetInnerData()); std::visit(*this, *node->GetInnerData());
} }
@ -2468,9 +2468,9 @@ void GLSLDecompiler::DecompileAST() {
for (u32 i = 0; i < num_flow_variables; i++) { for (u32 i = 0; i < num_flow_variables; i++) {
code.AddLine("bool {} = false;", GetFlowVariable(i)); code.AddLine("bool {} = false;", GetFlowVariable(i));
} }
ASTDecompiler decompiler{*this}; ASTDecompiler decompiler{*this};
VideoCommon::Shader::ASTNode program = ir.GetASTProgram(); decompiler.Visit(ir.GetASTProgram());
decompiler.Visit(program);
} }
} // Anonymous namespace } // Anonymous namespace