diff options
| author |  bunnei | 2019-02-23 23:29:53 -0500 |
|---|---|---|
| committer |  GitHub | 2019-02-23 23:29:53 -0500 |
| commit | 4ab978d6709e44b6ff74f71102fe31719c19b19d (patch) | |
| tree | 8ad505a02ea9691b3596f5601a7764167e2a1514 /src | |
| parent | Merge pull request #2138 from ReinUsesLisp/vulkan-memory-manager (diff) | |
| parent | vk_memory_manager: Fixup commit interval allocation (diff) | |
| download | yuzu-4ab978d6709e44b6ff74f71102fe31719c19b19d.tar.gz yuzu-4ab978d6709e44b6ff74f71102fe31719c19b19d.tar.xz yuzu-4ab978d6709e44b6ff74f71102fe31719c19b19d.zip | |
Merge pull request #2151 from ReinUsesLisp/fixup-vk-memory-manager
vk_memory_manager: Fixup commit interval allocation
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_memory_manager.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/video_core/renderer_vulkan/vk_memory_manager.cpp b/src/video_core/renderer_vulkan/vk_memory_manager.cpp index 86364ad54..17ee93b91 100644 --- a/src/video_core/renderer_vulkan/vk_memory_manager.cpp +++ b/src/video_core/renderer_vulkan/vk_memory_manager.cpp | |||
| @@ -238,8 +238,7 @@ bool VKMemoryManager::AllocMemory(vk::MemoryPropertyFlags wanted_properties, u32 | |||
| 238 | 238 | ||
| 239 | VKMemoryCommitImpl::VKMemoryCommitImpl(VKMemoryAllocation* allocation, vk::DeviceMemory memory, | 239 | VKMemoryCommitImpl::VKMemoryCommitImpl(VKMemoryAllocation* allocation, vk::DeviceMemory memory, |
| 240 | u8* data, u64 begin, u64 end) | 240 | u8* data, u64 begin, u64 end) |
| 241 | : allocation{allocation}, memory{memory}, data{data}, | 241 | : allocation{allocation}, memory{memory}, data{data}, interval(std::make_pair(begin, end)) {} |
| 242 | interval(std::make_pair(begin, begin + end)) {} | ||
| 243 | 242 | ||
| 244 | VKMemoryCommitImpl::~VKMemoryCommitImpl() { | 243 | VKMemoryCommitImpl::~VKMemoryCommitImpl() { |
| 245 | allocation->Free(this); | 244 | allocation->Free(this); |