From f883cd4f0ebf15916610fc5f1f006f81830eabbc Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 5 Oct 2019 08:55:08 -0400 Subject: [PATCH] video_core/control_flow: Eliminate variable shadowing warnings --- src/video_core/shader/control_flow.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/video_core/shader/control_flow.cpp b/src/video_core/shader/control_flow.cpp index 70e1d3239..268d1aed0 100644 --- a/src/video_core/shader/control_flow.cpp +++ b/src/video_core/shader/control_flow.cpp @@ -530,12 +530,12 @@ std::unique_ptr ScanFlow(const ProgramCode& program_code, state.manager->ShowCurrentState("Of Shader"); state.manager->Clear(); } else { - auto result_out = std::make_unique(); - result_out->start = start_address; - result_out->settings.depth = settings.depth; - result_out->manager = std::move(manager); - result_out->end = state.block_info.back().end + 1; - return result_out; + auto characteristics = std::make_unique(); + characteristics->start = start_address; + characteristics->settings.depth = settings.depth; + characteristics->manager = std::move(manager); + characteristics->end = state.block_info.back().end + 1; + return characteristics; } }