LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-12 08:30:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

graphics: fix state tracking when an indexed batched draw has 0 indices.

Browse Source 
fixes #2291.
This commit is contained in:
Sasha Szpakowski
2026-04-09 20:31:40 -03:00
parent 8ae57772b1
commit 90aff3bdbd
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Graphics.cpp
+7 -5
View File
@@ -1954,10 +1954,11 @@ Graphics::BatchedVertexData Graphics::requestBatchedDraw(const BatchedDrawComman
bool shouldflush = false;
bool shouldresize = false;
bool indexeddraw = cmd.indexMode != TRIANGLEINDEX_NONE;
if (cmd.primitiveMode != state.primitiveMode
|| cmd.formats[0] != state.formats[0] || cmd.formats[1] != state.formats[1]
|| ((cmd.indexMode != TRIANGLEINDEX_NONE) != (state.indexCount > 0))
|| indexeddraw != state.indexedDraw
|| cmd.texture != state.texture
|| cmd.standardShaderType != state.standardShaderType)
{
@@ -1967,7 +1968,7 @@ Graphics::BatchedVertexData Graphics::requestBatchedDraw(const BatchedDrawComman
int totalvertices = state.vertexCount + cmd.vertexCount;
// We only support uint16 index buffers for now.
if (totalvertices > LOVE_UINT16_MAX && cmd.indexMode != TRIANGLEINDEX_NONE)
if (totalvertices > LOVE_UINT16_MAX && indexeddraw)
shouldflush = true;
int reqIndexCount = getIndexCount(cmd.indexMode, cmd.vertexCount);
@@ -1996,7 +1997,7 @@ Graphics::BatchedVertexData Graphics::requestBatchedDraw(const BatchedDrawComman
newdatasizes[i] = stride * cmd.vertexCount;
}
if (cmd.indexMode != TRIANGLEINDEX_NONE)
if (indexeddraw)
{
size_t datasize = (state.indexCount + reqIndexCount) * sizeof(uint16);
@@ -2015,6 +2016,7 @@ Graphics::BatchedVertexData Graphics::requestBatchedDraw(const BatchedDrawComman
flushBatchedDraws();
state.primitiveMode = cmd.primitiveMode;
state.indexedDraw = indexeddraw;
state.formats[0] = cmd.formats[0];
state.formats[1] = cmd.formats[1];
state.texture = cmd.texture;
@@ -2048,7 +2050,7 @@ Graphics::BatchedVertexData Graphics::requestBatchedDraw(const BatchedDrawComman
}
}
if (cmd.indexMode != TRIANGLEINDEX_NONE)
if (indexeddraw)
{
if (state.indexBufferMap.data == nullptr)
state.indexBufferMap = state.indexBuffer->map(reqIndexSize);
@@ -2129,7 +2131,7 @@ void Graphics::flushBatchedDraws()
pushIdentityTransform();
if (sbstate.indexCount > 0)
if (sbstate.indexedDraw)
{
usedsizes[2] = sizeof(uint16) * sbstate.indexCount;
src/modules/graphics/Graphics.h
+1
View File
@@ -974,6 +974,7 @@ protected:
StreamBuffer *indexBuffer = nullptr;
PrimitiveType primitiveMode = PRIMITIVE_TRIANGLES;
bool indexedDraw = false;
CommonFormat formats[2] = {};
StrongRef<Texture> texture;
Shader::StandardShader standardShaderType = Shader::STANDARD_DEFAULT;