diff options
| author | 2019-10-05 08:55:08 -0400 | |
|---|---|---|
| committer | 2019-10-05 09:14:27 -0400 | |
| commit | f883cd4f0ebf15916610fc5f1f006f81830eabbc (patch) | |
| tree | 8bd02e8d5e16dee8522e29d21c711ef98282bb52 /src | |
| parent | video_core/control_flow: Eliminate pessimizing moves (diff) | |
| download | yuzu-f883cd4f0ebf15916610fc5f1f006f81830eabbc.tar.gz yuzu-f883cd4f0ebf15916610fc5f1f006f81830eabbc.tar.xz yuzu-f883cd4f0ebf15916610fc5f1f006f81830eabbc.zip | |
video_core/control_flow: Eliminate variable shadowing warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/shader/control_flow.cpp | 12 |
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 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<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code, | |||
| 530 | state.manager->ShowCurrentState("Of Shader"); | 530 | state.manager->ShowCurrentState("Of Shader"); |
| 531 | state.manager->Clear(); | 531 | state.manager->Clear(); |
| 532 | } else { | 532 | } else { |
| 533 | auto result_out = std::make_unique<ShaderCharacteristics>(); | 533 | auto characteristics = std::make_unique<ShaderCharacteristics>(); |
| 534 | result_out->start = start_address; | 534 | characteristics->start = start_address; |
| 535 | result_out->settings.depth = settings.depth; | 535 | characteristics->settings.depth = settings.depth; |
| 536 | result_out->manager = std::move(manager); | 536 | characteristics->manager = std::move(manager); |
| 537 | result_out->end = state.block_info.back().end + 1; | 537 | characteristics->end = state.block_info.back().end + 1; |
| 538 | return result_out; | 538 | return characteristics; |
| 539 | } | 539 | } |
| 540 | } | 540 | } |
| 541 | 541 | ||