lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Include temp buffer offset in draw range;

This commit is contained in:
bjorn 2023-07-17 18:45:07 -07:00
parent 534d47904e
commit 5c322d3403
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/graphics/graphics.c
View File

@ -1816,7 +1816,8 @@ Buffer* lovrGraphicsGetBuffer(const BufferInfo* info, void** data) {
lovrBufferInit(buffer, info, charCount);
MappedBuffer mapped = mapBuffer(&state.streamBuffers, buffer->info.size, state.limits.uniformBufferAlign);
size_t align = lcm(state.limits.uniformBufferAlign, buffer->info.format ? buffer->info.format->stride : 1);
MappedBuffer mapped = mapBuffer(&state.streamBuffers, buffer->info.size, align);
buffer->gpu = mapped.buffer;
buffer->offset = mapped.offset;
buffer->pointer = mapped.pointer;
@ -5624,6 +5625,13 @@ static void lovrPassResolveBuffers(Pass* pass, DrawInfo* info, Draw* draw) {
lovrCheck(info->vertex.buffer->info.format->stride <= state.limits.vertexBufferStride, "Vertex buffer stride exceeds vertexBufferStride limit");
trackBuffer(pass, info->vertex.buffer, GPU_PHASE_INPUT_VERTEX, GPU_CACHE_VERTEX);
draw->vertexBuffer = info->vertex.buffer->gpu;
// Deprecated (temp buffer offset)
if (info->index.buffer || info->index.count > 0) {
draw->baseVertex += info->vertex.buffer->offset / info->vertex.buffer->info.format->stride;
} else {
draw->start += info->vertex.buffer->offset / info->vertex.buffer->info.format->stride;
}
} else {
draw->vertexBuffer = state.defaultBuffer->gpu;
}
@ -5638,6 +5646,7 @@ static void lovrPassResolveBuffers(Pass* pass, DrawInfo* info, Draw* draw) {
trackBuffer(pass, info->index.buffer, GPU_PHASE_INPUT_INDEX, GPU_CACHE_INDEX);
draw->indexBuffer = info->index.buffer->gpu;
draw->flags |= info->index.buffer->info.format->stride == 4 ? DRAW_INDEX32 : 0;
draw->start += info->index.buffer->offset / info->index.buffer->info.format->stride; // Deprecated
} else {
draw->indexBuffer = NULL;
}