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

[d3d11] Fixed potential sync issue in Map()

Browse Source
This commit is contained in:
Philip Rebohle 2018-03-07 10:37:27 +01:00
parent 7ac0d413ad
commit b494bb2ac1
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/d3d11/d3d11_context_imm.cpp
View File

@ -122,14 +122,13 @@ namespace dxvk {
} else if (MapType != D3D11_MAP_WRITE_NO_OVERWRITE) {
// Synchronize with CS thread so that we know whether
// the buffer is currently in use by the GPU or not
Flush();
SynchronizeCsThread();
if (buffer->isInUse()) {
while (buffer->isInUse()) {
if (MapFlags & D3D11_MAP_FLAG_DO_NOT_WAIT)
return DXGI_ERROR_WAS_STILL_DRAWING;
Flush();
SynchronizeCsThread();
SynchronizeDevice();
}
}

5
src/dxvk/dxvk_context.cpp
View File

@ -744,6 +744,8 @@ namespace dxvk {
image->info().stages,
image->info().access);
m_barriers.recordCommands(m_cmd);
m_cmd->trackResource(image);
}
@ -995,6 +997,9 @@ namespace dxvk {
m_cmd->trackResource(fb);
}
m_cmd->trackResource(srcImage);
m_cmd->trackResource(dstImage);
}