diff --git a/Source/Core/VideoCommon/CPMemory.h b/Source/Core/VideoCommon/CPMemory.h index 6aa78f23ec..038e6787ea 100644 --- 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 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 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 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 index 2769b28ce1..81b3e5ee53 100644 --- a/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp +++ b/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp @@ -23,9 +23,7 @@ TEST(VertexLoaderUID, UniqueEnough) std::unordered_set 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 @@ protected: 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;