OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- make RenderCommands able to use Shape2D vertex buffers past the Shape2D's lifetime without crashing

Browse source
This commit is contained in:
Gutawer 2021-07-29 18:58:29 +01:00 • committed by Christoph Oelckers
commit 67e7d1a6f5
3 changed files with 47 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/common/rendering/hwrenderer/hw_draw2d.cpp
View file

@ -178,22 +178,22 @@ void Draw2D(F2DDrawer *drawer, FRenderState &state)
state.EnableTexture(false);
}
if (cmd.shape2D != nullptr)
if (cmd.shape2DBufInfo != nullptr)
{
state.SetVertexBuffer(&cmd.shape2D->buffers[cmd.shape2DBufIndex]);
state.SetVertexBuffer(&cmd.shape2DBufInfo->buffers[cmd.shape2DBufIndex]);
state.DrawIndexed(DT_Triangles, 0, cmd.shape2DIndexCount);
state.SetVertexBuffer(&vb);
if (cmd.shape2DCommandCounter == cmd.shape2D->lastCommand)
if (cmd.shape2DCommandCounter == cmd.shape2DBufInfo->lastCommand)
{
cmd.shape2D->lastCommand = -1;
if (cmd.shape2D->bufIndex > 0)
cmd.shape2DBufInfo->lastCommand = -1;
if (cmd.shape2DBufInfo->bufIndex > 0)
{
cmd.shape2D->needsVertexUpload = true;
cmd.shape2D->buffers.Clear();
cmd.shape2D->bufIndex = -1;
cmd.shape2DBufInfo->needsVertexUpload = true;
cmd.shape2DBufInfo->buffers.Clear();
cmd.shape2DBufInfo->bufIndex = -1;
}
}
cmd.shape2D->uploadedOnce = false;
cmd.shape2DBufInfo->uploadedOnce = false;
}
else
{