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

[host] dxgi: performance improvements

Browse Source
This commit is contained in:
Geoffrey McRae 2017-12-29 07:01:13 +11:00
parent 2f2813037b
commit 2d746cbfd4
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
host/Capture/DXGI.cpp
View File

@ -265,7 +265,6 @@ void DXGI::WaitForDesktop()
GrabStatus DXGI::GrabFrame(FrameInfo & frame) GrabStatus DXGI::GrabFrame(FrameInfo & frame)
{ {
TRACE;
if (!m_initialized) if (!m_initialized)
return GRAB_STATUS_ERROR; return GRAB_STATUS_ERROR;
@ -303,6 +302,7 @@ GrabStatus DXGI::GrabFrame(FrameInfo & frame)
{ {
if (!m_surfaceMapped) if (!m_surfaceMapped)
continue; continue;
m_memcpy.Wake();
// send the last frame again if we timeout to prevent the client stalling on restart // send the last frame again if we timeout to prevent the client stalling on restart
frame.width = m_width; frame.width = m_width;
@ -416,6 +416,10 @@ GrabStatus DXGI::GrabFrame(FrameInfo & frame)
return GRAB_STATUS_ERROR; return GRAB_STATUS_ERROR;
} }
TRACE_START("DXGI Memory Copy");
// wake up the copy threads
m_memcpy.Wake();
ID3D11Texture2DPtr src(res); ID3D11Texture2DPtr src(res);
res.Release(); res.Release();
if (!src) if (!src)
@ -427,12 +431,6 @@ GrabStatus DXGI::GrabFrame(FrameInfo & frame)
m_deviceContext->CopyResource(m_texture, src); m_deviceContext->CopyResource(m_texture, src);
src.Release(); src.Release();
if (m_surfaceMapped)
{
m_deviceContext->Unmap(m_texture, 0);
m_surfaceMapped = false;
}
status = m_deviceContext->Map(m_texture, 0, D3D11_MAP_READ, 0, &m_mapping); status = m_deviceContext->Map(m_texture, 0, D3D11_MAP_READ, 0, &m_mapping);
if (FAILED(status)) if (FAILED(status))
{ {
@ -445,10 +443,9 @@ GrabStatus DXGI::GrabFrame(FrameInfo & frame)
frame.width = m_width; frame.width = m_width;
frame.height = m_height; frame.height = m_height;
frame.pitch = m_mapping.RowPitch; frame.pitch = m_mapping.RowPitch;
frame.stride = m_mapping.RowPitch / 4; frame.stride = m_mapping.RowPitch >> 2;
unsigned int size = m_height * m_mapping.RowPitch;
TRACE_START("DXGI Memory Copy"); const unsigned int size = m_height * m_mapping.RowPitch;
m_memcpy.Copy(frame.buffer, m_mapping.pData, size < frame.bufferSize ? size : frame.bufferSize); m_memcpy.Copy(frame.buffer, m_mapping.pData, size < frame.bufferSize ? size : frame.bufferSize);
TRACE_END; TRACE_END;