From 3323375efba321249ece50e10d306f3acd221fe8 Mon Sep 17 00:00:00 2001 From: Merry Date: Mon, 29 Aug 2022 21:15:49 +0100 Subject: [PATCH 1/2] GraphicsModManager: Reorder DecoratedAction members to initialization order m_action_impl is initialized before m_mod in constructor --- .../GraphicsModSystem/Runtime/GraphicsModManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 m_action_impl; + GraphicsModConfig m_mod; }; const std::vector& From b0717607b2230034cfefc5940d2591d0ac7fbc64 Mon Sep 17 00:00:00 2001 From: Merry Date: Mon, 29 Aug 2022 21:16:21 +0100 Subject: [PATCH 2/2] TextureInfo: Reorder members in constructor m_stage is initialized last --- Source/Core/VideoCommon/TextureInfo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 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)