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

[d3d11] Cache raw mapped pointer rather than allocation object

Browse Source 
Reduces ref counting overhead again and matches previous behaviour.

We should probably do something about the possible case of deferred context
execution with MAP_WRITE_DISCARD followed by MAP_WRITE_NO_OVERWRITE on the
immediate context, but we haven't seen a game rely on this yet.
This commit is contained in:
Philip Rebohle 2024-09-26 08:53:53 +02:00 committed by Philip Rebohle
parent 50878f2846
commit 39f50999a3
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/d3d11/d3d11_buffer.cpp
View File

@ -98,7 +98,7 @@ namespace dxvk {
info.usage |= VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT; info.usage |= VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT;
m_buffer = m_parent->GetDXVKDevice()->importBuffer(info, importInfo, GetMemoryFlags()); m_buffer = m_parent->GetDXVKDevice()->importBuffer(info, importInfo, GetMemoryFlags());
m_allocation = m_buffer->getAllocation(); 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)) {
@ -114,12 +114,12 @@ 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_allocation = m_buffer->getAllocation(); 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_allocation = nullptr; m_mapPtr = nullptr;
m_mapMode = D3D11_COMMON_BUFFER_MAP_MODE_NONE; m_mapMode = D3D11_COMMON_BUFFER_MAP_MODE_NONE;
} }

12
src/d3d11/d3d11_buffer.h
View File

@ -118,12 +118,13 @@ namespace dxvk {
} }
Rc<DxvkResourceAllocation> DiscardSlice(DxvkLocalAllocationCache* cache) { Rc<DxvkResourceAllocation> DiscardSlice(DxvkLocalAllocationCache* cache) {
m_allocation = m_buffer->allocateSlice(cache); auto allocation = m_buffer->allocateSlice(cache);
return m_allocation; m_mapPtr = allocation->mapPtr();
return allocation;
} }
Rc<DxvkResourceAllocation> GetMappedSlice() const { void* GetMapPtr() const {
return m_allocation; return m_mapPtr;
} }
D3D10Buffer* GetD3D10Iface() { D3D10Buffer* GetD3D10Iface() {
@ -184,9 +185,10 @@ namespace dxvk {
Rc<DxvkBuffer> m_buffer; Rc<DxvkBuffer> m_buffer;
Rc<DxvkBuffer> m_soCounter; Rc<DxvkBuffer> m_soCounter;
Rc<DxvkSparsePageAllocator> m_sparseAllocator; Rc<DxvkSparsePageAllocator> m_sparseAllocator;
Rc<DxvkResourceAllocation> m_allocation;
uint64_t m_seq = 0ull; uint64_t m_seq = 0ull;
void* m_mapPtr = nullptr;
D3D11DXGIResource m_resource; D3D11DXGIResource m_resource;
D3D10Buffer m_d3d10; D3D10Buffer m_d3d10;

11
src/d3d11/d3d11_context_imm.cpp
View File

@ -348,7 +348,7 @@ namespace dxvk {
} else if (likely(MapType == D3D11_MAP_WRITE_NO_OVERWRITE)) { } else if (likely(MapType == D3D11_MAP_WRITE_NO_OVERWRITE)) {
// Put this on a fast path without any extra checks since it's // Put this on a fast path without any extra checks since it's
// a somewhat desired method to partially update large buffers // a somewhat desired method to partially update large buffers
pMappedResource->pData = pResource->GetMappedSlice()->mapPtr(); pMappedResource->pData = pResource->GetMapPtr();
pMappedResource->RowPitch = bufferSize; pMappedResource->RowPitch = bufferSize;
pMappedResource->DepthPitch = bufferSize; pMappedResource->DepthPitch = bufferSize;
return S_OK; return S_OK;
@ -376,10 +376,9 @@ namespace dxvk {
} }
if (doInvalidatePreserve) { if (doInvalidatePreserve) {
auto srcSlice = pResource->GetMappedSlice(); auto srcPtr = pResource->GetMapPtr();
auto dstSlice = pResource->DiscardSlice(nullptr);
auto srcPtr = srcSlice->mapPtr(); auto dstSlice = pResource->DiscardSlice(nullptr);
auto dstPtr = dstSlice->mapPtr(); auto dstPtr = dstSlice->mapPtr();
EmitCs([ EmitCs([
@ -398,7 +397,7 @@ namespace dxvk {
if (!WaitForResource(buffer, sequenceNumber, MapType, MapFlags)) if (!WaitForResource(buffer, sequenceNumber, MapType, MapFlags))
return DXGI_ERROR_WAS_STILL_DRAWING; return DXGI_ERROR_WAS_STILL_DRAWING;
pMappedResource->pData = pResource->GetMappedSlice()->mapPtr(); pMappedResource->pData = pResource->GetMapPtr();
pMappedResource->RowPitch = bufferSize; pMappedResource->RowPitch = bufferSize;
pMappedResource->DepthPitch = bufferSize; pMappedResource->DepthPitch = bufferSize;
return S_OK; return S_OK;
@ -713,7 +712,7 @@ namespace dxvk {
ctx->invalidateBuffer(cBuffer, std::move(cBufferSlice)); ctx->invalidateBuffer(cBuffer, std::move(cBufferSlice));
}); });
} else { } else {
mapPtr = pDstBuffer->GetMappedSlice()->mapPtr(); mapPtr = pDstBuffer->GetMapPtr();
} }
std::memcpy(reinterpret_cast<char*>(mapPtr) + Offset, pSrcData, Length); std::memcpy(reinterpret_cast<char*>(mapPtr) + Offset, pSrcData, Length);