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

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)
This commit is contained in:
Lioncash 2014-08-04 23:51:59 -04:00
parent b7d4481081 16f180524c
commit e1701951b2
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/VideoCommon/VertexLoader.cpp
View File

@ -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);
}

8
Source/Core/VideoCommon/VertexLoaderManager.cpp
View File

@ -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(),