zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 14:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix GC shutdown crash due to canvas objects not getting GC'ed at the end

Browse source 
Fix typo in Draw2D and add support for specifying the viewport size directly
This commit is contained in:
Magnus Norddahl 2022-07-25 00:04:34 +02:00 committed by Christoph Oelckers
parent 6137ea12d1
commit b8569fa29f
4 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/2d/v_draw.h
View file

@ -328,3 +328,4 @@ public:
};
void Draw2D(F2DDrawer* drawer, FRenderState& state);
void Draw2D(F2DDrawer* drawer, FRenderState& state, int x, int y, int width, int height);

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

@ -51,13 +51,18 @@
CVAR(Bool, gl_aalines, false, CVAR_ARCHIVE)
void Draw2D(F2DDrawer *drawer, FRenderState &state)
void Draw2D(F2DDrawer* drawer, FRenderState& state)
{
const auto& mScreenViewport = screen->mScreenViewport;
Draw2D(drawer, state, mScreenViewport.left, mScreenViewport.top, mScreenViewport.width, mScreenViewport.height);
}
void Draw2D(F2DDrawer* drawer, FRenderState& state, int x, int y, int width, int height)
{
twoD.Clock();
const auto &mScreenViewport = screen->mScreenViewport;
state.SetViewport(mScreenViewport.left, mScreenViewport.top, mScreenViewport.width, mScreenViewport.height);
screen->mViewpoints->Set2D(state, twod->GetWidth(), twod->GetHeight());
state.SetViewport(x, y, width, height);
screen->mViewpoints->Set2D(state, drawer->GetWidth(), drawer->GetHeight());
state.EnableStencil(false);
state.SetStencil(0, SOP_Keep, SF_AllOn);

10
src/common/textures/textures.h
View file

@ -304,6 +304,7 @@ public:
};
class FCanvas;
extern TArray<FCanvas*> AllCanvases;
// A texture that can be drawn to.
@ -319,6 +320,15 @@ public:
aspectRatio = (float)width / height;
}
~FCanvasTexture()
{
if (Canvas)
{
AllCanvases.Delete(AllCanvases.Find(Canvas));
Canvas = nullptr;
}
}
void NeedUpdate() { bNeedsUpdate = true; }
void SetUpdated(bool rendertype) { bNeedsUpdate = false; bFirstUpdate = false; bLastUpdateType = rendertype; }
bool CheckNeedsUpdate() const { return bNeedsUpdate; }

2
src/rendering/hwrenderer/hw_entrypoint.cpp
View file

@ -359,7 +359,7 @@ sector_t* RenderView(player_t* player)
{
screen->RenderTextureView(canvas->Tex, [=](IntRect& bounds)
{
Draw2D(&canvas->Drawer, *screen->RenderState());
Draw2D(&canvas->Drawer, *screen->RenderState(), 0, 0, canvas->Tex->GetWidth(), canvas->Tex->GetHeight());
canvas->Drawer.Clear();
});
canvas->Tex->SetUpdated(true);