From c24dad75dc78fc1970bc38c9d508c97196515785 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Fri, 15 Nov 2019 11:09:11 +0100 Subject: [PATCH] [d3d11] Remove allowMapFlagNoWait option --- src/d3d11/d3d11_context_imm.cpp | 5 ----- src/d3d11/d3d11_options.cpp | 1 - src/d3d11/d3d11_options.h | 7 ------- 3 files changed, 13 deletions(-) diff --git a/src/d3d11/d3d11_context_imm.cpp b/src/d3d11/d3d11_context_imm.cpp index 097451a6..0d193798 100644 --- a/src/d3d11/d3d11_context_imm.cpp +++ b/src/d3d11/d3d11_context_imm.cpp @@ -588,11 +588,6 @@ namespace dxvk { const Rc& Resource, D3D11_MAP MapType, UINT MapFlags) { - // Some games might not work correctly when a map - // fails with D3D11_MAP_FLAG_DO_NOT_WAIT set - if (!m_parent->GetOptions()->allowMapFlagNoWait) - 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 diff --git a/src/d3d11/d3d11_options.cpp b/src/d3d11/d3d11_options.cpp index 88d0018f..2731b3cd 100644 --- a/src/d3d11/d3d11_options.cpp +++ b/src/d3d11/d3d11_options.cpp @@ -7,7 +7,6 @@ namespace dxvk { D3D11Options::D3D11Options(const Config& config, const Rc& device) { const DxvkDeviceInfo& devInfo = device->properties(); - this->allowMapFlagNoWait = config.getOption("d3d11.allowMapFlagNoWait", true); this->dcSingleUseMode = config.getOption("d3d11.dcSingleUseMode", true); this->strictDivision = config.getOption("d3d11.strictDivision", false); this->zeroInitWorkgroupMemory = config.getOption("d3d11.zeroInitWorkgroupMemory", false); diff --git a/src/d3d11/d3d11_options.h b/src/d3d11/d3d11_options.h index 55870a13..b467a2eb 100644 --- a/src/d3d11/d3d11_options.h +++ b/src/d3d11/d3d11_options.h @@ -12,13 +12,6 @@ namespace dxvk { struct D3D11Options { D3D11Options(const Config& config, const Rc& device); - /// Handle D3D11_MAP_FLAG_DO_NOT_WAIT properly. - /// - /// This can offer substantial speedups, but some games - /// (The Witcher 3, Elder Scrolls Online, possibly others) - /// seem to make incorrect assumptions about when a map - /// operation succeeds when that flag is set. - bool allowMapFlagNoWait; /// Enables speed hack for mapping on deferred contexts ///