DevKit7/citro3d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add C3D_RenderTargetDetachOutput (called automatically on render target destroy)

Browse Source
This commit is contained in:
fincs 2020-09-28 23:33:02 +02:00
parent 4e02e27222
commit 03235602cd
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/c3d/renderqueue.h
View File

@ -64,6 +64,11 @@ C3D_RenderTarget* C3D_RenderTargetCreateFromTex(C3D_Tex* tex, GPU_TEXFACE face,
void C3D_RenderTargetDelete(C3D_RenderTarget* target); void C3D_RenderTargetDelete(C3D_RenderTarget* target);
void C3D_RenderTargetSetOutput(C3D_RenderTarget* target, gfxScreen_t screen, gfx3dSide_t side, u32 transferFlags); void C3D_RenderTargetSetOutput(C3D_RenderTarget* target, gfxScreen_t screen, gfx3dSide_t side, u32 transferFlags);
static inline void C3D_RenderTargetDetachOutput(C3D_RenderTarget* target)
{
C3D_RenderTargetSetOutput(NULL, target->screen, target->side, 0);
}
static inline void C3D_RenderTargetClear(C3D_RenderTarget* target, C3D_ClearBits clearBits, u32 clearColor, u32 clearDepth) static inline void C3D_RenderTargetClear(C3D_RenderTarget* target, C3D_ClearBits clearBits, u32 clearColor, u32 clearDepth)
{ {
C3D_FrameBufClear(&target->frameBuf, clearBits, clearColor, clearDepth); C3D_FrameBufClear(&target->frameBuf, clearBits, clearColor, clearDepth);

10
source/renderqueue.c
View File

@ -355,6 +355,9 @@ void C3D_RenderTargetDelete(C3D_RenderTarget* target)
{ {
if (inFrame) if (inFrame)
svcBreak(USERBREAK_PANIC); // Shouldn't happen. svcBreak(USERBREAK_PANIC); // Shouldn't happen.
if (target->linked)
C3D_RenderTargetDetachOutput(target);
else
C3Di_WaitAndClearQueue(-1); C3Di_WaitAndClearQueue(-1);
C3Di_RenderTargetDestroy(target); C3Di_RenderTargetDestroy(target);
} }
@ -365,13 +368,20 @@ void C3D_RenderTargetSetOutput(C3D_RenderTarget* target, gfxScreen_t screen, gfx
if (screen==GFX_BOTTOM) id = 2; if (screen==GFX_BOTTOM) id = 2;
else if (side==GFX_RIGHT) id = 1; else if (side==GFX_RIGHT) id = 1;
if (linkedTarget[id]) if (linkedTarget[id])
{
linkedTarget[id]->linked = false; linkedTarget[id]->linked = false;
if (!inFrame)
C3Di_WaitAndClearQueue(-1);
}
linkedTarget[id] = target; linkedTarget[id] = target;
if (target)
{
target->linked = true; target->linked = true;
target->transferFlags = transferFlags; target->transferFlags = transferFlags;
target->screen = screen; target->screen = screen;
target->side = side; target->side = side;
} }
}
static void C3Di_SafeDisplayTransfer(u32* inadr, u32 indim, u32* outadr, u32 outdim, u32 flags) static void C3Di_SafeDisplayTransfer(u32* inadr, u32 indim, u32* outadr, u32 outdim, u32 flags)
{ {