diff --git a/src/gpgmm/d3d12/BufferAllocatorD3D12.cpp b/src/gpgmm/d3d12/BufferAllocatorD3D12.cpp
index aea6a7d97..6794ed035 100644
--- a/src/gpgmm/d3d12/BufferAllocatorD3D12.cpp
+++ b/src/gpgmm/d3d12/BufferAllocatorD3D12.cpp
@@ -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(
@@ -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);
diff --git a/src/gpgmm/d3d12/BufferAllocatorD3D12.h b/src/gpgmm/d3d12/BufferAllocatorD3D12.h
index 2f9966c98..58400c6b0 100644
--- a/src/gpgmm/d3d12/BufferAllocatorD3D12.h
+++ b/src/gpgmm/d3d12/BufferAllocatorD3D12.h
@@ -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
@@ -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