diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2022-08-30 02:29:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-30 02:29:37 +0200 |
| commit | 9195e1a9b8a629d89d786f4f3c1cfb46f4e2eb24 (patch) | |
| tree | 553a0d3f54e858ee1f4478721f996a0daf17c16d /Source/Core | |
| parent | fb88a4e14cd5ac292a08944af0de61953a5d8560 (diff) | |
| parent | b0717607b2230034cfefc5940d2591d0ac7fbc64 (diff) | |
Merge pull request #11021 from merryhime/constructor-order
Ensure constructor initializer order matches initialization order
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/TextureInfo.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp index 9e3d3e9e99..65efaaf963 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp +++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp @@ -61,8 +61,8 @@ public: } private: - GraphicsModConfig m_mod; std::unique_ptr<GraphicsModAction> m_action_impl; + GraphicsModConfig m_mod; }; const std::vector<GraphicsModAction*>& diff --git a/Source/Core/VideoCommon/TextureInfo.cpp b/Source/Core/VideoCommon/TextureInfo.cpp index ff117c6926..1d3371f7fc 100644 --- a/Source/Core/VideoCommon/TextureInfo.cpp +++ b/Source/Core/VideoCommon/TextureInfo.cpp @@ -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, u32 height, bool from_tmem, const u8* tmem_odd, const u8* tmem_even, 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_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); if (is_palette_texture) |