mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-08 01:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

d3d12: Support triangle fan

Browse source 
Fix missing character members in the guided fate paradox
This commit is contained in:
vlj 2015-06-28 22:35:13 +02:00 • committed by Vincent Lejeune
commit bf394d4f56
2 changed files with 40 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

49
rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp
View file

@ -313,7 +313,7 @@ std::pair<std::vector<D3D12_VERTEX_BUFFER_VIEW>, D3D12_INDEX_BUFFER_VIEW> D3D12G
result.first.push_back(vertexBufferView); result.first.push_back(vertexBufferView);
} }
// Only handle quads now // Only handle quads and triangle fan now
switch (m_draw_mode - 1) switch (m_draw_mode - 1)
{ {
default: default:
@ -323,11 +323,11 @@ std::pair<std::vector<D3D12_VERTEX_BUFFER_VIEW>, D3D12_INDEX_BUFFER_VIEW> D3D12G
case GL_LINE_STRIP: case GL_LINE_STRIP:
case GL_TRIANGLES: case GL_TRIANGLES:
case GL_TRIANGLE_STRIP: case GL_TRIANGLE_STRIP:
case GL_TRIANGLE_FAN:
case GL_QUAD_STRIP: case GL_QUAD_STRIP:
case GL_POLYGON: case GL_POLYGON:
m_forcedIndexBuffer = false; m_forcedIndexBuffer = false;
break; break;
case GL_TRIANGLE_FAN:
case GL_QUADS: case GL_QUADS:
m_forcedIndexBuffer = true; m_forcedIndexBuffer = true;
break; break;
@ -364,7 +364,17 @@ std::pair<std::vector<D3D12_VERTEX_BUFFER_VIEW>, D3D12_INDEX_BUFFER_VIEW> D3D12G
else if (indexed_draw && m_forcedIndexBuffer) else if (indexed_draw && m_forcedIndexBuffer)
indexCount = 6 * m_indexed_array.m_data.size() / (4 * indexSize); indexCount = 6 * m_indexed_array.m_data.size() / (4 * indexSize);
else else
indexCount = m_draw_array_count * 6 / 4; {
switch (m_draw_mode - 1)
{
case GL_TRIANGLE_FAN:
indexCount = (m_draw_array_count - 2) * 3;
break;
case GL_QUADS:
indexCount = m_draw_array_count * 6 / 4;
break;
}
}
size_t subBufferSize = align(indexCount * indexSize, 64); size_t subBufferSize = align(indexCount * indexSize, 64);
assert(m_vertexIndexData.canAlloc(subBufferSize)); assert(m_vertexIndexData.canAlloc(subBufferSize));
@ -386,6 +396,7 @@ std::pair<std::vector<D3D12_VERTEX_BUFFER_VIEW>, D3D12_INDEX_BUFFER_VIEW> D3D12G
streamBuffer(bufferMap, m_indexed_array.m_data.data(), subBufferSize); streamBuffer(bufferMap, m_indexed_array.m_data.data(), subBufferSize);
else if (indexed_draw && m_forcedIndexBuffer) else if (indexed_draw && m_forcedIndexBuffer)
{ {
// Only quads supported now
switch (m_indexed_array.m_type) switch (m_indexed_array.m_type)
{ {
case CELL_GCM_DRAW_INDEX_ARRAY_TYPE_32: case CELL_GCM_DRAW_INDEX_ARRAY_TYPE_32:
@ -399,17 +410,31 @@ std::pair<std::vector<D3D12_VERTEX_BUFFER_VIEW>, D3D12_INDEX_BUFFER_VIEW> D3D12G
else else
{ {
unsigned short *typedDst = static_cast<unsigned short *>(bufferMap); unsigned short *typedDst = static_cast<unsigned short *>(bufferMap);
for (unsigned i = 0; i < m_draw_array_count / 4; i++) switch (m_draw_mode - 1)
{ {
// First triangle case GL_TRIANGLE_FAN:
typedDst[6 * i] = 4 * i; for (unsigned i = 0; i < (m_draw_array_count - 2); i++)
typedDst[6 * i + 1] = 4 * i + 1; {
typedDst[6 * i + 2] = 4 * i + 2; typedDst[3 * i] = 0;
// Second triangle typedDst[3 * i + 1] = i + 2 - 1;
typedDst[6 * i + 3] = 4 * i + 2; typedDst[3 * i + 2] = i + 2;
typedDst[6 * i + 4] = 4 * i + 3; }
typedDst[6 * i + 5] = 4 * i; break;
case GL_QUADS:
for (unsigned i = 0; i < m_draw_array_count / 4; i++)
{
// First triangle
typedDst[6 * i] = 4 * i;
typedDst[6 * i + 1] = 4 * i + 1;
typedDst[6 * i + 2] = 4 * i + 2;
// Second triangle
typedDst[6 * i + 3] = 4 * i + 2;
typedDst[6 * i + 4] = 4 * i + 3;
typedDst[6 * i + 5] = 4 * i;
}
break;
} }
} }
indexBuffer->Unmap(0, nullptr); indexBuffer->Unmap(0, nullptr);
m_vertexIndexData.m_resourceStoredSinceLastSync.push_back(std::make_tuple(heapOffset, subBufferSize, indexBuffer)); m_vertexIndexData.m_resourceStoredSinceLastSync.push_back(std::make_tuple(heapOffset, subBufferSize, indexBuffer));

5
rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
View file

@ -664,7 +664,8 @@ void D3D12GSRender::ExecCMD()
commandList->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); commandList->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
break; break;
case GL_TRIANGLE_FAN: case GL_TRIANGLE_FAN:
commandList->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ); commandList->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
requireIndexBuffer = true;
break; break;
case GL_QUADS: case GL_QUADS:
commandList->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); commandList->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
@ -680,7 +681,7 @@ void D3D12GSRender::ExecCMD()
// Indexed quad // Indexed quad
if (m_forcedIndexBuffer && m_indexed_array.m_count) if (m_forcedIndexBuffer && m_indexed_array.m_count)
commandList->DrawIndexedInstanced((UINT)indexCount, 1, 0, 0, 0); commandList->DrawIndexedInstanced((UINT)indexCount, 1, 0, 0, 0);
// Non indexed quad // Non indexed quad/triangle fan
else if (m_forcedIndexBuffer && !m_indexed_array.m_count) else if (m_forcedIndexBuffer && !m_indexed_array.m_count)
commandList->DrawIndexedInstanced((UINT)indexCount, 1, 0, (UINT)m_draw_array_first, 0); commandList->DrawIndexedInstanced((UINT)indexCount, 1, 0, (UINT)m_draw_array_first, 0);
// Indexed triangles // Indexed triangles