diff options
author | Chloe <25727384+ogniK5377@users.noreply.github.com> | 2020-12-05 13:45:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-05 13:45:00 +0100 |
commit | f2f346e1104106eb9323f0e141e0e67312c29849 (patch) | |
tree | 6eac8e13f3333c89d8c0f3428b8664cab63a484a /src/video_core/renderer_vulkan/vk_memory_manager.h | |
parent | Merge pull request #5124 from lioncash/video-shadow (diff) | |
parent | video_core: Resolve more variable shadowing scenarios pt.2 (diff) | |
download | yuzu-f2f346e1104106eb9323f0e141e0e67312c29849.tar yuzu-f2f346e1104106eb9323f0e141e0e67312c29849.tar.gz yuzu-f2f346e1104106eb9323f0e141e0e67312c29849.tar.bz2 yuzu-f2f346e1104106eb9323f0e141e0e67312c29849.tar.lz yuzu-f2f346e1104106eb9323f0e141e0e67312c29849.tar.xz yuzu-f2f346e1104106eb9323f0e141e0e67312c29849.tar.zst yuzu-f2f346e1104106eb9323f0e141e0e67312c29849.zip |
Diffstat (limited to 'src/video_core/renderer_vulkan/vk_memory_manager.h')
-rw-r--r-- | src/video_core/renderer_vulkan/vk_memory_manager.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/video_core/renderer_vulkan/vk_memory_manager.h b/src/video_core/renderer_vulkan/vk_memory_manager.h index 1af88e3d4..39f903ec8 100644 --- a/src/video_core/renderer_vulkan/vk_memory_manager.h +++ b/src/video_core/renderer_vulkan/vk_memory_manager.h @@ -21,7 +21,7 @@ using VKMemoryCommit = std::unique_ptr<VKMemoryCommitImpl>; class VKMemoryManager final { public: - explicit VKMemoryManager(const VKDevice& device); + explicit VKMemoryManager(const VKDevice& device_); VKMemoryManager(const VKMemoryManager&) = delete; ~VKMemoryManager(); @@ -58,8 +58,8 @@ class VKMemoryCommitImpl final { friend MemoryMap; public: - explicit VKMemoryCommitImpl(const VKDevice& device, VKMemoryAllocation* allocation, - const vk::DeviceMemory& memory, u64 begin, u64 end); + explicit VKMemoryCommitImpl(const VKDevice& device_, VKMemoryAllocation* allocation_, + const vk::DeviceMemory& memory_, u64 begin_, u64 end_); ~VKMemoryCommitImpl(); /// Maps a memory region and returns a pointer to it. @@ -93,8 +93,8 @@ private: /// Holds ownership of a memory map. class MemoryMap final { public: - explicit MemoryMap(const VKMemoryCommitImpl* commit, u8* address) - : commit{commit}, address{address} {} + explicit MemoryMap(const VKMemoryCommitImpl* commit_, u8* address_) + : commit{commit_}, address{address_} {} ~MemoryMap() { if (commit) { |