Merge pull request #9595 from Dentomologist/fix_vertex_loader_test_wa…

…rnings VertexLoaderTest: Fix memset assignment warning
dolphin-emu · Jul 6, 2021 · 56fdde5 · 56fdde5
2 parents ffdc853 + 1cc035e
commit 56fdde5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/Source/Core/VideoCommon/CPMemory.h b/Source/Core/VideoCommon/CPMemory.h
@@ -209,7 +209,7 @@ struct TVtxDesc
     BitField<15, 2, VertexComponentFormat> Color1;
     BitFieldArray<13, 2, 2, VertexComponentFormat> Color;
 
-    u32 Hex;
+    u32 Hex = 0;
   };
   union High
   {
@@ -223,7 +223,7 @@ struct TVtxDesc
     BitField<14, 2, VertexComponentFormat> Tex7Coord;
     BitFieldArray<0, 2, 8, VertexComponentFormat> TexCoord;
 
-    u32 Hex;
+    u32 Hex = 0;
   };
 
   Low low;
@@ -291,7 +291,7 @@ struct fmt::formatter<TVtxDesc>
 
 union UVAT_group0
 {
-  u32 Hex;
+  u32 Hex = 0;
   // 0:8
   BitField<0, 1, CoordComponentCount> PosElements;
   BitField<1, 3, ComponentFormat> PosFormat;
@@ -350,7 +350,7 @@ struct fmt::formatter<UVAT_group0>
 
 union UVAT_group1
 {
-  u32 Hex;
+  u32 Hex = 0;
   // 0:8
   BitField<0, 1, TexComponentCount> Tex1CoordElements;
   BitField<1, 3, ComponentFormat> Tex1CoordFormat;
@@ -399,7 +399,7 @@ struct fmt::formatter<UVAT_group1>
 
 union UVAT_group2
 {
-  u32 Hex;
+  u32 Hex = 0;
   // 0:4
   BitField<0, 5, u8, u32> Tex4Frac;
   // 5:13

diff --git a/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp b/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp
@@ -23,9 +23,7 @@ TEST(VertexLoaderUID, UniqueEnough)
   std::unordered_set<VertexLoaderUID> uids;
 
   TVtxDesc vtx_desc;
-  memset(&vtx_desc, 0, sizeof(vtx_desc));
   VAT vat;
-  memset(&vat, 0, sizeof(vat));
   uids.insert(VertexLoaderUID(vtx_desc, vat));
 
   vtx_desc.low.Hex = 0x76543210;
@@ -51,8 +49,12 @@ class VertexLoaderTest : public testing::Test
     memset(input_memory, 0, sizeof(input_memory));
     memset(output_memory, 0xFF, sizeof(input_memory));
 
-    memset(&m_vtx_desc, 0, sizeof(m_vtx_desc));
-    memset(&m_vtx_attr, 0, sizeof(m_vtx_attr));
+    m_vtx_desc.low.Hex = 0;
+    m_vtx_desc.high.Hex = 0;
+
+    m_vtx_attr.g0.Hex = 0;
+    m_vtx_attr.g1.Hex = 0;
+    m_vtx_attr.g2.Hex = 0;
 
     m_loader = nullptr;