ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VertexLoaderTest: Resolve -Wdangling-else warnings 

The ways the assertion macros expand end up generating -Wdangling-else
warnings. Trivial enough to fix by just bracing the if statements.
This commit is contained in:
Lioncash 2023-12-11 18:45:23 -05:00
parent f04d834e8f
commit 4229d76ad6
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/UnitTests/VideoCommon/VertexLoaderTest.cpp
View File

@ -835,10 +835,14 @@ TEST_P(VertexLoaderSkippedColorsTest, SkippedColors)
ASSERT_EQ(m_loader->m_native_vtx_decl.colors[0].enable, enable_color_0); ASSERT_EQ(m_loader->m_native_vtx_decl.colors[0].enable, enable_color_0);
if (enable_color_0) if (enable_color_0)
{
ASSERT_EQ(m_loader->m_native_vtx_decl.colors[0].offset, color_0_offset); ASSERT_EQ(m_loader->m_native_vtx_decl.colors[0].offset, color_0_offset);
}
ASSERT_EQ(m_loader->m_native_vtx_decl.colors[1].enable, enable_color_1); ASSERT_EQ(m_loader->m_native_vtx_decl.colors[1].enable, enable_color_1);
if (enable_color_1) if (enable_color_1)
{
ASSERT_EQ(m_loader->m_native_vtx_decl.colors[1].offset, color_1_offset); ASSERT_EQ(m_loader->m_native_vtx_decl.colors[1].offset, color_1_offset);
}
RunVertices(2); RunVertices(2);
// Vertex 0 // Vertex 0
@ -846,17 +850,25 @@ TEST_P(VertexLoaderSkippedColorsTest, SkippedColors)
ExpectOut(3); ExpectOut(3);
ExpectOut(4); ExpectOut(4);
if (enable_color_0) if (enable_color_0)
{
EXPECT_EQ((m_dst.Read<u32, true>()), 0x04050607u); EXPECT_EQ((m_dst.Read<u32, true>()), 0x04050607u);
}
if (enable_color_1) if (enable_color_1)
{
EXPECT_EQ((m_dst.Read<u32, true>()), 0x0c0d0e0fu); EXPECT_EQ((m_dst.Read<u32, true>()), 0x0c0d0e0fu);
}
// Vertex 1 // Vertex 1
ExpectOut(1); ExpectOut(1);
ExpectOut(2); ExpectOut(2);
ExpectOut(3); ExpectOut(3);
if (enable_color_0) if (enable_color_0)
{
EXPECT_EQ((m_dst.Read<u32, true>()), 0x00010203u); EXPECT_EQ((m_dst.Read<u32, true>()), 0x00010203u);
}
if (enable_color_1) if (enable_color_1)
{
EXPECT_EQ((m_dst.Read<u32, true>()), 0x08090a0bu); EXPECT_EQ((m_dst.Read<u32, true>()), 0x08090a0bu);
}
} }
class VertexLoaderSkippedTexCoordsTest : public VertexLoaderTest, class VertexLoaderSkippedTexCoordsTest : public VertexLoaderTest,
@ -980,7 +992,9 @@ TEST_P(VertexLoaderSkippedTexCoordsTest, SkippedTextures)
{ {
ASSERT_EQ(m_loader->m_native_vtx_decl.texcoords[i].enable, component_enabled[i]); ASSERT_EQ(m_loader->m_native_vtx_decl.texcoords[i].enable, component_enabled[i]);
if (component_enabled[i]) if (component_enabled[i])
{
ASSERT_EQ(m_loader->m_native_vtx_decl.texcoords[i].offset, component_offset[i]); ASSERT_EQ(m_loader->m_native_vtx_decl.texcoords[i].offset, component_offset[i]);
}
} }
RunVertices(2); RunVertices(2);