mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[d3d11] Handle MAP_MODE_STAGING when mapping images on the immediate context

This commit is contained in:
Philip Rebohle 2021-06-22 08:02:59 +02:00
parent 9e15831a2d
commit 596f65f75f
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/d3d11/d3d11_context_imm.cpp
View File

@ -443,17 +443,24 @@ namespace dxvk {
mapPtr = physSlice.mapPtr;
} else {
// When using any map mode which requires the image contents
// to be preserved, and if the GPU has write access to the
// image, copy the current image contents into the buffer.
if (pResource->Desc()->Usage == D3D11_USAGE_STAGING
&& !pResource->CanUpdateMappedBufferEarly()) {
UpdateMappedBuffer(pResource, subresource);
MapFlags &= ~D3D11_MAP_FLAG_DO_NOT_WAIT;
bool wait = MapType != D3D11_MAP_WRITE_NO_OVERWRITE;
if (mapMode == D3D11_COMMON_TEXTURE_MAP_MODE_BUFFER) {
// When using any map mode which requires the image contents
// to be preserved, and if the GPU has write access to the
// image, copy the current image contents into the buffer.
if (pResource->Desc()->Usage == D3D11_USAGE_STAGING
&& !pResource->CanUpdateMappedBufferEarly()) {
UpdateMappedBuffer(pResource, subresource);
MapFlags &= ~D3D11_MAP_FLAG_DO_NOT_WAIT;
}
// Need to wait for any previous upload to finish anyway
wait = true;
}
// Wait for mapped buffer to become available
if (!WaitForResource(mappedBuffer, MapType, MapFlags))
if (wait && !WaitForResource(mappedBuffer, MapType, MapFlags))
return DXGI_ERROR_WAS_STILL_DRAWING;
mapPtr = pResource->GetMappedSlice(Subresource).mapPtr;