summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-02-28 03:14:20 +0100
committerGitHub <noreply@github.com>2019-02-28 03:14:20 +0100
commit66f4fd4c819e8b14c19a84eb9e8d054952dd7f93 (patch)
treeec0a14de538b75efafb3ec539b32ce7793b100c2
parentMerge pull request #2163 from ReinUsesLisp/bitset-dirty (diff)
parentvk_memory_manager: Reorder constructor initializer list in terms of member declaration order (diff)
downloadyuzu-66f4fd4c819e8b14c19a84eb9e8d054952dd7f93.tar
yuzu-66f4fd4c819e8b14c19a84eb9e8d054952dd7f93.tar.gz
yuzu-66f4fd4c819e8b14c19a84eb9e8d054952dd7f93.tar.bz2
yuzu-66f4fd4c819e8b14c19a84eb9e8d054952dd7f93.tar.lz
yuzu-66f4fd4c819e8b14c19a84eb9e8d054952dd7f93.tar.xz
yuzu-66f4fd4c819e8b14c19a84eb9e8d054952dd7f93.tar.zst
yuzu-66f4fd4c819e8b14c19a84eb9e8d054952dd7f93.zip
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp4
-rw-r--r--src/video_core/renderer_vulkan/vk_memory_manager.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index ee04569fa..523ed10fa 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.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();
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
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);