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

VertexLoader: take the VAT object directly for RunVertices

This commit is contained in:
Pierre Bourdon 2014-07-24 01:51:37 +02:00
parent 069801a7d1
commit 78c3a22060
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -813,7 +813,7 @@ void VertexLoader::WriteSetVariable(int bits, void *address, OpArg value)
} }
#endif #endif
void VertexLoader::SetupRunVertices(int vtx_attr_group, int primitive, int const count) void VertexLoader::SetupRunVertices(const VAT& vat, int primitive, int const count)
{ {
m_numLoadedVertices += count; m_numLoadedVertices += count;
@ -826,15 +826,15 @@ void VertexLoader::SetupRunVertices(int vtx_attr_group, int primitive, int const
g_nativeVertexFmt = m_NativeFmt; g_nativeVertexFmt = m_NativeFmt;
// Load position and texcoord scale factors. // Load position and texcoord scale factors.
m_VtxAttr.PosFrac = g_VtxAttr[vtx_attr_group].g0.PosFrac; m_VtxAttr.PosFrac = vat.g0.PosFrac;
m_VtxAttr.texCoord[0].Frac = g_VtxAttr[vtx_attr_group].g0.Tex0Frac; m_VtxAttr.texCoord[0].Frac = vat.g0.Tex0Frac;
m_VtxAttr.texCoord[1].Frac = g_VtxAttr[vtx_attr_group].g1.Tex1Frac; m_VtxAttr.texCoord[1].Frac = vat.g1.Tex1Frac;
m_VtxAttr.texCoord[2].Frac = g_VtxAttr[vtx_attr_group].g1.Tex2Frac; m_VtxAttr.texCoord[2].Frac = vat.g1.Tex2Frac;
m_VtxAttr.texCoord[3].Frac = g_VtxAttr[vtx_attr_group].g1.Tex3Frac; m_VtxAttr.texCoord[3].Frac = vat.g1.Tex3Frac;
m_VtxAttr.texCoord[4].Frac = g_VtxAttr[vtx_attr_group].g2.Tex4Frac; m_VtxAttr.texCoord[4].Frac = vat.g2.Tex4Frac;
m_VtxAttr.texCoord[5].Frac = g_VtxAttr[vtx_attr_group].g2.Tex5Frac; m_VtxAttr.texCoord[5].Frac = vat.g2.Tex5Frac;
m_VtxAttr.texCoord[6].Frac = g_VtxAttr[vtx_attr_group].g2.Tex6Frac; m_VtxAttr.texCoord[6].Frac = vat.g2.Tex6Frac;
m_VtxAttr.texCoord[7].Frac = g_VtxAttr[vtx_attr_group].g2.Tex7Frac; m_VtxAttr.texCoord[7].Frac = vat.g2.Tex7Frac;
posScale = fractionTable[m_VtxAttr.PosFrac]; posScale = fractionTable[m_VtxAttr.PosFrac];
if (m_NativeFmt->m_components & VB_HAS_UVALL) if (m_NativeFmt->m_components & VB_HAS_UVALL)
@ -870,7 +870,7 @@ void VertexLoader::ConvertVertices ( int count )
#endif #endif
} }
void VertexLoader::RunVertices(int vtx_attr_group, int primitive, int const count) void VertexLoader::RunVertices(const VAT& vat, int primitive, int const count)
{ {
if (bpmem.genMode.cullmode == 3 && primitive < 5) if (bpmem.genMode.cullmode == 3 && primitive < 5)
{ {
@ -878,7 +878,7 @@ void VertexLoader::RunVertices(int vtx_attr_group, int primitive, int const coun
DataSkip(count * m_VertexSize); DataSkip(count * m_VertexSize);
return; return;
} }
SetupRunVertices(vtx_attr_group, primitive, count); SetupRunVertices(vat, primitive, count);
VertexManager::PrepareForAdditionalData(primitive, count, native_stride); VertexManager::PrepareForAdditionalData(primitive, count, native_stride);
ConvertVertices(count); ConvertVertices(count);
IndexGenerator::AddIndices(primitive, count); IndexGenerator::AddIndices(primitive, count);

4
Source/Core/VideoCommon/VertexLoader.h
View File

@ -107,8 +107,8 @@ public:
int GetVertexSize() const {return m_VertexSize;} int GetVertexSize() const {return m_VertexSize;}
void SetupRunVertices(int vtx_attr_group, int primitive, int const count); void SetupRunVertices(const VAT& vat, int primitive, int const count);
void RunVertices(int vtx_attr_group, int primitive, int count); void RunVertices(const VAT& vat, int primitive, int count);
// For debugging / profiling // For debugging / profiling
void AppendToString(std::string *dest) const; void AppendToString(std::string *dest) const;

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

@ -126,7 +126,7 @@ void RunVertices(int vtx_attr_group, int primitive, int count)
{ {
if (!count) if (!count)
return; return;
RefreshLoader(vtx_attr_group)->RunVertices(vtx_attr_group, primitive, count); RefreshLoader(vtx_attr_group)->RunVertices(g_VtxAttr[vtx_attr_group], primitive, count);
} }
int GetVertexSize(int vtx_attr_group) int GetVertexSize(int vtx_attr_group)