Browse Source
Merge pull request #2172 from lioncash/reorder
gl_rasterizer/vk_memory_manager: Silence -Wreorder warnings
pull/15/merge
bunnei
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
src/video_core/renderer_opengl/gl_rasterizer.cpp
-
src/video_core/renderer_vulkan/vk_memory_manager.cpp
|
|
|
@ -102,8 +102,8 @@ struct FramebufferCacheKey { |
|
|
|
|
|
|
|
RasterizerOpenGL::RasterizerOpenGL(Core::Frontend::EmuWindow& window, Core::System& system, |
|
|
|
ScreenInfo& info) |
|
|
|
: res_cache{*this}, shader_cache{*this, system}, emu_window{window}, screen_info{info}, |
|
|
|
buffer_cache(*this, STREAM_BUFFER_SIZE), global_cache{*this} { |
|
|
|
: res_cache{*this}, shader_cache{*this, system}, global_cache{*this}, emu_window{window}, |
|
|
|
screen_info{info}, buffer_cache(*this, STREAM_BUFFER_SIZE) { |
|
|
|
// Create sampler objects
|
|
|
|
for (std::size_t i = 0; i < texture_samplers.size(); ++i) { |
|
|
|
texture_samplers[i].Create(); |
|
|
|
|
|
|
|
@ -238,7 +238,7 @@ bool VKMemoryManager::AllocMemory(vk::MemoryPropertyFlags wanted_properties, u32 |
|
|
|
|
|
|
|
VKMemoryCommitImpl::VKMemoryCommitImpl(VKMemoryAllocation* allocation, vk::DeviceMemory memory, |
|
|
|
u8* data, u64 begin, u64 end) |
|
|
|
: allocation{allocation}, memory{memory}, data{data}, interval(std::make_pair(begin, end)) {} |
|
|
|
: interval(std::make_pair(begin, end)), memory{memory}, allocation{allocation}, data{data} {} |
|
|
|
|
|
|
|
VKMemoryCommitImpl::~VKMemoryCommitImpl() { |
|
|
|
allocation->Free(this); |
|
|
|
|