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

[d3d11] Disallow MAP_WRITE_NO_OVERWRITE on dynamic images

Browse Source 
D3D11 explicitly bans this, so we shouldn't pretend to support it.
This commit is contained in:
Philip Rebohle 2024-11-01 23:05:46 +01:00 committed by Philip Rebohle
parent 1dfb869df2
commit 9e316b8c71
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/d3d11/d3d11_context_def.cpp
View File

@ -206,31 +206,28 @@ namespace dxvk {
if (unlikely(!pResource || !pMappedResource)) if (unlikely(!pResource || !pMappedResource))
return E_INVALIDARG; return E_INVALIDARG;
if (MapType == D3D11_MAP_WRITE_DISCARD) { if (likely(MapType == D3D11_MAP_WRITE_DISCARD)) {
D3D11_RESOURCE_DIMENSION resourceDim; D3D11_RESOURCE_DIMENSION resourceDim;
pResource->GetType(&resourceDim); pResource->GetType(&resourceDim);
D3D11_MAPPED_SUBRESOURCE mapInfo; return likely(resourceDim == D3D11_RESOURCE_DIMENSION_BUFFER)
HRESULT status = resourceDim == D3D11_RESOURCE_DIMENSION_BUFFER ? MapBuffer(pResource, pMappedResource)
? MapBuffer(pResource, &mapInfo) : MapImage(pResource, Subresource, pMappedResource);
: MapImage (pResource, Subresource, &mapInfo); } else if (likely(MapType == D3D11_MAP_WRITE_NO_OVERWRITE)) {
if (unlikely(FAILED(status))) {
pMappedResource->pData = nullptr;
return status;
}
AddMapEntry(pResource, Subresource, resourceDim, mapInfo);
*pMappedResource = mapInfo;
return S_OK;
} else if (MapType == D3D11_MAP_WRITE_NO_OVERWRITE) {
// The resource must be mapped with D3D11_MAP_WRITE_DISCARD // The resource must be mapped with D3D11_MAP_WRITE_DISCARD
// 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 (unlikely(!entry)) { if (unlikely(!entry)) {
pMappedResource->pData = nullptr; pMappedResource->pData = nullptr;
return D3D11_ERROR_DEFERRED_CONTEXT_MAP_WITHOUT_INITIAL_DISCARD;
// NO_OVERWRITE is only supported on buffers
D3D11_RESOURCE_DIMENSION resourceDim;
pResource->GetType(&resourceDim);
return resourceDim == D3D11_RESOURCE_DIMENSION_BUFFER
? D3D11_ERROR_DEFERRED_CONTEXT_MAP_WITHOUT_INITIAL_DISCARD
: E_INVALIDARG;
} }
// Return same memory region as earlier // Return same memory region as earlier
@ -268,11 +265,12 @@ namespace dxvk {
if (unlikely(pBuffer->GetMapMode() == D3D11_COMMON_BUFFER_MAP_MODE_NONE)) { if (unlikely(pBuffer->GetMapMode() == D3D11_COMMON_BUFFER_MAP_MODE_NONE)) {
Logger::err("D3D11: Cannot map a device-local buffer"); Logger::err("D3D11: Cannot map a device-local buffer");
pMappedResource->pData = nullptr;
return E_INVALIDARG; return E_INVALIDARG;
} }
auto bufferSlice = pBuffer->AllocSlice(&m_allocationCache); auto bufferSlice = pBuffer->AllocSlice(&m_allocationCache);
pMappedResource->pData = bufferSlice->mapPtr(); pMappedResource->pData = bufferSlice->mapPtr();
pMappedResource->RowPitch = pBuffer->Desc()->ByteWidth; pMappedResource->RowPitch = pBuffer->Desc()->ByteWidth;
pMappedResource->DepthPitch = pBuffer->Desc()->ByteWidth; pMappedResource->DepthPitch = pBuffer->Desc()->ByteWidth;
@ -283,6 +281,7 @@ namespace dxvk {
ctx->invalidateBuffer(cDstBuffer, Rc<DxvkResourceAllocation>(cDstSlice)); ctx->invalidateBuffer(cDstBuffer, Rc<DxvkResourceAllocation>(cDstSlice));
}); });
AddMapEntry(pResource, 0, D3D11_RESOURCE_DIMENSION_BUFFER, *pMappedResource);
return S_OK; return S_OK;
} }
@ -295,11 +294,14 @@ namespace dxvk {
if (unlikely(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");
pMappedResource->pData = nullptr;
return E_INVALIDARG; return E_INVALIDARG;
} }
if (unlikely(Subresource >= pTexture->CountSubresources())) if (unlikely(Subresource >= pTexture->CountSubresources())) {
pMappedResource->pData = nullptr;
return E_INVALIDARG; return E_INVALIDARG;
}
VkFormat packedFormat = pTexture->GetPackedFormat(); VkFormat packedFormat = pTexture->GetPackedFormat();
auto formatInfo = lookupFormatInfo(packedFormat); auto formatInfo = lookupFormatInfo(packedFormat);