diff options
| author |  Fernando Sahmkow | 2022-06-16 02:00:29 +0200 |
|---|---|---|
| committer | Fernando Sahmkow | 2022-10-06 21:00:53 +0200 |
| commit | 1a9b71b1c6a5b6fb2a41fc485a986e9c505b2856 (patch) | |
| tree | 19e12b3dcba0bc1057a8864dcbe1a7d0b2c74de1 | |
| parent | Vulkan Swapchain: Overall improvements. (diff) | |
| download | yuzu-1a9b71b1c6a5b6fb2a41fc485a986e9c505b2856.tar.gz yuzu-1a9b71b1c6a5b6fb2a41fc485a986e9c505b2856.tar.xz yuzu-1a9b71b1c6a5b6fb2a41fc485a986e9c505b2856.zip | |
Common: Fix variable shadowing.
| -rw-r--r-- | src/common/address_space.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/address_space.inc b/src/common/address_space.inc index 907c55d88..e1241d099 100644 --- a/src/common/address_space.inc +++ b/src/common/address_space.inc | |||
| @@ -30,9 +30,9 @@ | |||
| 30 | FlatAllocator<VaType, UnmappedVa, AddressSpaceBits> | 30 | FlatAllocator<VaType, UnmappedVa, AddressSpaceBits> |
| 31 | 31 | ||
| 32 | namespace Common { | 32 | namespace Common { |
| 33 | MAP_MEMBER_CONST()::FlatAddressSpaceMap(VaType vaLimit, | 33 | MAP_MEMBER_CONST()::FlatAddressSpaceMap(VaType vaLimit_, |
| 34 | std::function<void(VaType, VaType)> unmapCallback) | 34 | std::function<void(VaType, VaType)> unmapCallback_) |
| 35 | : unmapCallback(std::move(unmapCallback)), vaLimit(vaLimit) { | 35 | : unmapCallback(std::move(unmapCallback_)), vaLimit(vaLimit_) { |
| 36 | if (vaLimit > VaMaximum) | 36 | if (vaLimit > VaMaximum) |
| 37 | UNREACHABLE_MSG("Invalid VA limit!"); | 37 | UNREACHABLE_MSG("Invalid VA limit!"); |
| 38 | } | 38 | } |
| @@ -261,8 +261,8 @@ MAP_MEMBER(void)::UnmapLocked(VaType virt, VaType size) { | |||
| 261 | unmapCallback(virt, size); | 261 | unmapCallback(virt, size); |
| 262 | } | 262 | } |
| 263 | 263 | ||
| 264 | ALLOC_MEMBER_CONST()::FlatAllocator(VaType vaStart, VaType vaLimit) | 264 | ALLOC_MEMBER_CONST()::FlatAllocator(VaType vaStart_, VaType vaLimit) |
| 265 | : Base(vaLimit), currentLinearAllocEnd(vaStart), vaStart(vaStart) {} | 265 | : Base(vaLimit), currentLinearAllocEnd(vaStart_), vaStart(vaStart_) {} |
| 266 | 266 | ||
| 267 | ALLOC_MEMBER(VaType)::Allocate(VaType size) { | 267 | ALLOC_MEMBER(VaType)::Allocate(VaType size) { |
| 268 | std::scoped_lock lock(this->blockMutex); | 268 | std::scoped_lock lock(this->blockMutex); |