mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-12-22 22:01:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[host] dxgi: improve frame signaling mechanics

Browse source
This commit is contained in:
Geoffrey McRae 2020-08-15 18:16:11 +10:00
parent 969effedde
commit cdc3384883
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
host/platform/Windows/capture/DXGI/src/dxgi.c
View file

@ -26,6 +26,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include "common/event.h" #include "common/event.h"
#include <assert.h> #include <assert.h>
#include <stdatomic.h>
#include <dxgi.h> #include <dxgi.h>
#include <d3d11.h> #include <d3d11.h>
#include <d3dcommon.h> #include <d3dcommon.h>
@ -82,7 +83,7 @@ struct iface
Texture * texture; Texture * texture;
int texRIndex; int texRIndex;
int texWIndex; int texWIndex;
volatile int texReady; atomic_int texReady;
bool needsRelease; bool needsRelease;
CaptureGetPointerBuffer getPointerBufferFn; CaptureGetPointerBuffer getPointerBufferFn;
@ -228,9 +229,9 @@ static bool dxgi_init()
this->stop = false; this->stop = false;
this->texRIndex = 0; this->texRIndex = 0;
this->texWIndex = 0; this->texWIndex = 0;
this->texReady = 0; atomic_store(&this->texReady, 0);
lgResetEvent(this->frameEvent ); lgResetEvent(this->frameEvent);
status = CreateDXGIFactory1(&IID_IDXGIFactory1, (void **)&this->factory); status = CreateDXGIFactory1(&IID_IDXGIFactory1, (void **)&this->factory);
if (FAILED(status)) if (FAILED(status))
@ -755,8 +756,8 @@ static CaptureResult dxgi_capture()
// set the state, and signal // set the state, and signal
tex->state = TEXTURE_STATE_PENDING_MAP; tex->state = TEXTURE_STATE_PENDING_MAP;
INTERLOCKED_INC(&this->texReady); if (atomic_fetch_add_explicit(&this->texReady, 1, memory_order_relaxed) == 0)
lgSignalEvent(this->frameEvent); lgSignalEvent(this->frameEvent);
// advance the write index // advance the write index
if (++this->texWIndex == this->maxTextures) if (++this->texWIndex == this->maxTextures)
@ -852,12 +853,13 @@ static CaptureResult dxgi_waitFrame(CaptureFrame * frame)
assert(this->initialized); assert(this->initialized);
// NOTE: the event may be signaled when there are no frames available // NOTE: the event may be signaled when there are no frames available
if(this->texReady == 0) if(atomic_load_explicit(&this->texReady, memory_order_acquire) == 0)
{ {
if (!lgWaitEvent(this->frameEvent, 1000)) if (!lgWaitEvent(this->frameEvent, 1000))
return CAPTURE_RESULT_TIMEOUT; return CAPTURE_RESULT_TIMEOUT;
if (this->texReady == 0) // the count will still be zero if we are stopping
if(atomic_load_explicit(&this->texReady, memory_order_acquire) == 0)
return CAPTURE_RESULT_TIMEOUT; return CAPTURE_RESULT_TIMEOUT;
} }
@ -883,7 +885,7 @@ static CaptureResult dxgi_waitFrame(CaptureFrame * frame)
frame->stride = this->stride; frame->stride = this->stride;
frame->format = this->format; frame->format = this->format;
INTERLOCKED_DEC(&this->texReady); atomic_fetch_sub_explicit(&this->texReady, 1, memory_order_release);
return CAPTURE_RESULT_OK; return CAPTURE_RESULT_OK;
} }