diff options
| author | 2019-02-27 21:14:20 -0500 | |
|---|---|---|
| committer | 2019-02-27 21:14:20 -0500 | |
| commit | 66f4fd4c819e8b14c19a84eb9e8d054952dd7f93 (patch) | |
| tree | ec0a14de538b75efafb3ec539b32ce7793b100c2 /src/video_core/renderer_vulkan | |
| parent | Merge pull request #2163 from ReinUsesLisp/bitset-dirty (diff) | |
| parent | vk_memory_manager: Reorder constructor initializer list in terms of member de... (diff) | |
| download | yuzu-66f4fd4c819e8b14c19a84eb9e8d054952dd7f93.tar.gz yuzu-66f4fd4c819e8b14c19a84eb9e8d054952dd7f93.tar.xz yuzu-66f4fd4c819e8b14c19a84eb9e8d054952dd7f93.zip | |
Merge pull request #2172 from lioncash/reorder
gl_rasterizer/vk_memory_manager: Silence -Wreorder warnings
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_memory_manager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/renderer_vulkan/vk_memory_manager.cpp b/src/video_core/renderer_vulkan/vk_memory_manager.cpp index 17ee93b91..0451babbf 100644 --- a/src/video_core/renderer_vulkan/vk_memory_manager.cpp +++ b/src/video_core/renderer_vulkan/vk_memory_manager.cpp | |||
| @@ -238,7 +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}, interval(std::make_pair(begin, end)) {} | 241 | : interval(std::make_pair(begin, end)), memory{memory}, allocation{allocation}, data{data} {} |
| 242 | 242 | ||
| 243 | VKMemoryCommitImpl::~VKMemoryCommitImpl() { | 243 | VKMemoryCommitImpl::~VKMemoryCommitImpl() { |
| 244 | allocation->Free(this); | 244 | allocation->Free(this); |