ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11021 from merryhime/constructor-order 

Ensure constructor initializer order matches initialization order
This commit is contained in:
Admiral H. Curtiss 2022-08-30 02:29:37 +02:00 committed by GitHub
parent fb88a4e14c b0717607b2
commit 9195e1a9b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp
View File

@ -61,8 +61,8 @@ public:
} }
private: private:
GraphicsModConfig m_mod;
std::unique_ptr<GraphicsModAction> m_action_impl; std::unique_ptr<GraphicsModAction> m_action_impl;
GraphicsModConfig m_mod;
}; };
const std::vector<GraphicsModAction*>& const std::vector<GraphicsModAction*>&

4
Source/Core/VideoCommon/TextureInfo.cpp
View File

@ -52,9 +52,9 @@ TextureInfo::TextureInfo(u32 stage, const u8* ptr, const u8* tlut_ptr, u32 addre
TextureFormat texture_format, TLUTFormat tlut_format, u32 width, TextureFormat texture_format, TLUTFormat tlut_format, u32 width,
u32 height, bool from_tmem, const u8* tmem_odd, const u8* tmem_even, u32 height, bool from_tmem, const u8* tmem_odd, const u8* tmem_even,
std::optional<u32> mip_count) std::optional<u32> mip_count)
: m_stage(stage), m_ptr(ptr), m_tlut_ptr(tlut_ptr), m_address(address), m_from_tmem(from_tmem), : m_ptr(ptr), m_tlut_ptr(tlut_ptr), m_address(address), m_from_tmem(from_tmem),
m_tmem_odd(tmem_odd), m_texture_format(texture_format), m_tlut_format(tlut_format), m_tmem_odd(tmem_odd), m_texture_format(texture_format), m_tlut_format(tlut_format),
m_raw_width(width), m_raw_height(height) m_raw_width(width), m_raw_height(height), m_stage(stage)
{ {
const bool is_palette_texture = IsColorIndexed(m_texture_format); const bool is_palette_texture = IsColorIndexed(m_texture_format);
if (is_palette_texture) if (is_palette_texture)