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

Experimental VertexLoader cleanup!

This commit is contained in:
Jordan Woyak 2013-02-21 14:41:06 -06:00
parent a92c93f870
commit 677c6229ad
2 changed files with 10 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
Source/Core/VideoCommon/Src/VertexLoader.cpp
View File

@ -562,86 +562,17 @@ void VertexLoader::RunVertices(int vtx_attr_group, int primitive, int count)
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
colElements[i] = m_VtxAttr.color[i].Elements; colElements[i] = m_VtxAttr.color[i].Elements;
// if strips or fans, make sure all vertices can fit in buffer, otherwise flush if (VertexManager::GetRemainingSize() < count * native_stride)
int granularity = 1;
switch (primitive) {
case 3: // strip .. hm, weird
case 4: // fan
if (VertexManager::GetRemainingSize() < 3 * native_stride)
VertexManager::Flush();
break;
case 6: // line strip
if (VertexManager::GetRemainingSize() < 2 * native_stride)
VertexManager::Flush();
break;
case 0: granularity = 4; break; // quads
case 2: granularity = 3; break; // tris
case 5: granularity = 2; break; // lines
}
int startv = 0, extraverts = 0;
int v = 0;
//int remainingVerts2 = VertexManager::GetRemainingVertices(primitive);
while (v < count)
{ {
int remainingVerts = VertexManager::GetRemainingSize() / native_stride;
//if (remainingVerts2 - v + startv < remainingVerts)
//remainingVerts = remainingVerts2 - v + startv;
if (remainingVerts < granularity) {
INCSTAT(stats.thisFrame.numBufferSplits);
// This buffer full - break current primitive and flush, to switch to the next buffer.
if (v - startv > 0)
VertexManager::AddVertices(primitive, v - startv + extraverts);
VertexManager::Flush(); VertexManager::Flush();
//remainingVerts2 = VertexManager::GetRemainingVertices(primitive);
// Why does this need to be so complicated?
switch (primitive) {
case 3: // triangle strip, copy last two vertices
// a little trick since we have to keep track of signs
if (v & 1) {
g_pVideoData -= m_VertexSize*2;
ConvertVertices(1);
g_pVideoData -= m_VertexSize;
ConvertVertices(2);
extraverts = 3;
}
else {
g_pVideoData -= m_VertexSize*2;
ConvertVertices(2);
extraverts = 2;
}
break;
case 4: // tri fan, copy first and last vert
g_pVideoData -= m_VertexSize*(v-startv+extraverts);
ConvertVertices(1);
g_pVideoData += m_VertexSize*(v-startv+extraverts-2);
ConvertVertices(1);
extraverts = 2;
break;
case 6: // line strip
g_pVideoData -= m_VertexSize*1;
ConvertVertices(1);
extraverts = 1;
break;
default:
extraverts = 0;
break;
}
startv = v;
}
int remainingPrims = remainingVerts / granularity;
remainingVerts = remainingPrims * granularity;
if (count - v < remainingVerts)
remainingVerts = count - v;
ConvertVertices(remainingVerts); if (VertexManager::GetRemainingSize() < count * native_stride)
ERROR_LOG(VIDEO, "VertexManager: Buffer not large enough for all vertices! "
v += remainingVerts; "Increase MAXVBUFFERSIZE or we need primitive breaking afterall.");
} }
if (startv < count) VertexManager::AddVertices(primitive, count);
VertexManager::AddVertices(primitive, count - startv + extraverts); ConvertVertices(count);
} }

27
Source/Core/VideoCommon/Src/VertexManagerBase.cpp
View File

@ -92,6 +92,7 @@ int VertexManager::GetRemainingSize()
return (int)(s_pEndBufferPointer - s_pCurBufferPointer); return (int)(s_pEndBufferPointer - s_pCurBufferPointer);
} }
// Not used anywhere
int VertexManager::GetRemainingVertices(int primitive) int VertexManager::GetRemainingVertices(int primitive)
{ {
switch (primitive) switch (primitive)
@ -123,32 +124,6 @@ void VertexManager::AddVertices(int primitive, int numVertices)
if (numVertices <= 0) if (numVertices <= 0)
return; return;
switch (primitive)
{
case GX_DRAW_QUADS:
case GX_DRAW_TRIANGLES:
case GX_DRAW_TRIANGLE_STRIP:
case GX_DRAW_TRIANGLE_FAN:
if (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen() < 3 * numVertices)
Flush();
break;
case GX_DRAW_LINES:
case GX_DRAW_LINE_STRIP:
if (MAXIBUFFERSIZE - IndexGenerator::GetLineindexLen() < 2 * numVertices)
Flush();
break;
case GX_DRAW_POINTS:
if (MAXIBUFFERSIZE - IndexGenerator::GetPointindexLen() < numVertices)
Flush();
break;
default:
return;
break;
}
if (Flushed) if (Flushed)
{ {
IndexGenerator::Start(TIBuffer, LIBuffer, PIBuffer); IndexGenerator::Start(TIBuffer, LIBuffer, PIBuffer);