From 3dd6b55851978440f39487a6ad06b30b792b3b36 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sat, 4 Jan 2020 14:40:57 -0400 Subject: Shader_IR: Address Feedback --- src/video_core/renderer_opengl/gl_shader_decompiler.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'src/video_core/renderer_opengl') diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp index e1730821f..f9f7a97b5 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp @@ -751,10 +751,8 @@ private: Expression Visit(const Node& node) { if (const auto operation = std::get_if(&*node)) { - auto amend_index = operation->GetAmendIndex(); - if (amend_index) { - const Node& amend_node = ir.GetAmendNode(*amend_index); - Visit(amend_node).CheckVoid(); + if (const auto amend_index = operation->GetAmendIndex()) { + Visit(ir.GetAmendNode(*amend_index)).CheckVoid(); } const auto operation_index = static_cast(operation->GetCode()); if (operation_index >= operation_decompilers.size()) { @@ -877,10 +875,8 @@ private: } if (const auto conditional = std::get_if(&*node)) { - auto amend_index = conditional->GetAmendIndex(); - if (amend_index) { - const Node& amend_node = ir.GetAmendNode(*amend_index); - Visit(amend_node).CheckVoid(); + if (const auto amend_index = conditional->GetAmendIndex()) { + Visit(ir.GetAmendNode(*amend_index)).CheckVoid(); } // It's invalid to call conditional on nested nodes, use an operation instead code.AddLine("if ({}) {{", Visit(conditional->GetCondition()).AsBool()); @@ -894,11 +890,6 @@ private: } if (const auto comment = std::get_if(&*node)) { - auto amend_index = comment->GetAmendIndex(); - if (amend_index) { - const Node& amend_node = ir.GetAmendNode(*amend_index); - Visit(amend_node).CheckVoid(); - } code.AddLine("// " + comment->GetText()); return {}; } -- cgit v1.2.3