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

[d3d11] Simplify mapped resource tracking on deferred context

Browse Source
This commit is contained in:
Philip Rebohle 2024-11-02 13:56:26 +01:00 committed by Philip Rebohle
parent bdd4956dd3
commit 8584fc7722
4 changed files with 42 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/d3d11/d3d11_buffer.cpp
View File

@ -97,8 +97,8 @@ namespace dxvk {
m_11on12.Resource->Map(0, nullptr, &importInfo.mapPtr); m_11on12.Resource->Map(0, nullptr, &importInfo.mapPtr);
m_buffer = m_parent->GetDXVKDevice()->importBuffer(info, importInfo, GetMemoryFlags()); m_buffer = m_parent->GetDXVKDevice()->importBuffer(info, importInfo, GetMemoryFlags());
m_cookie = m_buffer->cookie();
m_mapPtr = m_buffer->mapPtr(0); m_mapPtr = m_buffer->mapPtr(0);
m_mapMode = DetermineMapMode(m_buffer->memFlags()); m_mapMode = DetermineMapMode(m_buffer->memFlags());
} else if (!(pDesc->MiscFlags & D3D11_RESOURCE_MISC_TILE_POOL)) { } else if (!(pDesc->MiscFlags & D3D11_RESOURCE_MISC_TILE_POOL)) {
VkMemoryPropertyFlags memoryFlags = GetMemoryFlags(); VkMemoryPropertyFlags memoryFlags = GetMemoryFlags();
@ -107,11 +107,13 @@ namespace dxvk {
// Create the buffer and set the entire buffer slice as mapped, // Create the buffer and set the entire buffer slice as mapped,
// so that we only have to update it when invalidating the buffer // so that we only have to update it when invalidating the buffer
m_buffer = m_parent->GetDXVKDevice()->createBuffer(info, memoryFlags); m_buffer = m_parent->GetDXVKDevice()->createBuffer(info, memoryFlags);
m_cookie = m_buffer->cookie();
m_mapPtr = m_buffer->mapPtr(0); m_mapPtr = m_buffer->mapPtr(0);
} else { } else {
m_sparseAllocator = m_parent->GetDXVKDevice()->createSparsePageAllocator(); m_sparseAllocator = m_parent->GetDXVKDevice()->createSparsePageAllocator();
m_sparseAllocator->setCapacity(info.size / SparseMemoryPageSize); m_sparseAllocator->setCapacity(info.size / SparseMemoryPageSize);
m_cookie = 0u;
m_mapPtr = nullptr; m_mapPtr = nullptr;
m_mapMode = D3D11_COMMON_BUFFER_MAP_MODE_NONE; m_mapMode = D3D11_COMMON_BUFFER_MAP_MODE_NONE;
} }

6
src/d3d11/d3d11_buffer.h
View File

@ -77,6 +77,10 @@ namespace dxvk {
return m_mapMode; return m_mapMode;
} }
uint64_t GetCookie() const {
return m_cookie;
}
Rc<DxvkBuffer> GetBuffer() const { Rc<DxvkBuffer> GetBuffer() const {
return m_buffer; return m_buffer;
} }
@ -183,6 +187,8 @@ namespace dxvk {
D3D11_COMMON_BUFFER_MAP_MODE m_mapMode; D3D11_COMMON_BUFFER_MAP_MODE m_mapMode;
Rc<DxvkBuffer> m_buffer; Rc<DxvkBuffer> m_buffer;
uint64_t m_cookie = 0u;
Rc<DxvkBuffer> m_soCounter; Rc<DxvkBuffer> m_soCounter;
Rc<DxvkSparsePageAllocator> m_sparseAllocator; Rc<DxvkSparsePageAllocator> m_sparseAllocator;
uint64_t m_seq = 0ull; uint64_t m_seq = 0ull;

62
src/d3d11/d3d11_context_def.cpp
View File

@ -216,23 +216,24 @@ namespace dxvk {
} else if (likely(MapType == D3D11_MAP_WRITE_NO_OVERWRITE)) { } else if (likely(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); D3D11_RESOURCE_DIMENSION resourceDim;
pResource->GetType(&resourceDim);
if (unlikely(!entry)) { if (likely(resourceDim == D3D11_RESOURCE_DIMENSION_BUFFER)) {
D3D11_MAPPED_SUBRESOURCE sr = FindMapEntry(static_cast<D3D11Buffer*>(pResource)->GetCookie());
pMappedResource->pData = sr.pData;
if (unlikely(!sr.pData))
return D3D11_ERROR_DEFERRED_CONTEXT_MAP_WITHOUT_INITIAL_DISCARD;
pMappedResource->RowPitch = sr.RowPitch;
pMappedResource->DepthPitch = sr.DepthPitch;
return S_OK;
} else {
// Images cannot be mapped with NO_OVERWRITE
pMappedResource->pData = nullptr; pMappedResource->pData = nullptr;
return E_INVALIDARG;
// 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
*pMappedResource = entry->MapInfo;
return S_OK;
} else { } else {
// Not allowed on deferred contexts // Not allowed on deferred contexts
pMappedResource->pData = nullptr; pMappedResource->pData = nullptr;
@ -281,7 +282,7 @@ namespace dxvk {
ctx->invalidateBuffer(cDstBuffer, Rc<DxvkResourceAllocation>(cDstSlice)); ctx->invalidateBuffer(cDstBuffer, Rc<DxvkResourceAllocation>(cDstSlice));
}); });
AddMapEntry(pResource, 0, D3D11_RESOURCE_DIMENSION_BUFFER, *pMappedResource); AddMapEntry(pBuffer->GetCookie(), *pMappedResource);
return S_OK; return S_OK;
} }
@ -349,19 +350,15 @@ namespace dxvk {
UINT CopyFlags) { UINT CopyFlags) {
void* mapPtr = nullptr; void* mapPtr = nullptr;
if (unlikely(CopyFlags == D3D11_COPY_NO_OVERWRITE)) { if (unlikely(CopyFlags == D3D11_COPY_NO_OVERWRITE))
auto entry = FindMapEntry(pDstBuffer, 0); mapPtr = FindMapEntry(pDstBuffer->GetCookie()).pData;
if (entry)
mapPtr = entry->MapInfo.pData;
}
if (likely(!mapPtr)) { if (likely(!mapPtr)) {
// The caller validates the map mode, so we can // The caller validates the map mode, so we can
// safely ignore the MapBuffer return value here // safely ignore the MapBuffer return value here
D3D11_MAPPED_SUBRESOURCE mapInfo; D3D11_MAPPED_SUBRESOURCE mapInfo;
MapBuffer(pDstBuffer, &mapInfo); MapBuffer(pDstBuffer, &mapInfo);
AddMapEntry(pDstBuffer, 0, D3D11_RESOURCE_DIMENSION_BUFFER, mapInfo); AddMapEntry(pDstBuffer->GetCookie(), mapInfo);
mapPtr = mapInfo.pData; mapPtr = mapInfo.pData;
} }
@ -416,32 +413,27 @@ namespace dxvk {
} }
D3D11DeferredContextMapEntry* D3D11DeferredContext::FindMapEntry( D3D11_MAPPED_SUBRESOURCE D3D11DeferredContext::FindMapEntry(
ID3D11Resource* pResource, uint64_t Cookie) {
UINT Subresource) {
// Recently mapped resources as well as entries with // Recently mapped resources as well as entries with
// up-to-date map infos will be located at the end // up-to-date map infos will be located at the end
// of the resource array, so scan in reverse order. // of the resource array, so scan in reverse order.
size_t size = m_mappedResources.size(); size_t size = m_mappedResources.size();
for (size_t i = 1; i <= size; i++) { for (size_t i = 1; i <= size; i++) {
auto entry = &m_mappedResources[size - i]; const auto& entry = m_mappedResources[size - i];
if (entry->Resource.Get() == pResource if (entry.ResourceCookie == Cookie)
&& entry->Resource.GetSubresource() == Subresource) return entry.MapInfo;
return entry;
} }
return nullptr; return D3D11_MAPPED_SUBRESOURCE();
} }
void D3D11DeferredContext::AddMapEntry( void D3D11DeferredContext::AddMapEntry(
ID3D11Resource* pResource, uint64_t Cookie,
UINT Subresource,
D3D11_RESOURCE_DIMENSION ResourceType,
const D3D11_MAPPED_SUBRESOURCE& MapInfo) { const D3D11_MAPPED_SUBRESOURCE& MapInfo) {
m_mappedResources.emplace_back(pResource, m_mappedResources.push_back({ Cookie, MapInfo });
Subresource, ResourceType, MapInfo);
} }

22
src/d3d11/d3d11_context_def.h
View File

@ -8,17 +8,8 @@
namespace dxvk { namespace dxvk {
struct D3D11DeferredContextMapEntry { struct D3D11DeferredContextMapEntry {
D3D11DeferredContextMapEntry() { } uint64_t ResourceCookie = 0u;
D3D11DeferredContextMapEntry( D3D11_MAPPED_SUBRESOURCE MapInfo = { };
ID3D11Resource* pResource,
UINT Subresource,
D3D11_RESOURCE_DIMENSION ResourceType,
const D3D11_MAPPED_SUBRESOURCE& MappedResource)
: Resource(pResource, Subresource, ResourceType),
MapInfo(MappedResource) { }
D3D11ResourceRef Resource;
D3D11_MAPPED_SUBRESOURCE MapInfo;
}; };
class D3D11DeferredContext : public D3D11CommonContext<D3D11DeferredContext> { class D3D11DeferredContext : public D3D11CommonContext<D3D11DeferredContext> {
@ -130,14 +121,11 @@ namespace dxvk {
void TrackBufferSequenceNumber( void TrackBufferSequenceNumber(
D3D11Buffer* pResource); D3D11Buffer* pResource);
D3D11DeferredContextMapEntry* FindMapEntry( D3D11_MAPPED_SUBRESOURCE FindMapEntry(
ID3D11Resource* pResource, uint64_t Coookie);
UINT Subresource);
void AddMapEntry( void AddMapEntry(
ID3D11Resource* pResource, uint64_t Cookie,
UINT Subresource,
D3D11_RESOURCE_DIMENSION ResourceType,
const D3D11_MAPPED_SUBRESOURCE& MapInfo); const D3D11_MAPPED_SUBRESOURCE& MapInfo);
static DxvkCsChunkFlags GetCsChunkFlags( static DxvkCsChunkFlags GetCsChunkFlags(