diff options
| author | bunnei <bunneidev@gmail.com> | 2020-12-05 00:48:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-05 00:48:08 -0800 |
| commit | e6a896c4bdf9cc47c2002c115c9ff280e540fd1b (patch) | |
| tree | e5cd397cb3a11f1529f38ed8fa0a0185d07becaa /src/video_core/engines/engine_upload.cpp | |
| parent | 63419e144ffeeb30220bacd6307360c76b4363f1 (diff) | |
| parent | 677a8b208d47d0d2397197ce74c7039a8ea79d20 (diff) | |
Merge pull request #5124 from lioncash/video-shadow
video_core: Resolve more variable shadowing scenarios
Diffstat (limited to 'src/video_core/engines/engine_upload.cpp')
| -rw-r--r-- | src/video_core/engines/engine_upload.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/engines/engine_upload.cpp b/src/video_core/engines/engine_upload.cpp index d44ad0cd8..71d7e1473 100644 --- a/src/video_core/engines/engine_upload.cpp +++ b/src/video_core/engines/engine_upload.cpp @@ -11,16 +11,16 @@ namespace Tegra::Engines::Upload { -State::State(MemoryManager& memory_manager, Registers& regs) - : regs{regs}, memory_manager{memory_manager} {} +State::State(MemoryManager& memory_manager_, Registers& regs_) + : regs{regs_}, memory_manager{memory_manager_} {} State::~State() = default; -void State::ProcessExec(const bool is_linear) { +void State::ProcessExec(const bool is_linear_) { write_offset = 0; copy_size = regs.line_length_in * regs.line_count; inner_buffer.resize(copy_size); - this->is_linear = is_linear; + is_linear = is_linear_; } void State::ProcessData(const u32 data, const bool is_last_call) { |
