Skip to content

Fix leak when importing resources without allocation. #694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 10, 2022
Merged

Fix leak when importing resources without allocation. #694

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ namespace gpgmm::d3d12 {
D3D12_HEAP_TYPE heapType,
bool isCustomHeapDisabled) {
ASSERT(heapType != D3D12_HEAP_TYPE_CUSTOM);

// Produces the corresponding properties from the corresponding heap type per this table
// https://docs.microsoft.com/en-us/windows/win32/api/d3d12/nf-d3d12-id3d12device-getcustomheapproperties
if (!isCustomHeapDisabled) {
Expand Down Expand Up @@ -1246,7 +1246,7 @@ namespace gpgmm::d3d12 {

ImportResourceCallbackContext importResourceCallbackContext(resource);

IHeap* resourceHeap = nullptr;
ComPtr<IHeap> resourceHeap;
ReturnIfFailed(Heap::CreateHeap(resourceHeapDesc, /*residencyManager*/ nullptr,
ImportResourceCallbackContext::CreateHeap,
&importResourceCallbackContext, &resourceHeap));
Expand All @@ -1261,11 +1261,11 @@ namespace gpgmm::d3d12 {
allocationDesc.SizeInBytes = allocationSize;
allocationDesc.Method = AllocationMethod::kStandalone;
allocationDesc.OffsetFromResource = 0;
if (ppResourceAllocationOut != nullptr){
*ppResourceAllocationOut = new ResourceAllocation(allocationDesc, nullptr, this,
static_cast<Heap*>(resourceHeap),
nullptr, std::move(resource));

if (ppResourceAllocationOut != nullptr) {
*ppResourceAllocationOut = new ResourceAllocation(
allocationDesc, nullptr, this, static_cast<Heap*>(resourceHeap.Detach()), nullptr,
std::move(resource));
}

return S_OK;
Expand Down Expand Up @@ -1320,7 +1320,7 @@ namespace gpgmm::d3d12 {
}

// Since residency is per heap, every committed resource is wrapped in a heap object.
IHeap* resourceHeap = nullptr;
ComPtr<IHeap> resourceHeap;
ComPtr<ID3D12Resource> committedResource;
CreateCommittedResourceCallbackContext callbackContext(
mDevice.Get(), committedResource, &heapProperties, heapFlags, resourceDescriptor,
Expand All @@ -1334,7 +1334,9 @@ namespace gpgmm::d3d12 {
*commitedResourceOut = committedResource.Detach();
}

*resourceHeapOut = static_cast<Heap*>(resourceHeap);
if (resourceHeapOut != nullptr) {
*resourceHeapOut = static_cast<Heap*>(resourceHeap.Detach());
}

return S_OK;
}
Expand Down