From a71c8158d91c7ee0976b9b16eeba5ea3ac18ff99 Mon Sep 17 00:00:00 2001 From: degasus Date: Sat, 13 Dec 2014 00:23:54 +0100 Subject: VertexLoader: remove inlined getters They just blow up the code. --- Source/UnitTests/VideoCommon/VertexLoaderTest.cpp | 48 +++++++++++------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'Source/UnitTests/VideoCommon/VertexLoaderTest.cpp') diff --git a/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp b/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp index 44fb6dc314..d1032ae6f9 100644 --- a/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp +++ b/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Common/Common.h" #include "VideoCommon/DataReader.h" @@ -10,7 +10,7 @@ TEST(VertexLoaderUID, UniqueEnough) { - std::set uids; + std::unordered_set uids; TVtxDesc vtx_desc; memset(&vtx_desc, 0, sizeof (vtx_desc)); @@ -95,8 +95,8 @@ TEST_F(VertexLoaderTest, PositionDirectFloatXYZ) VertexLoader* loader = new VertexLoader(m_vtx_desc, m_vtx_attr); - ASSERT_EQ(3 * sizeof (float), (u32)loader->GetNativeVertexDeclaration().stride); - ASSERT_EQ(3 * sizeof (float), (u32)loader->GetVertexSize()); + ASSERT_EQ(3 * sizeof (float), (u32)loader->m_native_vtx_decl.stride); + ASSERT_EQ(3 * sizeof (float), (u32)loader->m_VertexSize); // Write some vertices. Input(0.0f); Input(0.0f); Input(0.0f); @@ -106,8 +106,8 @@ TEST_F(VertexLoaderTest, PositionDirectFloatXYZ) // Convert 4 points. "7" -> primitive are points. int count = loader->RunVertices(7, 4, src, dst); - src.Skip(4 * loader->GetVertexSize()); - dst.Skip(count * loader->GetNativeVertexDeclaration().stride); + src.Skip(4 * loader->m_VertexSize); + dst.Skip(count * loader->m_native_vtx_decl.stride); delete loader; ExpectOut(0.0f); ExpectOut(0.0f); ExpectOut(0.0f); @@ -120,8 +120,8 @@ TEST_F(VertexLoaderTest, PositionDirectFloatXYZ) m_vtx_attr.g0.PosFrac = 1; loader = new VertexLoader(m_vtx_desc, m_vtx_attr); count = loader->RunVertices(7, 1, src, dst); - src.Skip(1 * loader->GetVertexSize()); - dst.Skip(count * loader->GetNativeVertexDeclaration().stride); + src.Skip(1 * loader->m_VertexSize); + dst.Skip(count * loader->m_native_vtx_decl.stride); ExpectOut(1.0f); ExpectOut(2.0f); ExpectOut(4.0f); delete loader; } @@ -134,8 +134,8 @@ TEST_F(VertexLoaderTest, PositionDirectU16XY) VertexLoader* loader = new VertexLoader(m_vtx_desc, m_vtx_attr); - ASSERT_EQ(3 * sizeof (float), (u32)loader->GetNativeVertexDeclaration().stride); - ASSERT_EQ(2 * sizeof (u16), (u32)loader->GetVertexSize()); + ASSERT_EQ(3 * sizeof (float), (u32)loader->m_native_vtx_decl.stride); + ASSERT_EQ(2 * sizeof (u16), (u32)loader->m_VertexSize); // Write some vertices. Input(0); Input(0); @@ -146,8 +146,8 @@ TEST_F(VertexLoaderTest, PositionDirectU16XY) // Convert 5 points. "7" -> primitive are points. int count = loader->RunVertices(7, 5, src, dst); - src.Skip(5 * loader->GetVertexSize()); - dst.Skip(count * loader->GetNativeVertexDeclaration().stride); + src.Skip(5 * loader->m_VertexSize); + dst.Skip(count * loader->m_native_vtx_decl.stride); delete loader; ExpectOut(0.0f); ExpectOut(0.0f); ExpectOut(0.0f); @@ -161,8 +161,8 @@ TEST_F(VertexLoaderTest, PositionDirectU16XY) m_vtx_attr.g0.PosFrac = 1; loader = new VertexLoader(m_vtx_desc, m_vtx_attr); count = loader->RunVertices(7, 1, src, dst); - src.Skip(1 * loader->GetVertexSize()); - dst.Skip(count * loader->GetNativeVertexDeclaration().stride); + src.Skip(1 * loader->m_VertexSize); + dst.Skip(count * loader->m_native_vtx_decl.stride); ExpectOut(21.0f); ExpectOut(12.0f); ExpectOut(0.0f); delete loader; } @@ -175,15 +175,15 @@ TEST_F(VertexLoaderTest, PositionDirectFloatXYZSpeed) VertexLoader loader(m_vtx_desc, m_vtx_attr); - ASSERT_EQ(3 * sizeof (float), (u32)loader.GetNativeVertexDeclaration().stride); - ASSERT_EQ(3 * sizeof (float), (u32)loader.GetVertexSize()); + ASSERT_EQ(3 * sizeof (float), (u32)loader.m_native_vtx_decl.stride); + ASSERT_EQ(3 * sizeof (float), (u32)loader.m_VertexSize); for (int i = 0; i < 1000; ++i) { ResetPointers(); int count = loader.RunVertices(7, 100000, src, dst); - src.Skip(100000 * loader.GetVertexSize()); - dst.Skip(count * loader.GetNativeVertexDeclaration().stride); + src.Skip(100000 * loader.m_VertexSize); + dst.Skip(count * loader.m_native_vtx_decl.stride); } } @@ -195,15 +195,15 @@ TEST_F(VertexLoaderTest, PositionDirectU16XYSpeed) VertexLoader loader(m_vtx_desc, m_vtx_attr); - ASSERT_EQ(3 * sizeof (float), (u32)loader.GetNativeVertexDeclaration().stride); - ASSERT_EQ(2 * sizeof (u16), (u32)loader.GetVertexSize()); + ASSERT_EQ(3 * sizeof (float), (u32)loader.m_native_vtx_decl.stride); + ASSERT_EQ(2 * sizeof (u16), (u32)loader.m_VertexSize); for (int i = 0; i < 1000; ++i) { ResetPointers(); int count = loader.RunVertices(7, 100000, src, dst); - src.Skip(100000 * loader.GetVertexSize()); - dst.Skip(count * loader.GetNativeVertexDeclaration().stride); + src.Skip(100000 * loader.m_VertexSize); + dst.Skip(count * loader.m_native_vtx_decl.stride); } } @@ -265,7 +265,7 @@ TEST_F(VertexLoaderTest, LargeFloatVertexSpeed) { ResetPointers(); int count = loader.RunVertices(7, 100000, src, dst); - src.Skip(100000 * loader.GetVertexSize()); - dst.Skip(count * loader.GetNativeVertexDeclaration().stride); + src.Skip(100000 * loader.m_VertexSize); + dst.Skip(count * loader.m_native_vtx_decl.stride); } } -- cgit v1.2.3