birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ATOM-16558 Buffer memory leak (#4444)

Browse Source 
Fixed the memory leaking with ID3D12CommandAllocator in DX12 AsyncUploadQueue. Add reset for the ID3D12CommandAllocator when the commandlist was executed.
Fixed another small memory leak in NativeWindow.

Signed-off-by: Qing Tao <qingtao@amazon.com>
monroegm-disable-blank-issue-2
Qing Tao 4 years ago committed by GitHub
parent 323026fbd5
commit 5f8e60f4bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File

2
Code/Framework/AzFramework/Platform/Windows/AzFramework/Windowing/NativeWindow_Windows.cpp
Unescape Escape View File

@ -239,6 +239,8 @@ namespace AzFramework
RAWINPUT* rawInput = (RAWINPUT*)rawInputBytes; RAWINPUT* rawInput = (RAWINPUT*)rawInputBytes;
AzFramework::RawInputNotificationBusWindows::Broadcast( AzFramework::RawInputNotificationBusWindows::Broadcast(
&AzFramework::RawInputNotificationBusWindows::Events::OnRawInputEvent, *rawInput); &AzFramework::RawInputNotificationBusWindows::Events::OnRawInputEvent, *rawInput);
delete [] rawInputBytes;
break; break;
} }
case WM_CHAR: case WM_CHAR:

53
Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp
Unescape Escape View File

@ -48,11 +48,6 @@ namespace AZ
FramePacket& framePacket = m_framePackets.back(); FramePacket& framePacket = m_framePackets.back();
framePacket.m_fence.Init(dx12Device, RHI::FenceState::Signaled); framePacket.m_fence.Init(dx12Device, RHI::FenceState::Signaled);
Microsoft::WRL::ComPtr<ID3D12CommandAllocator> commandAllocator;
AssertSuccess(dx12Device->CreateCommandAllocator(
D3D12_COMMAND_LIST_TYPE_COPY,
IID_GRAPHICS_PPV_ARGS(commandAllocator.GetAddressOf())));
CD3DX12_HEAP_PROPERTIES heapProperties(D3D12_HEAP_TYPE_UPLOAD); CD3DX12_HEAP_PROPERTIES heapProperties(D3D12_HEAP_TYPE_UPLOAD);
CD3DX12_RESOURCE_DESC bufferDesc = CD3DX12_RESOURCE_DESC::Buffer(descriptor.m_stagingSizeInBytes); CD3DX12_RESOURCE_DESC bufferDesc = CD3DX12_RESOURCE_DESC::Buffer(descriptor.m_stagingSizeInBytes);
@ -65,22 +60,28 @@ namespace AZ
nullptr, nullptr,
IID_GRAPHICS_PPV_ARGS(stagingResource.GetAddressOf()))); IID_GRAPHICS_PPV_ARGS(stagingResource.GetAddressOf())));
framePacket.m_commandAllocator = commandAllocator.Get();
framePacket.m_stagingResource = stagingResource.Get(); framePacket.m_stagingResource = stagingResource.Get();
CD3DX12_RANGE readRange(0, 0); CD3DX12_RANGE readRange(0, 0);
framePacket.m_stagingResource->Map(0, &readRange, reinterpret_cast<void**>(&framePacket.m_stagingResourceData)); framePacket.m_stagingResource->Map(0, &readRange, reinterpret_cast<void**>(&framePacket.m_stagingResourceData));
}
Microsoft::WRL::ComPtr<ID3D12GraphicsCommandList> commandList;
AssertSuccess(dx12Device->CreateCommandList( Microsoft::WRL::ComPtr<ID3D12CommandAllocator> commandAllocator;
0, AssertSuccess(dx12Device->CreateCommandAllocator(
D3D12_COMMAND_LIST_TYPE_COPY, D3D12_COMMAND_LIST_TYPE_COPY,
m_framePackets.front().m_commandAllocator.get(), IID_GRAPHICS_PPV_ARGS(commandAllocator.GetAddressOf())));
nullptr, framePacket.m_commandAllocator = commandAllocator.Get();
IID_GRAPHICS_PPV_ARGS(commandList.GetAddressOf())));
Microsoft::WRL::ComPtr<ID3D12GraphicsCommandList> commandList;
AssertSuccess(dx12Device->CreateCommandList(
0,
D3D12_COMMAND_LIST_TYPE_COPY,
framePacket.m_commandAllocator.get(),
nullptr,
IID_GRAPHICS_PPV_ARGS(commandList.GetAddressOf())));
m_commandList = commandList.Get(); framePacket.m_commandList = commandList.Get();
AssertSuccess(m_commandList->Close()); AssertSuccess(framePacket.m_commandList->Close());
}
} }
void AsyncUploadQueue::Shutdown() void AsyncUploadQueue::Shutdown()
@ -90,11 +91,12 @@ namespace AZ
m_copyQueue->Shutdown(); m_copyQueue->Shutdown();
m_copyQueue = nullptr; m_copyQueue = nullptr;
} }
m_commandList = nullptr;
for (auto& framePacket : m_framePackets) for (auto& framePacket : m_framePackets)
{ {
framePacket.m_fence.Shutdown(); framePacket.m_fence.Shutdown();
framePacket.m_commandList = nullptr;
framePacket.m_commandAllocator = nullptr;
} }
m_framePackets.clear(); m_framePackets.clear();
m_uploadFence.Shutdown(); m_uploadFence.Shutdown();
@ -170,7 +172,7 @@ namespace AZ
memcpy(framePacket->m_stagingResourceData, sourceData + pendingByteOffset, bytesToCopy); memcpy(framePacket->m_stagingResourceData, sourceData + pendingByteOffset, bytesToCopy);
} }
m_commandList->CopyBufferRegion( framePacket->m_commandList->CopyBufferRegion(
dx12Buffer.get(), dx12Buffer.get(),
byteOffset + pendingByteOffset, byteOffset + pendingByteOffset,
framePacket->m_stagingResource.get(), framePacket->m_stagingResource.get(),
@ -204,7 +206,9 @@ namespace AZ
framePacket->m_fence.Increment(); framePacket->m_fence.Increment();
framePacket->m_dataOffset = 0; framePacket->m_dataOffset = 0;
AssertSuccess(m_commandList->Reset(framePacket->m_commandAllocator.get(), nullptr)); AssertSuccess(framePacket->m_commandAllocator->Reset());
AssertSuccess(framePacket->m_commandList->Reset(framePacket->m_commandAllocator.get(), nullptr));
m_recordingFrame = true; m_recordingFrame = true;
return framePacket; return framePacket;
@ -215,11 +219,12 @@ namespace AZ
AZ_PROFILE_SCOPE(RHI, "AsyncUploadQueue: EndFramePacket"); AZ_PROFILE_SCOPE(RHI, "AsyncUploadQueue: EndFramePacket");
AZ_Assert(m_recordingFrame, "The frame packet wasn't started. You need to call StartFramePacket first."); AZ_Assert(m_recordingFrame, "The frame packet wasn't started. You need to call StartFramePacket first.");
AssertSuccess(m_commandList->Close()); FramePacket& framePacket = m_framePackets[m_frameIndex];
ID3D12CommandList* commandLists[] = { m_commandList.get() };
AssertSuccess(framePacket.m_commandList->Close());
ID3D12CommandList* commandLists[] = { framePacket.m_commandList.get() };
commandQueue->ExecuteCommandLists(1, commandLists); commandQueue->ExecuteCommandLists(1, commandLists);
FramePacket& framePacket = m_framePackets[m_frameIndex];
commandQueue->Signal(framePacket.m_fence.Get(), framePacket.m_fence.GetPendingValue()); commandQueue->Signal(framePacket.m_fence.Get(), framePacket.m_fence.GetPendingValue());
m_frameIndex = (m_frameIndex + 1) % m_descriptor.m_frameCount; m_frameIndex = (m_frameIndex + 1) % m_descriptor.m_frameCount;
@ -344,7 +349,7 @@ namespace AZ
const uint32_t subresourceIdx = D3D12CalcSubresource(curMip, arraySlice, 0, imageMipLevels, arraySize); const uint32_t subresourceIdx = D3D12CalcSubresource(curMip, arraySlice, 0, imageMipLevels, arraySize);
CD3DX12_TEXTURE_COPY_LOCATION destLocation(imageMemory, subresourceIdx); CD3DX12_TEXTURE_COPY_LOCATION destLocation(imageMemory, subresourceIdx);
m_commandList->CopyTextureRegion( framePacket->m_commandList->CopyTextureRegion(
&destLocation, &destLocation,
0, 0, depth, 0, 0, depth,
&sourceLocation, &sourceLocation,
@ -417,7 +422,7 @@ namespace AZ
footprint.Offset = framePacket->m_dataOffset; footprint.Offset = framePacket->m_dataOffset;
CD3DX12_TEXTURE_COPY_LOCATION sourceLocation(framePacket->m_stagingResource.get(), footprint); CD3DX12_TEXTURE_COPY_LOCATION sourceLocation(framePacket->m_stagingResource.get(), footprint);
m_commandList->CopyTextureRegion( framePacket->m_commandList->CopyTextureRegion(
&destLocation, &destLocation,
0, destHeight, depth, 0, destHeight, depth,
&sourceLocation, &sourceLocation,

5
Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.h
Unescape Escape View File

@ -69,12 +69,13 @@ namespace AZ
void ProcessCallbacks(uint64_t fenceValue); void ProcessCallbacks(uint64_t fenceValue);
RHI::Ptr<CommandQueue> m_copyQueue; RHI::Ptr<CommandQueue> m_copyQueue;
RHI::Ptr<ID3D12GraphicsCommandList> m_commandList;
struct FramePacket struct FramePacket
{ {
RHI::Ptr<ID3D12CommandAllocator> m_commandAllocator;
RHI::Ptr<ID3D12Resource> m_stagingResource; RHI::Ptr<ID3D12Resource> m_stagingResource;
RHI::Ptr<ID3D12CommandAllocator> m_commandAllocator;
RHI::Ptr<ID3D12GraphicsCommandList> m_commandList;
Fence m_fence; Fence m_fence;
// Using persistent mapping for the staging resource so the Map function only need to be called called once. // Using persistent mapping for the staging resource so the Map function only need to be called called once.

Write Preview
Loading…
Cancel
Save