The-Homebrew-Cloud/Cemu
2
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-01-08 08:00:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: temporary buffer allocator

Browse Source
This commit is contained in:
Samo Z 2024-08-26 08:07:49 +02:00
parent a693bf564f
commit 6c8947d0e5
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Cafe/HW/Latte/Renderer/Metal/MetalBufferAllocator.h
View File

@ -152,7 +152,7 @@ struct MetalSyncedBuffer
class MetalTemporaryBufferAllocator : public MetalBufferAllocator<MetalSyncedBuffer> class MetalTemporaryBufferAllocator : public MetalBufferAllocator<MetalSyncedBuffer>
{ {
public: public:
MetalTemporaryBufferAllocator(class MetalRenderer* metalRenderer) : MetalBufferAllocator<MetalSyncedBuffer>(metalRenderer, metalRenderer->GetOptimalBufferStorageMode()) {} MetalTemporaryBufferAllocator(class MetalRenderer* metalRenderer) : MetalBufferAllocator<MetalSyncedBuffer>(metalRenderer, MTL::ResourceStorageModeShared) {}
void SetActiveCommandBuffer(MTL::CommandBuffer* commandBuffer) void SetActiveCommandBuffer(MTL::CommandBuffer* commandBuffer)
{ {
@ -170,6 +170,16 @@ public:
{ {
if (buffer.m_commandBuffers.size() == 1) if (buffer.m_commandBuffers.size() == 1)
{ {
// First remove any free ranges that use this buffer
for (uint32 k = 0; k < m_freeBufferRanges.size(); k++)
{
if (m_freeBufferRanges[k].bufferIndex == i)
{
m_freeBufferRanges.erase(m_freeBufferRanges.begin() + k);
k--;
}
}
// All command buffers using it have finished execution, we can use it again // All command buffers using it have finished execution, we can use it again
m_freeBufferRanges.push_back({i, 0, buffer.m_buffer->length()}); m_freeBufferRanges.push_back({i, 0, buffer.m_buffer->length()});

9
src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.cpp
View File

@ -509,8 +509,7 @@ void MetalRenderer::texture_loadSlice(LatteTexture* hostTexture, sint32 width, s
auto blitCommandEncoder = GetBlitCommandEncoder(); auto blitCommandEncoder = GetBlitCommandEncoder();
// Allocate a temporary buffer // Allocate a temporary buffer
// HACK: use the persistent buffer allocator so as to avoid any issues auto& bufferAllocator = m_memoryManager->GetTemporaryBufferAllocator();
auto& bufferAllocator = m_memoryManager->GetBufferAllocator();
auto allocation = bufferAllocator.GetBufferAllocation(compressedImageSize); auto allocation = bufferAllocator.GetBufferAllocation(compressedImageSize);
auto buffer = bufferAllocator.GetBuffer(allocation.bufferIndex); auto buffer = bufferAllocator.GetBuffer(allocation.bufferIndex);
@ -1192,9 +1191,11 @@ void* MetalRenderer::indexData_reserveIndexMemory(uint32 size, uint32& offset, u
void MetalRenderer::indexData_uploadIndexMemory(uint32 bufferIndex, uint32 offset, uint32 size) void MetalRenderer::indexData_uploadIndexMemory(uint32 bufferIndex, uint32 offset, uint32 size)
{ {
auto buffer = m_memoryManager->GetTemporaryBufferAllocator().GetBuffer(bufferIndex);
if (!HasUnifiedMemory()) if (!HasUnifiedMemory())
{
auto buffer = m_memoryManager->GetTemporaryBufferAllocator().GetBuffer(bufferIndex);
buffer->didModifyRange(NS::Range(offset, size)); buffer->didModifyRange(NS::Range(offset, size));
}
} }
void MetalRenderer::SetBuffer(MTL::RenderCommandEncoder* renderCommandEncoder, MetalShaderType shaderType, MTL::Buffer* buffer, size_t offset, uint32 index) void MetalRenderer::SetBuffer(MTL::RenderCommandEncoder* renderCommandEncoder, MetalShaderType shaderType, MTL::Buffer* buffer, size_t offset, uint32 index)
@ -1459,7 +1460,7 @@ void MetalRenderer::CommitCommandBuffer()
auto& commandBuffer = m_commandBuffers.back(); auto& commandBuffer = m_commandBuffers.back();
if (!commandBuffer.m_commited) if (!commandBuffer.m_commited)
{ {
commandBuffer.m_commandBuffer->addCompletedHandler(^(MTL::CommandBuffer* cmd) { commandBuffer.m_commandBuffer->addCompletedHandler(^(MTL::CommandBuffer*) {
m_memoryManager->GetTemporaryBufferAllocator().CommandBufferFinished(commandBuffer.m_commandBuffer); m_memoryManager->GetTemporaryBufferAllocator().CommandBufferFinished(commandBuffer.m_commandBuffer);
}); });