Merge pull request #9769 from Tilka/warnings

Fix -Wreorder warnings
dolphin-emu · May 30, 2021 · c16a12a · c16a12a
2 parents b3a414e + faec77a
commit c16a12a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Source/Core/VideoCommon/TextureInfo.cpp b/Source/Core/VideoCommon/TextureInfo.cpp
@@ -54,9 +54,9 @@ TextureInfo::TextureInfo(const u8* ptr, const u8* tlut_ptr, u32 address,
                          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_ptr(ptr), m_tlut_ptr(tlut_ptr), m_address(address), m_texture_format(texture_format),
-      m_tlut_format(tlut_format), m_raw_width(width), m_raw_height(height), m_from_tmem(from_tmem),
-      m_tmem_odd(tmem_odd)
+    : 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)
 {
   const bool is_palette_texture = IsColorIndexed(m_texture_format);
   if (is_palette_texture)

diff --git a/Source/Core/VideoCommon/VertexLoaderBase.h b/Source/Core/VideoCommon/VertexLoaderBase.h
@@ -80,8 +80,9 @@ class VertexLoaderBase
 
 protected:
   VertexLoaderBase(const TVtxDesc& vtx_desc, const VAT& vtx_attr)
-      : m_VtxDesc{vtx_desc}, m_VtxAttr{vtx_attr}, m_vertex_size{GetVertexSize(vtx_desc, vtx_attr)},
-        m_native_components{GetVertexComponents(vtx_desc, vtx_attr)}
+      : m_vertex_size{GetVertexSize(vtx_desc, vtx_attr)}, m_native_components{GetVertexComponents(
+                                                              vtx_desc, vtx_attr)},
+        m_VtxAttr{vtx_attr}, m_VtxDesc{vtx_desc}
   {
   }