rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-21 13:29:26 +01:00
Code Issues Projects Releases Wiki Activity

Revert "[d3d11] Avoid unnecessary buffer slice copy when mapping buffer"

Browse Source 
This reverts commit 72106a02cb5fff627481a20b5acbdccc13b7c867.

Breaks things for some reason. Doesn't have much of an impact anyway.
This commit is contained in:
Philip Rebohle 2018-09-17 23:08:00 +02:00
parent 72106a02cb
commit 6c889c0005
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/d3d11/d3d11_context_imm.cpp
View File

@ -334,13 +334,11 @@ namespace dxvk {
return E_INVALIDARG; return E_INVALIDARG;
} }
DxvkPhysicalBufferSlice physicalSlice;
if (MapType == D3D11_MAP_WRITE_DISCARD) { if (MapType == D3D11_MAP_WRITE_DISCARD) {
// Allocate a new backing slice for the buffer and set // Allocate a new backing slice for the buffer and set
// it as the 'new' mapped slice. This assumes that the // it as the 'new' mapped slice. This assumes that the
// only way to invalidate a buffer is by mapping it. // only way to invalidate a buffer is by mapping it.
physicalSlice = buffer->allocPhysicalSlice(); auto physicalSlice = buffer->allocPhysicalSlice();
pResource->SetMappedSlice(physicalSlice); pResource->SetMappedSlice(physicalSlice);
EmitCs([ EmitCs([
@ -352,13 +350,13 @@ namespace dxvk {
} else if (MapType != D3D11_MAP_WRITE_NO_OVERWRITE) { } else if (MapType != D3D11_MAP_WRITE_NO_OVERWRITE) {
if (!WaitForResource(buffer->resource(), MapFlags)) if (!WaitForResource(buffer->resource(), MapFlags))
return DXGI_ERROR_WAS_STILL_DRAWING; return DXGI_ERROR_WAS_STILL_DRAWING;
physicalSlice = pResource->GetMappedSlice();
} }
// Use map pointer from previous map operation. This // Use map pointer from previous map operation. This
// way we don't have to synchronize with the CS thread // way we don't have to synchronize with the CS thread
// if the map mode is D3D11_MAP_WRITE_NO_OVERWRITE. // if the map mode is D3D11_MAP_WRITE_NO_OVERWRITE.
DxvkPhysicalBufferSlice physicalSlice = pResource->GetMappedSlice();
pMappedResource->pData = physicalSlice.mapPtr(0); pMappedResource->pData = physicalSlice.mapPtr(0);
pMappedResource->RowPitch = pResource->GetSize(); pMappedResource->RowPitch = pResource->GetSize();
pMappedResource->DepthPitch = pResource->GetSize(); pMappedResource->DepthPitch = pResource->GetSize();