mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-13 16:18:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Common: Fix element count computation if addr is null (RSXVertexData)

Browse Source
This commit is contained in:
Vincent Lejeune 2015-10-05 01:54:19 +02:00
parent 2f211e4e5a
commit d511153836
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpcs3/Emu/RSX/Common/BufferUtils.cpp
View File

@ -20,11 +20,15 @@ std::vector<VertexBufferFormat> FormatVertexData(const RSXVertexData *m_vertex_d
const RSXVertexData &vertexData = m_vertex_data[i]; const RSXVertexData &vertexData = m_vertex_data[i];
if (!vertexData.IsEnabled()) continue; if (!vertexData.IsEnabled()) continue;
size_t elementCount = vertex_data_size[i] / (vertexData.size * vertexData.GetTypeSize()); size_t elementCount = ((vertexData.addr) ? vertex_data_size[i] : m_vertex_data[i].data.size()) / (vertexData.size * vertexData.GetTypeSize());
// If there is a single element, stride is 0, use the size of element instead // If there is a single element, stride is 0, use the size of element instead
size_t stride = vertexData.stride; size_t stride = vertexData.stride;
size_t elementSize = vertexData.GetTypeSize(); size_t elementSize = vertexData.GetTypeSize();
std::pair<size_t, size_t> range = std::make_pair(vertexData.addr + base_offset, vertexData.addr + base_offset + elementSize * vertexData.size + (elementCount - 1) * stride - 1); size_t start = vertexData.addr + base_offset;
size_t end = start + elementSize * vertexData.size + (elementCount - 1) * stride - 1;
std::pair<size_t, size_t> range = std::make_pair(start, end);
assert(start < end);
bool isMerged = false; bool isMerged = false;
for (VertexBufferFormat &vbf : Result) for (VertexBufferFormat &vbf : Result)