mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-01-03 11:17:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[idd] keep the textures mapped until overwrite for future re-use

Browse source
This commit is contained in:
Geoffrey McRae 2023-04-14 13:26:08 +10:00
parent 0c176acf94
commit 80b9bda59d
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
idd/LGIdd/CSwapChainProcessor.cpp
View file

@ -28,6 +28,13 @@ CSwapChainProcessor::~CSwapChainProcessor()
WaitForSingleObject(m_thread[0].Get(), INFINITE); WaitForSingleObject(m_thread[0].Get(), INFINITE);
if (m_thread[1].Get()) if (m_thread[1].Get())
WaitForSingleObject(m_thread[1].Get(), INFINITE); WaitForSingleObject(m_thread[1].Get(), INFINITE);
for(int i = 0; i < STAGING_TEXTURES; ++i)
if (m_cpuTex[i].map.pData)
{
m_device->m_context->Unmap(m_cpuTex[i].tex.Get(), 0);
m_cpuTex[i].map.pData = nullptr;
}
} }
DWORD CALLBACK CSwapChainProcessor::_SwapChainThread(LPVOID arg) DWORD CALLBACK CSwapChainProcessor::_SwapChainThread(LPVOID arg)
@ -153,10 +160,17 @@ void CSwapChainProcessor::SwapChainNewFrame(ComPtr<IDXGIResource> acquiredBuffer
D3D11_TEXTURE2D_DESC desc; D3D11_TEXTURE2D_DESC desc;
texture->GetDesc(&desc); texture->GetDesc(&desc);
if (!SetupStagingTexture(m_cpuTex[m_texWIndex], desc.Width, desc.Height, desc.Format)) StagingTexture &st = m_cpuTex[m_texWIndex];
if (st.map.pData)
{
m_device->m_context->Unmap(st.tex.Get(), 0);
st.map.pData = nullptr;
}
if (!SetupStagingTexture(st, desc.Width, desc.Height, desc.Format))
return; return;
m_device->m_context->CopyResource(m_cpuTex[m_texWIndex].tex.Get(), texture.Get()); m_device->m_context->CopyResource(st.tex.Get(), texture.Get());
InterlockedAdd(&m_copyCount, 1); InterlockedAdd(&m_copyCount, 1);
if (++m_texWIndex == STAGING_TEXTURES) if (++m_texWIndex == STAGING_TEXTURES)
@ -182,11 +196,10 @@ void CSwapChainProcessor::FrameThread()
continue; continue;
} }
D3D11_MAPPED_SUBRESOURCE map;
StagingTexture & t = m_cpuTex[m_texRIndex]; StagingTexture & t = m_cpuTex[m_texRIndex];
LOCK_CONTEXT(); LOCK_CONTEXT();
HRESULT status = m_device->m_context->Map(t.tex.Get(), 0, D3D11_MAP_READ, D3D11_MAP_FLAG_DO_NOT_WAIT, &map); HRESULT status = m_device->m_context->Map(t.tex.Get(), 0, D3D11_MAP_READ, D3D11_MAP_FLAG_DO_NOT_WAIT, &t.map);
UNLOCK_CONTEXT(); UNLOCK_CONTEXT();
if (FAILED(status)) if (FAILED(status))
@ -203,12 +216,7 @@ void CSwapChainProcessor::FrameThread()
continue; continue;
} }
m_devContext->SendFrame(t.width, t.height, map.RowPitch, t.format, map.pData); m_devContext->SendFrame(t.width, t.height, t.map.RowPitch, t.format, t.map.pData);
LOCK_CONTEXT();
m_device->m_context->Unmap(t.tex.Get(), 0);
UNLOCK_CONTEXT();
InterlockedAdd(&m_copyCount, -1); InterlockedAdd(&m_copyCount, -1);
if (++m_texRIndex == STAGING_TEXTURES) if (++m_texRIndex == STAGING_TEXTURES)
m_texRIndex = 0; m_texRIndex = 0;

1
idd/LGIdd/CSwapChainProcessor.h
View file

@ -38,6 +38,7 @@ private:
int height = 0; int height = 0;
DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN; DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN;
Microsoft::WRL::ComPtr<ID3D11Texture2D> tex; Microsoft::WRL::ComPtr<ID3D11Texture2D> tex;
D3D11_MAPPED_SUBRESOURCE map = {};
}; };
StagingTexture m_cpuTex[STAGING_TEXTURES] = {}; StagingTexture m_cpuTex[STAGING_TEXTURES] = {};