diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-07-24 01:51:37 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-07-24 01:51:37 +0200 |
| commit | 78c3a220600b6cbbd063693d89d423a985125408 (patch) | |
| tree | 2cbbfd8f027f42dc4523328955ba65c6af146e0b /Source/Core/VideoCommon/VertexLoader.cpp | |
| parent | 069801a7d16653ec6c8b95b59e84b37d93a0d349 (diff) | |
VertexLoader: take the VAT object directly for RunVertices
Diffstat (limited to 'Source/Core/VideoCommon/VertexLoader.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VertexLoader.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Source/Core/VideoCommon/VertexLoader.cpp b/Source/Core/VideoCommon/VertexLoader.cpp index f83565ae26..bb73193c04 100644 --- a/Source/Core/VideoCommon/VertexLoader.cpp +++ b/Source/Core/VideoCommon/VertexLoader.cpp @@ -813,7 +813,7 @@ void VertexLoader::WriteSetVariable(int bits, void *address, OpArg value) } #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; @@ -826,15 +826,15 @@ void VertexLoader::SetupRunVertices(int vtx_attr_group, int primitive, int const g_nativeVertexFmt = m_NativeFmt; // Load position and texcoord scale factors. - m_VtxAttr.PosFrac = g_VtxAttr[vtx_attr_group].g0.PosFrac; - m_VtxAttr.texCoord[0].Frac = g_VtxAttr[vtx_attr_group].g0.Tex0Frac; - m_VtxAttr.texCoord[1].Frac = g_VtxAttr[vtx_attr_group].g1.Tex1Frac; - m_VtxAttr.texCoord[2].Frac = g_VtxAttr[vtx_attr_group].g1.Tex2Frac; - m_VtxAttr.texCoord[3].Frac = g_VtxAttr[vtx_attr_group].g1.Tex3Frac; - m_VtxAttr.texCoord[4].Frac = g_VtxAttr[vtx_attr_group].g2.Tex4Frac; - m_VtxAttr.texCoord[5].Frac = g_VtxAttr[vtx_attr_group].g2.Tex5Frac; - m_VtxAttr.texCoord[6].Frac = g_VtxAttr[vtx_attr_group].g2.Tex6Frac; - m_VtxAttr.texCoord[7].Frac = g_VtxAttr[vtx_attr_group].g2.Tex7Frac; + m_VtxAttr.PosFrac = vat.g0.PosFrac; + m_VtxAttr.texCoord[0].Frac = vat.g0.Tex0Frac; + m_VtxAttr.texCoord[1].Frac = vat.g1.Tex1Frac; + m_VtxAttr.texCoord[2].Frac = vat.g1.Tex2Frac; + m_VtxAttr.texCoord[3].Frac = vat.g1.Tex3Frac; + m_VtxAttr.texCoord[4].Frac = vat.g2.Tex4Frac; + m_VtxAttr.texCoord[5].Frac = vat.g2.Tex5Frac; + m_VtxAttr.texCoord[6].Frac = vat.g2.Tex6Frac; + m_VtxAttr.texCoord[7].Frac = vat.g2.Tex7Frac; posScale = fractionTable[m_VtxAttr.PosFrac]; if (m_NativeFmt->m_components & VB_HAS_UVALL) @@ -870,7 +870,7 @@ void VertexLoader::ConvertVertices ( int count ) #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) { @@ -878,7 +878,7 @@ void VertexLoader::RunVertices(int vtx_attr_group, int primitive, int const coun DataSkip(count * m_VertexSize); return; } - SetupRunVertices(vtx_attr_group, primitive, count); + SetupRunVertices(vat, primitive, count); VertexManager::PrepareForAdditionalData(primitive, count, native_stride); ConvertVertices(count); IndexGenerator::AddIndices(primitive, count); |
