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

[d3d11] Fix inconsistencies in Map/Unmap on immediate/deferred contexts

Browse Source 
Should save a few CPU cycles, and also fixes incorrect behaviour when an
application passes null pointers to Map on a deferred context.
This commit is contained in:
Philip Rebohle 2019-06-03 15:30:04 +02:00
parent 58d838b915
commit e4e82007b1
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/d3d11/d3d11_context_def.cpp
View File

@ -84,15 +84,12 @@ namespace dxvk {
D3D11_MAPPED_SUBRESOURCE* pMappedResource) { D3D11_MAPPED_SUBRESOURCE* pMappedResource) {
D3D10DeviceLock lock = LockContext(); D3D10DeviceLock lock = LockContext();
if (unlikely(!pResource || !pMappedResource))
return E_INVALIDARG;
D3D11_RESOURCE_DIMENSION resourceDim = D3D11_RESOURCE_DIMENSION_UNKNOWN; D3D11_RESOURCE_DIMENSION resourceDim = D3D11_RESOURCE_DIMENSION_UNKNOWN;
pResource->GetType(&resourceDim); pResource->GetType(&resourceDim);
if (pMappedResource != nullptr) {
pMappedResource->pData = nullptr;
pMappedResource->RowPitch = 0;
pMappedResource->DepthPitch = 0;
}
if (MapType == D3D11_MAP_WRITE_DISCARD) { if (MapType == D3D11_MAP_WRITE_DISCARD) {
D3D11DeferredContextMapEntry entry; D3D11DeferredContextMapEntry entry;
@ -100,8 +97,10 @@ namespace dxvk {
? MapBuffer(pResource, MapType, MapFlags, &entry) ? MapBuffer(pResource, MapType, MapFlags, &entry)
: MapImage (pResource, Subresource, MapType, MapFlags, &entry); : MapImage (pResource, Subresource, MapType, MapFlags, &entry);
if (FAILED(status)) if (unlikely(FAILED(status))) {
*pMappedResource = D3D11_MAPPED_SUBRESOURCE();
return status; return status;
}
// Adding a new map entry actually overrides the // Adding a new map entry actually overrides the
// old one in practice because the lookup function // old one in practice because the lookup function
@ -118,8 +117,10 @@ namespace dxvk {
// before it can be mapped with D3D11_MAP_WRITE_NO_OVERWRITE. // before it can be mapped with D3D11_MAP_WRITE_NO_OVERWRITE.
auto entry = FindMapEntry(pResource, Subresource); auto entry = FindMapEntry(pResource, Subresource);
if (entry == m_mappedResources.rend()) if (unlikely(entry == m_mappedResources.rend())) {
*pMappedResource = D3D11_MAPPED_SUBRESOURCE();
return E_INVALIDARG; return E_INVALIDARG;
}
// Return same memory region as earlier // Return same memory region as earlier
entry->MapType = D3D11_MAP_WRITE_NO_OVERWRITE; entry->MapType = D3D11_MAP_WRITE_NO_OVERWRITE;
@ -130,6 +131,7 @@ namespace dxvk {
return S_OK; return S_OK;
} else { } else {
// Not allowed on deferred contexts // Not allowed on deferred contexts
*pMappedResource = D3D11_MAPPED_SUBRESOURCE();
return E_INVALIDARG; return E_INVALIDARG;
} }
} }
@ -140,21 +142,19 @@ namespace dxvk {
UINT Subresource) { UINT Subresource) {
D3D10DeviceLock lock = LockContext(); D3D10DeviceLock lock = LockContext();
D3D11_RESOURCE_DIMENSION resourceDim = D3D11_RESOURCE_DIMENSION_UNKNOWN;
pResource->GetType(&resourceDim);
auto entry = FindMapEntry(pResource, Subresource); auto entry = FindMapEntry(pResource, Subresource);
if (unlikely(entry == m_mappedResources.rend())) {
if (entry == m_mappedResources.rend()) {
Logger::err("D3D11DeferredContext::Unmap: Subresource not mapped"); Logger::err("D3D11DeferredContext::Unmap: Subresource not mapped");
return; return;
} }
if (entry->MapType == D3D11_MAP_WRITE_DISCARD) { if (entry->MapType == D3D11_MAP_WRITE_DISCARD) {
if (resourceDim == D3D11_RESOURCE_DIMENSION_BUFFER) D3D11_RESOURCE_DIMENSION resourceDim = D3D11_RESOURCE_DIMENSION_UNKNOWN;
UnmapBuffer(pResource, &(*entry)); pResource->GetType(&resourceDim);
else
UnmapImage(pResource, Subresource, &(*entry)); (resourceDim == D3D11_RESOURCE_DIMENSION_BUFFER)
? UnmapBuffer(pResource, &(*entry))
: UnmapImage (pResource, Subresource, &(*entry));
} }
} }
@ -184,7 +184,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_csFlags.test(DxvkCsChunkFlag::SingleUse)) { if (likely(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 buffer slice as needed. // just swap in the buffer slice as needed.
@ -210,7 +210,7 @@ namespace dxvk {
const D3D11CommonTexture* pTexture = GetCommonTexture(pResource); const D3D11CommonTexture* pTexture = GetCommonTexture(pResource);
const Rc<DxvkImage> image = pTexture->GetImage(); const Rc<DxvkImage> image = pTexture->GetImage();
if (pTexture->GetMapMode() == D3D11_COMMON_TEXTURE_MAP_MODE_NONE) { if (unlikely(pTexture->GetMapMode() == D3D11_COMMON_TEXTURE_MAP_MODE_NONE)) {
Logger::err("D3D11: Cannot map a device-local image"); Logger::err("D3D11: Cannot map a device-local image");
return E_INVALIDARG; return E_INVALIDARG;
} }
@ -250,7 +250,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_csFlags.test(DxvkCsChunkFlag::SingleUse)) { if (likely(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

7
src/d3d11/d3d11_context_imm.cpp
View File

@ -196,11 +196,8 @@ namespace dxvk {
pMappedResource); pMappedResource);
} }
if (unlikely(FAILED(hr))) { if (unlikely(FAILED(hr)))
pMappedResource->pData = nullptr; *pMappedResource = D3D11_MAPPED_SUBRESOURCE();
pMappedResource->RowPitch = 0;
pMappedResource->DepthPitch = 0;
}
return hr; return hr;
} }