Merge pull request #739 from delroth/vertex-loader-fix

VertexLoader: do not prepare for vertices if we need to skip them Fixes issue [7542](https://code.google.com/p/dolphin-emu/issues/detail?id=7542)
dolphin-emu · Aug 5, 2014 · e170195 · e170195
2 parents b7d4481 + 16f1805
commit e170195
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/Source/Core/VideoCommon/VertexLoader.cpp b/Source/Core/VideoCommon/VertexLoader.cpp
@@ -10,7 +10,6 @@
 
 #include "Core/Host.h"
 
-#include "VideoCommon/BPMemory.h"
 #include "VideoCommon/DataReader.h"
 #include "VideoCommon/LookUpTables.h"
 #include "VideoCommon/PixelEngine.h"
@@ -840,12 +839,6 @@ void VertexLoader::ConvertVertices ( int count )
 
 void VertexLoader::RunVertices(const VAT& vat, int primitive, int const count)
 {
-	if (bpmem.genMode.cullmode == 3 && primitive < 5)
-	{
-		// if cull mode is none, ignore triangles and quads
-		DataSkip(count * m_VertexSize);
-		return;
-	}
 	SetupRunVertices(vat, primitive, count);
 	ConvertVertices(count);
 }

diff --git a/Source/Core/VideoCommon/VertexLoaderManager.cpp b/Source/Core/VideoCommon/VertexLoaderManager.cpp
@@ -9,6 +9,7 @@
 
 #include "Core/HW/Memmap.h"
 
+#include "VideoCommon/BPMemory.h"
 #include "VideoCommon/IndexGenerator.h"
 #include "VideoCommon/Statistics.h"
 #include "VideoCommon/VertexLoader.h"
@@ -145,6 +146,13 @@ void RunVertices(int vtx_attr_group, int primitive, int count)
 		return;
 	VertexLoader* loader = RefreshLoader(vtx_attr_group);
 
+	if (bpmem.genMode.cullmode == GenMode::CULL_ALL && primitive < 5)
+	{
+		// if cull mode is CULL_ALL, ignore triangles and quads
+		DataSkip(count * loader->GetVertexSize());
+		return;
+	}
+
 	// If the native vertex format changed, force a flush.
 	NativeVertexFormat* required_vtx_fmt = GetNativeVertexFormat(
 			loader->GetNativeVertexDeclaration(),