backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[dxvk] Only wait for writes when mapping with D3D11_MAP_READ

Browse Source
This commit is contained in:
Philip Rebohle 2019-09-19 20:28:22 +02:00
parent 5b5927dd41
commit e9fcf64a8c
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/d3d11/d3d11_context_imm.cpp
View File

@ -335,7 +335,7 @@ namespace dxvk {
} else { } else {
// Wait until the resource is no longer in use // Wait until the resource is no longer in use
if (MapType != D3D11_MAP_WRITE_NO_OVERWRITE) { if (MapType != D3D11_MAP_WRITE_NO_OVERWRITE) {
if (!WaitForResource(pResource->GetBuffer(), MapFlags)) if (!WaitForResource(pResource->GetBuffer(), MapType, MapFlags))
return DXGI_ERROR_WAS_STILL_DRAWING; return DXGI_ERROR_WAS_STILL_DRAWING;
} }
@ -390,7 +390,7 @@ namespace dxvk {
const VkImageType imageType = mappedImage->info().type; const VkImageType imageType = mappedImage->info().type;
// Wait for the resource to become available // Wait for the resource to become available
if (!WaitForResource(mappedImage, MapFlags)) if (!WaitForResource(mappedImage, MapType, MapFlags))
return DXGI_ERROR_WAS_STILL_DRAWING; return DXGI_ERROR_WAS_STILL_DRAWING;
// Mark the given subresource as mapped // Mark the given subresource as mapped
@ -434,7 +434,7 @@ namespace dxvk {
} }
// Wait for mapped buffer to become available // Wait for mapped buffer to become available
if (!WaitForResource(mappedBuffer, MapFlags)) if (!WaitForResource(mappedBuffer, MapType, MapFlags))
return DXGI_ERROR_WAS_STILL_DRAWING; return DXGI_ERROR_WAS_STILL_DRAWING;
physSlice = mappedBuffer->getSliceHandle(); physSlice = mappedBuffer->getSliceHandle();
@ -554,18 +554,24 @@ namespace dxvk {
bool D3D11ImmediateContext::WaitForResource( bool D3D11ImmediateContext::WaitForResource(
const Rc<DxvkResource>& Resource, const Rc<DxvkResource>& Resource,
D3D11_MAP MapType,
UINT MapFlags) { UINT MapFlags) {
// Some games (e.g. The Witcher 3) do not work correctly // Some games might not work correctly when a map
// when a map fails with D3D11_MAP_FLAG_DO_NOT_WAIT set // fails with D3D11_MAP_FLAG_DO_NOT_WAIT set
if (!m_parent->GetOptions()->allowMapFlagNoWait) if (!m_parent->GetOptions()->allowMapFlagNoWait)
MapFlags &= ~D3D11_MAP_FLAG_DO_NOT_WAIT; MapFlags &= ~D3D11_MAP_FLAG_DO_NOT_WAIT;
// Determine access type to wait for based on map mode
DxvkAccess access = MapType == D3D11_MAP_READ
? DxvkAccess::Write
: DxvkAccess::Read;
// Wait for the any pending D3D11 command to be executed // Wait for the any pending D3D11 command to be executed
// on the CS thread so that we can determine whether the // on the CS thread so that we can determine whether the
// resource is currently in use or not. // resource is currently in use or not.
SynchronizeCsThread(); SynchronizeCsThread();
if (Resource->isInUse()) { if (Resource->isInUse(access)) {
if (MapFlags & D3D11_MAP_FLAG_DO_NOT_WAIT) { if (MapFlags & D3D11_MAP_FLAG_DO_NOT_WAIT) {
// We don't have to wait, but misbehaving games may // We don't have to wait, but misbehaving games may
// still try to spin on `Map` until the resource is // still try to spin on `Map` until the resource is
@ -578,7 +584,7 @@ namespace dxvk {
Flush(); Flush();
SynchronizeCsThread(); SynchronizeCsThread();
while (Resource->isInUse()) while (Resource->isInUse(access))
dxvk::this_thread::yield(); dxvk::this_thread::yield();
} }
} }

1
src/d3d11/d3d11_context_imm.h
View File

@ -135,6 +135,7 @@ namespace dxvk {
bool WaitForResource( bool WaitForResource(
const Rc<DxvkResource>& Resource, const Rc<DxvkResource>& Resource,
D3D11_MAP MapType,
UINT MapFlags); UINT MapFlags);
void EmitCsChunk(DxvkCsChunkRef&& chunk); void EmitCsChunk(DxvkCsChunkRef&& chunk);