aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-10-05 08:55:08 -0400
committerLioncash <mathew1800@gmail.com>2019-10-05 09:14:27 -0400
commitf883cd4f0ebf15916610fc5f1f006f81830eabbc (patch)
tree8bd02e8d5e16dee8522e29d21c711ef98282bb52 /src
parent25702b6256e33c3c2383a8674ecd69b5e7425509 (diff)
video_core/control_flow: Eliminate variable shadowing warnings
Diffstat (limited to 'src')
-rw-r--r--src/video_core/shader/control_flow.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/shader/control_flow.cpp b/src/video_core/shader/control_flow.cpp
index 70e1d3239d..268d1aed00 100644
--- a/src/video_core/shader/control_flow.cpp
+++ b/src/video_core/shader/control_flow.cpp
@@ -530,12 +530,12 @@ std::unique_ptr<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code,
state.manager->ShowCurrentState("Of Shader");
state.manager->Clear();
} else {
- auto result_out = std::make_unique<ShaderCharacteristics>();
- 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<ShaderCharacteristics>();
+ characteristics->start = start_address;
+ characteristics->settings.depth = settings.depth;
+ characteristics->manager = std::move(manager);
+ characteristics->end = state.block_info.back().end + 1;
+ return characteristics;
}
}