Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-22 13:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[c-host] dxgi: allow a 2nd frame to be captured during a prior copy

Browse Source
This commit is contained in:
Geoffrey McRae 2019-03-04 10:42:54 +11:00
parent 942c417cbb
commit 79ce98116a
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
c-host/windows/capture/dxgi.c
View File

@ -18,6 +18,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "capture/interface.h" #include "capture/interface.h"
#include "app.h"
#include "debug.h" #include "debug.h"
#include "windows/windebug.h" #include "windows/windebug.h"
@ -41,6 +42,7 @@ struct iface
IDXGIOutputDuplication * dup; IDXGIOutputDuplication * dup;
ID3D11Texture2D * texture; ID3D11Texture2D * texture;
bool needsRelease; bool needsRelease;
osEventHandle * copyEvent;
unsigned int width; unsigned int width;
unsigned int height; unsigned int height;
@ -74,6 +76,14 @@ static bool dxgi_create()
return false; return false;
} }
this->copyEvent = os_createEvent();
if (!this->copyEvent)
{
DEBUG_ERROR("failed to create the copy event");
free(this);
return false;
}
return true; return true;
} }
@ -97,6 +107,9 @@ static bool dxgi_init()
dpiDone = true; dpiDone = true;
} }
// pre-signal the copy event
os_signalEvent(this->copyEvent);
HRESULT status; HRESULT status;
IDXGIFactory1 * factory; IDXGIFactory1 * factory;
IDXGIAdapter1 * adapter; IDXGIAdapter1 * adapter;
@ -346,6 +359,8 @@ static bool dxgi_deinit()
{ {
assert(this); assert(this);
os_signalEvent(this->copyEvent);
if (this->texture) if (this->texture)
{ {
ID3D11Texture2D_Release(this->texture); ID3D11Texture2D_Release(this->texture);
@ -394,6 +409,8 @@ static void dxgi_free()
if (this->initialized) if (this->initialized)
dxgi_deinit(); dxgi_deinit();
os_freeEvent(this->copyEvent);
free(this); free(this);
this = NULL; this = NULL;
} }
@ -444,11 +461,15 @@ static CaptureResult dxgi_capture(bool * hasFrameUpdate, bool * hasPointerUpdate
if (FAILED(status)) if (FAILED(status))
{ {
DEBUG_WINERROR("Failed to get the texture from the dxgi resource", status); DEBUG_WINERROR("Failed to get the texture from the dxgi resource", status);
IDXGIResource_Release(res);
return CAPTURE_RESULT_ERROR; return CAPTURE_RESULT_ERROR;
} }
if (frameInfo.LastPresentTime.QuadPart != 0) if (frameInfo.LastPresentTime.QuadPart != 0)
{ {
// wait for the prior copy to finish in getFrame
os_waitEvent(this->copyEvent);
ID3D11DeviceContext_CopyResource(this->deviceContext, ID3D11DeviceContext_CopyResource(this->deviceContext,
(ID3D11Resource *)this->texture, (ID3D11Resource *)src); (ID3D11Resource *)this->texture, (ID3D11Resource *)src);
@ -460,7 +481,6 @@ static CaptureResult dxgi_capture(bool * hasFrameUpdate, bool * hasPointerUpdate
*hasPointerUpdate = true; *hasPointerUpdate = true;
IDXGIResource_Release(res); IDXGIResource_Release(res);
return CAPTURE_RESULT_OK; return CAPTURE_RESULT_OK;
} }
@ -487,6 +507,7 @@ static bool dxgi_getFrame(CaptureFrame * frame)
memcpy(frame->data, mapping.pData, this->pitch * this->height); memcpy(frame->data, mapping.pData, this->pitch * this->height);
ID3D11DeviceContext_Unmap(this->deviceContext, (ID3D11Resource*)this->texture, 0); ID3D11DeviceContext_Unmap(this->deviceContext, (ID3D11Resource*)this->texture, 0);
os_signalEvent(this->copyEvent);
return true; return true;
} }