rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-05 01:24:14 +01:00
Code Issues Projects Releases Wiki Activity

[d3d11] Rename dcMapSpeedHack to dcSingleUseMode

Browse Source
This commit is contained in:
Philip Rebohle 2018-11-20 10:51:09 +01:00
parent ad5688764c
commit bfb7e54218
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/d3d11/d3d11_cmdlist.cpp
View File

@ -66,10 +66,10 @@ namespace dxvk {
void D3D11CommandList::MarkSubmitted() { void D3D11CommandList::MarkSubmitted() {
if (m_submitted.exchange(true) && !m_warned.exchange(true) if (m_submitted.exchange(true) && !m_warned.exchange(true)
&& m_device->GetOptions()->dcMapSpeedHack) { && m_device->GetOptions()->dcSingleUseMode) {
Logger::warn( Logger::warn(
"D3D11: Command list submitted multiple times,\n" "D3D11: Command list submitted multiple times,\n"
" but d3d11.dcMapSpeedHack is enabled"); " but d3d11.dcSingleUseMode is enabled");
} }
} }

6
src/d3d11/d3d11_context_def.cpp
View File

@ -170,7 +170,7 @@ namespace dxvk {
pMapEntry->RowPitch = pBuffer->Desc()->ByteWidth; pMapEntry->RowPitch = pBuffer->Desc()->ByteWidth;
pMapEntry->DepthPitch = pBuffer->Desc()->ByteWidth; pMapEntry->DepthPitch = pBuffer->Desc()->ByteWidth;
if (pBuffer->Desc()->Usage == D3D11_USAGE_DYNAMIC && m_parent->GetOptions()->dcMapSpeedHack) { if (pBuffer->Desc()->Usage == D3D11_USAGE_DYNAMIC && m_csFlags.test(DxvkCsChunkFlag::SingleUse)) {
// For resources that cannot be written by the GPU, // For resources that cannot be written by the GPU,
// we may write to the buffer resource directly and // we may write to the buffer resource directly and
// just swap in the physical buffer slice as needed. // just swap in the physical buffer slice as needed.
@ -237,7 +237,7 @@ namespace dxvk {
const D3D11DeferredContextMapEntry* pMapEntry) { const D3D11DeferredContextMapEntry* pMapEntry) {
D3D11Buffer* pBuffer = static_cast<D3D11Buffer*>(pResource); D3D11Buffer* pBuffer = static_cast<D3D11Buffer*>(pResource);
if (pBuffer->Desc()->Usage == D3D11_USAGE_DYNAMIC && m_parent->GetOptions()->dcMapSpeedHack) { if (pBuffer->Desc()->Usage == D3D11_USAGE_DYNAMIC && m_csFlags.test(DxvkCsChunkFlag::SingleUse)) {
EmitCs([ EmitCs([
cDstBuffer = pBuffer->GetBuffer(), cDstBuffer = pBuffer->GetBuffer(),
cPhysSlice = pMapEntry->BufferSlice cPhysSlice = pMapEntry->BufferSlice
@ -301,7 +301,7 @@ namespace dxvk {
DxvkCsChunkFlags D3D11DeferredContext::GetCsChunkFlags( DxvkCsChunkFlags D3D11DeferredContext::GetCsChunkFlags(
D3D11Device* pDevice) { D3D11Device* pDevice) {
return pDevice->GetOptions()->dcMapSpeedHack return pDevice->GetOptions()->dcSingleUseMode
? DxvkCsChunkFlags(DxvkCsChunkFlag::SingleUse) ? DxvkCsChunkFlags(DxvkCsChunkFlag::SingleUse)
: DxvkCsChunkFlags(); : DxvkCsChunkFlags();
} }

2
src/d3d11/d3d11_options.cpp
View File

@ -6,7 +6,7 @@ namespace dxvk {
D3D11Options::D3D11Options(const Config& config) { D3D11Options::D3D11Options(const Config& config) {
this->allowMapFlagNoWait = config.getOption<bool>("d3d11.allowMapFlagNoWait", false); this->allowMapFlagNoWait = config.getOption<bool>("d3d11.allowMapFlagNoWait", false);
this->dcMapSpeedHack = config.getOption<bool>("d3d11.dcMapSpeedHack", true); this->dcSingleUseMode = config.getOption<bool>("d3d11.dcSingleUseMode", true);
this->fakeStreamOutSupport = config.getOption<bool>("d3d11.fakeStreamOutSupport", false); this->fakeStreamOutSupport = config.getOption<bool>("d3d11.fakeStreamOutSupport", false);
this->maxTessFactor = config.getOption<int32_t>("d3d11.maxTessFactor", 0); this->maxTessFactor = config.getOption<int32_t>("d3d11.maxTessFactor", 0);
this->samplerAnisotropy = config.getOption<int32_t>("d3d11.samplerAnisotropy", -1); this->samplerAnisotropy = config.getOption<int32_t>("d3d11.samplerAnisotropy", -1);

2
src/d3d11/d3d11_options.h
View File

@ -31,7 +31,7 @@ namespace dxvk {
/// This can substantially speed up some games, but may /// This can substantially speed up some games, but may
/// cause issues if the game submits command lists more /// cause issues if the game submits command lists more
/// than once. /// than once.
bool dcMapSpeedHack; bool dcSingleUseMode;
/// Fakes stream output support. /// Fakes stream output support.
/// ///

4
src/util/config/config.cpp
View File

@ -34,11 +34,11 @@ namespace dxvk {
}} }, }} },
/* The Evil Within */ /* The Evil Within */
{ "EvilWithin.exe", {{ { "EvilWithin.exe", {{
{ "d3d11.dcMapSpeedHack", "False" }, { "d3d11.dcSingleUseMode", "False" },
}} }, }} },
/* The Evil Within Demo */ /* The Evil Within Demo */
{ "EvilWithinDemo.exe", {{ { "EvilWithinDemo.exe", {{
{ "d3d11.dcMapSpeedHack", "False" }, { "d3d11.dcSingleUseMode", "False" },
}} }, }} },
/* F1 2015 */ /* F1 2015 */
{ "F1_2015.exe", {{ { "F1_2015.exe", {{