VertexLoaderManager: assimilate GetVertexSize()

1 files changed, 11 insertions, 21 deletions

diff --git a/Source/Core/VideoCommon/OpcodeDecoding.cpp b/Source/Core/VideoCommon/OpcodeDecoding.cpp
index e347b93a76..4a23ac717b 100644
--- a/Source/Core/VideoCommon/OpcodeDecoding.cpp
+++ b/Source/Core/VideoCommon/OpcodeDecoding.cpp
@@ -265,28 +265,18 @@ u8* OpcodeDecoder_Run(DataReader src, u32* cycles, bool in_display_list)
 				if (src.size() < 2)
 					goto end;
 				u16 num_vertices = src.Read<u16>();
+				int bytes = VertexLoaderManager::RunVertices(
+					cmd_byte & GX_VAT_MASK,   // Vertex loader index (0 - 7)
+					(cmd_byte & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT,
+					num_vertices,
+					src,
+					g_bSkipCurrentFrame,
+					is_preprocess);
+
+				if (bytes < 0)
+					goto end;
 
-				if (is_preprocess)
-				{
-					size_t size = num_vertices * VertexLoaderManager::GetVertexSize(cmd_byte & GX_VAT_MASK, is_preprocess);
-					if (src.size() < size)
-						goto end;
-					src.Skip(size);
-				}
-				else
-				{
-					int bytes = VertexLoaderManager::RunVertices(
-						cmd_byte & GX_VAT_MASK,   // Vertex loader index (0 - 7)
-						(cmd_byte & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT,
-						num_vertices,
-						src,
-						g_bSkipCurrentFrame);
-
-					if (bytes < 0)
-						goto end;
-					else
-						src.Skip(bytes);
-				}
+				src.Skip(bytes);
 
 				// 4 GPU ticks per vertex, 3 CPU ticks per GPU tick
 				totalCycles += num_vertices * 4 * 3 + 6;