mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 04:22:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

nwindowReleaseBuffers: cancel dequeued buffer instead of failing

Browse Source
This commit is contained in:
fincs 2024-08-19 17:43:32 +02:00
parent 3c851a3443
commit 7b4e02be35
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
nx/source/display/native_window.c
View File

@ -27,6 +27,19 @@ static Result _nwindowConnect(NWindow* nw)
return rc; return rc;
} }
static Result _nwindowCancelBuffer(NWindow* nw, s32 slot, const NvMultiFence* fence)
{
static const NvMultiFence s_emptyFence = {0};
if (!fence)
fence = &s_emptyFence;
Result rc = bqCancelBuffer(&nw->bq, slot, fence);
if (R_SUCCEEDED(rc))
nw->cur_slot = -1;
return rc;
}
static Result _nwindowDisconnect(NWindow* nw) static Result _nwindowDisconnect(NWindow* nw)
{ {
Result rc = bqDisconnect(&nw->bq, NATIVE_WINDOW_API_CPU); Result rc = bqDisconnect(&nw->bq, NATIVE_WINDOW_API_CPU);
@ -267,13 +280,7 @@ Result nwindowCancelBuffer(NWindow* nw, s32 slot, const NvMultiFence* fence)
return MAKERESULT(Module_Libnx, LibnxError_BadGfxQueueBuffer); return MAKERESULT(Module_Libnx, LibnxError_BadGfxQueueBuffer);
} }
static const NvMultiFence s_emptyFence = {0}; Result rc = _nwindowCancelBuffer(nw, slot, fence);
if (!fence)
fence = &s_emptyFence;
Result rc = bqCancelBuffer(&nw->bq, slot, fence);
if (R_SUCCEEDED(rc))
nw->cur_slot = -1;
mutexUnlock(&nw->mutex); mutexUnlock(&nw->mutex);
return rc; return rc;
@ -323,8 +330,9 @@ Result nwindowReleaseBuffers(NWindow* nw)
mutexLock(&nw->mutex); mutexLock(&nw->mutex);
if (nw->cur_slot >= 0) if (nw->cur_slot >= 0)
rc = MAKERESULT(Module_Libnx, LibnxError_BadInput); rc = _nwindowCancelBuffer(nw, nw->cur_slot, NULL);
else if (nw->is_connected && nw->slots_configured)
if (R_SUCCEEDED(rc) && nw->is_connected && nw->slots_configured)
rc = _nwindowDisconnect(nw); rc = _nwindowDisconnect(nw);
mutexUnlock(&nw->mutex); mutexUnlock(&nw->mutex);