Skip to content

Keep resource allocator alive for buffers. #945

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
Sep 8, 2023
Merged

Keep resource allocator alive for buffers. #945

Show file tree
Hide file tree
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
43 changes: 22 additions & 21 deletions src/gpgmm/d3d12/BufferAllocatorD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@

namespace gpgmm::d3d12 {

BufferAllocator::BufferAllocator(ResourceAllocator* resourceAllocator,
BufferAllocator::BufferAllocator(ScopedRef<ResourceAllocator> resourceAllocator,
D3D12_HEAP_PROPERTIES heapProperties,
D3D12_HEAP_FLAGS heapFlags,
D3D12_RESOURCE_FLAGS resourceFlags,
D3D12_RESOURCE_STATES initialResourceState)
: mResourceAllocator(resourceAllocator),
D3D12_RESOURCE_FLAGS bufferFlags,
D3D12_RESOURCE_STATES initialBufferState)
: MemoryAllocatorBase(resourceAllocator.Detach()),
mHeapProperties(heapProperties),
mHeapFlags(heapFlags),
mResourceFlags(resourceFlags),
mInitialResourceState(initialResourceState) {
mBufferFlags(bufferFlags),
mInitialBufferState(initialBufferState) {
}

ResultOrError<std::unique_ptr<MemoryAllocationBase>> BufferAllocator::TryAllocateMemory(
Expand All @@ -53,24 +53,25 @@ namespace gpgmm::d3d12 {
info.SizeInBytes = AlignTo(request.SizeInBytes, request.Alignment);
info.Alignment = request.Alignment;

D3D12_RESOURCE_DESC resourceDescriptor;
resourceDescriptor.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;
resourceDescriptor.Alignment = info.Alignment;
resourceDescriptor.Width = info.SizeInBytes;
resourceDescriptor.Height = 1;
resourceDescriptor.DepthOrArraySize = 1;
resourceDescriptor.MipLevels = 1;
resourceDescriptor.Format = DXGI_FORMAT_UNKNOWN;
resourceDescriptor.SampleDesc.Count = 1;
resourceDescriptor.SampleDesc.Quality = 0;
resourceDescriptor.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
resourceDescriptor.Flags = mResourceFlags;
D3D12_RESOURCE_DESC bufferDescriptor;
bufferDescriptor.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;
bufferDescriptor.Alignment = info.Alignment;
bufferDescriptor.Width = info.SizeInBytes;
bufferDescriptor.Height = 1;
bufferDescriptor.DepthOrArraySize = 1;
bufferDescriptor.MipLevels = 1;
bufferDescriptor.Format = DXGI_FORMAT_UNKNOWN;
bufferDescriptor.SampleDesc.Count = 1;
bufferDescriptor.SampleDesc.Quality = 0;
bufferDescriptor.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
bufferDescriptor.Flags = mBufferFlags;

// Optimized clear is not supported for buffers.
ComPtr<ResidencyHeap> resourceHeap;
HRESULT hr = mResourceAllocator->CreateCommittedResource(
mHeapProperties, mHeapFlags, info, &resourceDescriptor,
/*pOptimizedClearValue*/ nullptr, mInitialResourceState, &resourceHeap);
HRESULT hr = static_cast<ResourceAllocator*>(GetNextInChain())
->CreateCommittedResource(
mHeapProperties, mHeapFlags, info, &bufferDescriptor,
/*pOptimizedClearValue*/ nullptr, mInitialBufferState, &resourceHeap);

if (FAILED(hr)) {
return GetErrorCode(hr);
Expand Down
12 changes: 5 additions & 7 deletions src/gpgmm/d3d12/BufferAllocatorD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ namespace gpgmm::d3d12 {

class BufferAllocator : public MemoryAllocatorBase {
public:
BufferAllocator(ResourceAllocator* resourceAllocator,
BufferAllocator(ScopedRef<ResourceAllocator> resourceAllocator,
D3D12_HEAP_PROPERTIES heapProperties,
D3D12_HEAP_FLAGS heapFlags,
D3D12_RESOURCE_FLAGS resourceFlags,
D3D12_RESOURCE_STATES initialResourceState);
D3D12_RESOURCE_FLAGS bufferFlags,
D3D12_RESOURCE_STATES initialBufferState);
~BufferAllocator() override = default;

// MemoryAllocatorBase interface
Expand All @@ -38,12 +38,10 @@ namespace gpgmm::d3d12 {
void DeallocateMemory(std::unique_ptr<MemoryAllocationBase> allocation) override;

private:
ResourceAllocator* const mResourceAllocator;

const D3D12_HEAP_PROPERTIES mHeapProperties;
const D3D12_HEAP_FLAGS mHeapFlags;
const D3D12_RESOURCE_FLAGS mResourceFlags;
const D3D12_RESOURCE_STATES mInitialResourceState;
const D3D12_RESOURCE_FLAGS mBufferFlags;
const D3D12_RESOURCE_STATES mInitialBufferState;
};

} // namespace gpgmm::d3d12
Expand Down