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

d3d12: Clean indexed draw buffer gen code

Browse source
This commit is contained in:
vlj 2015-05-25 18:02:18 +02:00 • committed by Vincent Lejeune
commit 82545a7b56
3 changed files with 58 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -222,6 +222,24 @@ std::vector<D3D12_INPUT_ELEMENT_DESC> getIALayout(ID3D12Device *device, bool ind
return result; return result;
} }
template<typename IndexType, typename DstType, typename SrcType>
void expandIndexedQuads(DstType *dst, const SrcType *src, size_t indexCount)
{
IndexType *typedDst = reinterpret_cast<IndexType *>(dst);
const IndexType *typedSrc = reinterpret_cast<const IndexType *>(src);
for (unsigned i = 0; i < indexCount / 4; i++)
{
// First triangle
typedDst[6 * i] = typedSrc[4 * i];
typedDst[6 * i + 1] = typedSrc[4 * i + 1];
typedDst[6 * i + 2] = typedSrc[4 * i + 2];
// Second triangle
typedDst[6 * i + 3] = typedSrc[4 * i + 2];
typedDst[6 * i + 4] = typedSrc[4 * i + 3];
typedDst[6 * i + 5] = typedSrc[4 * i];
}
}
static static
D3D12_RESOURCE_DESC getBufferResourceDesc(size_t sizeInByte) D3D12_RESOURCE_DESC getBufferResourceDesc(size_t sizeInByte)
{ {
@ -300,13 +318,28 @@ std::pair<std::vector<D3D12_VERTEX_BUFFER_VIEW>, D3D12_INDEX_BUFFER_VIEW> D3D12G
if (indexed_draw || m_forcedIndexBuffer) if (indexed_draw || m_forcedIndexBuffer)
{ {
size_t subBufferSize; D3D12_INDEX_BUFFER_VIEW indexBufferView = {};
size_t indexSize;
switch (m_indexed_array.m_type)
{
default: // If it's not indexed draw, use 16 bits unsigned short
case CELL_GCM_DRAW_INDEX_ARRAY_TYPE_16:
indexBufferView.Format = DXGI_FORMAT_R16_UINT;
indexSize = 2;
break;
case CELL_GCM_DRAW_INDEX_ARRAY_TYPE_32:
indexBufferView.Format = DXGI_FORMAT_R32_UINT;
indexSize = 4;
break;
}
if (indexed_draw && !m_forcedIndexBuffer) if (indexed_draw && !m_forcedIndexBuffer)
subBufferSize = m_indexed_array.m_data.size(); indexCount = m_indexed_array.m_data.size() / indexSize;
else if (indexed_draw && m_forcedIndexBuffer) else if (indexed_draw && m_forcedIndexBuffer)
subBufferSize = 6 * m_indexed_array.m_data.size() / 4; indexCount = 6 * m_indexed_array.m_data.size() / (4 * indexSize);
else else
subBufferSize = 2 * m_draw_array_count * 6 / 4; indexCount = m_draw_array_count * 6 / 4;
size_t subBufferSize = indexCount * indexSize;
// 65536 alignment // 65536 alignment
size_t bufferHeapOffset = getCurrentResourceStorage().m_vertexIndexBuffersHeapFreeSpace; size_t bufferHeapOffset = getCurrentResourceStorage().m_vertexIndexBuffersHeapFreeSpace;
bufferHeapOffset = (bufferHeapOffset + 65536 - 1) & ~65535; bufferHeapOffset = (bufferHeapOffset + 65536 - 1) & ~65535;
@ -321,60 +354,45 @@ std::pair<std::vector<D3D12_VERTEX_BUFFER_VIEW>, D3D12_INDEX_BUFFER_VIEW> D3D12G
IID_PPV_ARGS(&indexBuffer) IID_PPV_ARGS(&indexBuffer)
)); ));
unsigned short *bufferMap; void *bufferMap;
check(indexBuffer->Map(0, nullptr, (void**)&bufferMap)); check(indexBuffer->Map(0, nullptr, (void**)&bufferMap));
size_t forcedIndexCount = 0;
if (indexed_draw && !m_forcedIndexBuffer) if (indexed_draw && !m_forcedIndexBuffer)
memcpy(bufferMap, m_indexed_array.m_data.data(), subBufferSize); memcpy(bufferMap, m_indexed_array.m_data.data(), subBufferSize);
else if (indexed_draw && m_forcedIndexBuffer) else if (indexed_draw && m_forcedIndexBuffer)
{ {
size_t indexcount = m_indexed_array.m_data.size() / 2; switch (m_indexed_array.m_type)
unsigned short *indexList = (unsigned short*)m_indexed_array.m_data.data();
for (unsigned i = 0; i < indexcount / 4; i++)
{ {
// First triangle case CELL_GCM_DRAW_INDEX_ARRAY_TYPE_32:
bufferMap[6 * i] = indexList[4 * i]; expandIndexedQuads<unsigned int>(bufferMap, m_indexed_array.m_data.data(), m_indexed_array.m_data.size() / 4);
bufferMap[6 * i + 1] = indexList[4 * i + 1]; break;
bufferMap[6 * i + 2] = indexList[4 * i + 2]; case CELL_GCM_DRAW_INDEX_ARRAY_TYPE_16:
// Second triangle expandIndexedQuads<unsigned short>(bufferMap, m_indexed_array.m_data.data(), m_indexed_array.m_data.size() / 2);
bufferMap[6 * i + 3] = indexList[4 * i + 2]; break;
bufferMap[6 * i + 4] = indexList[4 * i + 3];
bufferMap[6 * i + 5] = indexList[4 * i];
forcedIndexCount += 6;
} }
} }
else else
{ {
unsigned short *typedDst = static_cast<unsigned short *>(bufferMap);
for (unsigned i = 0; i < m_draw_array_count / 4; i++) for (unsigned i = 0; i < m_draw_array_count / 4; i++)
{ {
// First triangle // First triangle
bufferMap[6 * i] = 4 * i; typedDst[6 * i] = 4 * i;
bufferMap[6 * i + 1] = 4 * i + 1; typedDst[6 * i + 1] = 4 * i + 1;
bufferMap[6 * i + 2] = 4 * i + 2; typedDst[6 * i + 2] = 4 * i + 2;
// Second triangle // Second triangle
bufferMap[6 * i + 3] = 4 * i; typedDst[6 * i + 3] = 4 * i + 2;
bufferMap[6 * i + 4] = 4 * i + 2; typedDst[6 * i + 4] = 4 * i + 3;
bufferMap[6 * i + 5] = 4 * i + 3; typedDst[6 * i + 5] = 4 * i;
forcedIndexCount += 6;
} }
} }
indexBuffer->Unmap(0, nullptr); indexBuffer->Unmap(0, nullptr);
getCurrentResourceStorage().m_inflightResources.push_back(indexBuffer); getCurrentResourceStorage().m_inflightResources.push_back(indexBuffer);
getCurrentResourceStorage().m_vertexIndexBuffersHeapFreeSpace = bufferHeapOffset + subBufferSize; getCurrentResourceStorage().m_vertexIndexBuffersHeapFreeSpace = bufferHeapOffset + subBufferSize;
getCurrentResourceStorage().m_indexBufferCount = forcedIndexCount;
D3D12_INDEX_BUFFER_VIEW indexBufferView = {};
indexBufferView.SizeInBytes = (UINT)subBufferSize; indexBufferView.SizeInBytes = (UINT)subBufferSize;
indexBufferView.BufferLocation = indexBuffer->GetGPUVirtualAddress(); indexBufferView.BufferLocation = indexBuffer->GetGPUVirtualAddress();
switch (m_indexed_array.m_type)
{
case CELL_GCM_DRAW_INDEX_ARRAY_TYPE_32:
indexBufferView.Format = DXGI_FORMAT_R32_UINT;
break;
case CELL_GCM_DRAW_INDEX_ARRAY_TYPE_16:
indexBufferView.Format = DXGI_FORMAT_R16_UINT;
break;
}
if (m_forcedIndexBuffer) if (m_forcedIndexBuffer)
indexBufferView.Format = DXGI_FORMAT_R16_UINT; indexBufferView.Format = DXGI_FORMAT_R16_UINT;

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

@ -688,13 +688,13 @@ 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)getCurrentResourceStorage().m_indexBufferCount, 1, 0, 0, 0); commandList->DrawIndexedInstanced((UINT)indexCount, 1, 0, 0, 0);
// Non indexed quad // Non indexed quad
else if (m_forcedIndexBuffer && !m_indexed_array.m_count) else if (m_forcedIndexBuffer && !m_indexed_array.m_count)
commandList->DrawIndexedInstanced((UINT)getCurrentResourceStorage().m_indexBufferCount, 1, 0, (UINT)m_draw_array_first, 0); commandList->DrawIndexedInstanced((UINT)indexCount, 1, 0, (UINT)m_draw_array_first, 0);
// Indexed triangles // Indexed triangles
else if (m_indexed_array.m_count) else if (m_indexed_array.m_count)
commandList->DrawIndexedInstanced(m_indexed_array.m_data.size() / 4, 1, 0, (UINT)m_draw_array_first, 0); commandList->DrawIndexedInstanced((UINT)m_indexed_array.m_data.size() / 4, 1, 0, (UINT)m_draw_array_first, 0);
else if (m_draw_array_count) else if (m_draw_array_count)
commandList->DrawInstanced(m_draw_array_count, 1, m_draw_array_first, 0); commandList->DrawInstanced(m_draw_array_count, 1, m_draw_array_first, 0);

2
rpcs3/Emu/RSX/D3D12/D3D12GSRender.h
View file

@ -64,7 +64,6 @@ private:
// Vertex storage // Vertex storage
size_t m_vertexIndexBuffersHeapFreeSpace; size_t m_vertexIndexBuffersHeapFreeSpace;
ID3D12Heap *m_vertexIndexBuffersHeap; ID3D12Heap *m_vertexIndexBuffersHeap;
size_t m_indexBufferCount;
// Constants storage // Constants storage
ID3D12Heap *m_constantsBuffersHeap; ID3D12Heap *m_constantsBuffersHeap;
@ -97,6 +96,7 @@ private:
ResourceStorage m_perFrameStorage[2]; ResourceStorage m_perFrameStorage[2];
bool m_forcedIndexBuffer; bool m_forcedIndexBuffer;
size_t indexCount;
std::vector<D3D12_INPUT_ELEMENT_DESC> m_IASet; std::vector<D3D12_INPUT_ELEMENT_DESC> m_IASet;
D3D12RenderTargetSets *m_fbo; D3D12RenderTargetSets *m_fbo;