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

Fix batching issue with non-instanced primitives;

This commit is contained in:
bjorn 2019-05-12 13:58:37 -07:00
parent 6ff35420bd
commit 511afef0c6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/graphics/graphics.c
View File

@ -492,8 +492,8 @@ void lovrGraphicsBatch(BatchRequest* req) {
for (int i = state.batchCount - 1; i >= 0; i--) {
Batch* b = &state.batches[i];
if (b->count >= MAX_DRAWS) { continue; }
if (!areBatchParamsEqual(req->type, b->type, &req->params, &b->params)) { continue; }
if (b->count >= MAX_DRAWS) { goto next; }
if (!areBatchParamsEqual(req->type, b->type, &req->params, &b->params)) { goto next; }
if (b->canvas == canvas && b->shader == shader && !memcmp(&b->pipeline, pipeline, sizeof(Pipeline)) && b->material == material) {
batch = b;
break;
@ -501,9 +501,10 @@ void lovrGraphicsBatch(BatchRequest* req) {
// Draws can't be reordered when blending is on, depth test is off, or either of the batches
// are streaming their vertices (since buffers are append-only)
next:
if (b->pipeline.blendMode != BLEND_NONE || pipeline->blendMode != BLEND_NONE) { break; }
if (b->pipeline.depthTest == COMPARE_NONE || pipeline->depthTest == COMPARE_NONE) { break; }
if (!b->instanced || !req->instanced) { break; }
if (!req->instanced) { break; }
}
}