Fix ownership (#41)

* fix ownership

* fix cleanup

src/cpu/cpu-buffer.h

@@ -7,8 +7,8 @@ namespace rhi::cpu {
 class BufferImpl : public Buffer
 {
 public:
-    BufferImpl(Device* device, const BufferDesc& desc)
-        : Buffer(device, desc)
+    BufferImpl(const BufferDesc& desc)
+        : Buffer(desc)
     {
     }
 

src/cpu/cpu-device.cpp

@@ -52,9 +52,7 @@ Result DeviceImpl::initialize(const Desc& desc)
 Result DeviceImpl::createTexture(const TextureDesc& desc, const SubresourceData* initData, ITexture** outTexture)
 {
     TextureDesc srcDesc = fixupTextureDesc(desc);
-
-    RefPtr<TextureImpl> texture = new TextureImpl(this, srcDesc);
-
+    RefPtr<TextureImpl> texture = new TextureImpl(srcDesc);
     SLANG_RETURN_ON_FAIL(texture->init(initData));
 
     returnComPtr(outTexture, texture);
@@ -64,7 +62,7 @@ Result DeviceImpl::createTexture(const TextureDesc& desc, const SubresourceData*
 Result DeviceImpl::createBuffer(const BufferDesc& descIn, const void* initData, IBuffer** outBuffer)
 {
     auto desc = fixupBufferDesc(descIn);
-    RefPtr<BufferImpl> buffer = new BufferImpl(this, desc);
+    RefPtr<BufferImpl> buffer = new BufferImpl(desc);
     SLANG_RETURN_ON_FAIL(buffer->init());
     if (initData)
     {
@@ -76,7 +74,7 @@ Result DeviceImpl::createBuffer(const BufferDesc& descIn, const void* initData,
 
 Result DeviceImpl::createTextureView(ITexture* texture, const TextureViewDesc& desc, ITextureView** outView)
 {
-    RefPtr<TextureViewImpl> view = new TextureViewImpl(this, desc);
+    RefPtr<TextureViewImpl> view = new TextureViewImpl(desc);
     view->m_texture = static_cast<TextureImpl*>(texture);
     if (view->m_desc.format == Format::Unknown)
         view->m_desc.format = view->m_texture->m_desc.format;

src/cpu/cpu-shader-object.cpp

@@ -42,7 +42,7 @@ Buffer* CPUShaderObjectData::getBufferResource(
     {
         BufferDesc desc = {};
         desc.elementSize = (int)elementLayout->getSize();
-        m_buffer = new BufferImpl(device, desc);
+        m_buffer = new BufferImpl(desc);
     }
     m_buffer->m_desc.size = m_ordinaryData.size();
     return m_buffer.get();

src/cpu/cpu-texture-view.h

@@ -9,8 +9,8 @@ namespace rhi::cpu {
 class TextureViewImpl : public TextureView, public slang_prelude::IRWTexture
 {
 public:
-    TextureViewImpl(Device* device, const TextureViewDesc& desc)
-        : TextureView(device, desc)
+    TextureViewImpl(const TextureViewDesc& desc)
+        : TextureView(desc)
     {
     }
 

src/cpu/cpu-texture.h

@@ -96,10 +96,11 @@ class TextureImpl : public Texture
     };
 
 public:
-    TextureImpl(Device* device, const TextureDesc& desc)
-        : Texture(device, desc)
+    TextureImpl(const TextureDesc& desc)
+        : Texture(desc)
     {
     }
+
     ~TextureImpl();
 
     Result init(SubresourceData const* initData);

src/cuda/cuda-buffer.h

@@ -8,8 +8,8 @@ namespace rhi::cuda {
 class BufferImpl : public Buffer
 {
 public:
-    BufferImpl(Device* device, const BufferDesc& desc)
-        : Buffer(device, desc)
+    BufferImpl(const BufferDesc& desc)
+        : Buffer(desc)
     {
     }
 

src/cuda/cuda-device.cpp

@@ -320,7 +320,7 @@ Result DeviceImpl::createTexture(const TextureDesc& desc, const SubresourceData*
 {
     TextureDesc srcDesc = fixupTextureDesc(desc);
 
-    RefPtr<TextureImpl> tex = new TextureImpl(this, srcDesc);
+    RefPtr<TextureImpl> tex = new TextureImpl(srcDesc);
 
     CUresourcetype resourceType;
 
@@ -725,7 +725,7 @@ Result DeviceImpl::createTexture(const TextureDesc& desc, const SubresourceData*
 Result DeviceImpl::createBuffer(const BufferDesc& descIn, const void* initData, IBuffer** outBuffer)
 {
     auto desc = fixupBufferDesc(descIn);
-    RefPtr<BufferImpl> buffer = new BufferImpl(this, desc);
+    RefPtr<BufferImpl> buffer = new BufferImpl(desc);
     SLANG_CUDA_RETURN_ON_FAIL(cuMemAllocManaged((CUdeviceptr*)(&buffer->m_cudaMemory), desc.size, CU_MEM_ATTACH_GLOBAL)
     );
     if (initData)
@@ -744,7 +744,7 @@ Result DeviceImpl::createBufferFromSharedHandle(NativeHandle handle, const Buffe
         return SLANG_OK;
     }
 
-    RefPtr<BufferImpl> buffer = new BufferImpl(this, desc);
+    RefPtr<BufferImpl> buffer = new BufferImpl(desc);
 
     // CUDA manages sharing of buffers through the idea of an
     // "external memory" object, which represents the relationship
@@ -808,7 +808,7 @@ Result DeviceImpl::createTextureFromSharedHandle(
         return SLANG_OK;
     }
 
-    RefPtr<TextureImpl> texture = new TextureImpl(this, desc);
+    RefPtr<TextureImpl> texture = new TextureImpl(desc);
 
     // CUDA manages sharing of buffers through the idea of an
     // "external memory" object, which represents the relationship
@@ -886,7 +886,7 @@ Result DeviceImpl::createTextureFromSharedHandle(
 
 Result DeviceImpl::createTextureView(ITexture* texture, const TextureViewDesc& desc, ITextureView** outView)
 {
-    RefPtr<TextureViewImpl> view = new TextureViewImpl(this, desc);
+    RefPtr<TextureViewImpl> view = new TextureViewImpl(desc);
     view->m_texture = static_cast<TextureImpl*>(texture);
     if (view->m_desc.format == Format::Unknown)
         view->m_desc.format = view->m_texture->m_desc.format;

src/cuda/cuda-shader-object.cpp

@@ -14,7 +14,7 @@ Result ShaderObjectData::setCount(Index count)
         {
             BufferDesc desc;
             desc.size = count;
-            m_buffer = new BufferImpl(device, desc);
+            m_buffer = new BufferImpl(desc);
         }
         m_buffer->m_cpuBuffer = m_cpuBuffer.data();
         m_buffer->m_desc.size = count;
@@ -25,7 +25,7 @@ Result ShaderObjectData::setCount(Index count)
         {
             BufferDesc desc;
             desc.size = count;
-            m_buffer = new BufferImpl(device, desc);
+            m_buffer = new BufferImpl(desc);
             if (count)
             {
                 SLANG_CUDA_RETURN_ON_FAIL(cuMemAlloc((CUdeviceptr*)&m_buffer->m_cudaMemory, (size_t)count));

src/cuda/cuda-texture-view.h

@@ -9,8 +9,8 @@ namespace rhi::cuda {
 class TextureViewImpl : public TextureView
 {
 public:
-    TextureViewImpl(Device* device, const TextureViewDesc& desc)
-        : TextureView(device, desc)
+    TextureViewImpl(const TextureViewDesc& desc)
+        : TextureView(desc)
     {
     }
 

src/cuda/cuda-texture.h

@@ -8,10 +8,11 @@ namespace rhi::cuda {
 class TextureImpl : public Texture
 {
 public:
-    TextureImpl(Device* device, const TextureDesc& desc)
-        : Texture(device, desc)
+    TextureImpl(const TextureDesc& desc)
+        : Texture(desc)
     {
     }
+
     ~TextureImpl();
 
     uint64_t getBindlessHandle();

src/d3d11/d3d11-buffer.cpp

@@ -57,8 +57,7 @@ ID3D11ShaderResourceView* BufferImpl::getSRV(Format format, const BufferRange& r
         srvDesc.Buffer.NumElements = UINT(range.size / (sizeInfo.blockSizeInBytes / sizeInfo.pixelsPerBlock));
     }
 
-    ID3D11Device* device = static_cast<DeviceImpl*>(m_device.get())->m_device;
-    SLANG_RETURN_NULL_ON_FAIL(device->CreateShaderResourceView(m_buffer, &srvDesc, srv.writeRef()));
+    SLANG_RETURN_NULL_ON_FAIL(m_device->m_device->CreateShaderResourceView(m_buffer, &srvDesc, srv.writeRef()));
 
     return srv.get();
 }
@@ -94,8 +93,7 @@ ID3D11UnorderedAccessView* BufferImpl::getUAV(Format format, const BufferRange&
         uavDesc.Buffer.NumElements = UINT(range.size / (sizeInfo.blockSizeInBytes / sizeInfo.pixelsPerBlock));
     }
 
-    DeviceImpl* device = static_cast<DeviceImpl*>(m_device.get());
-    SLANG_RETURN_NULL_ON_FAIL(device->m_device->CreateUnorderedAccessView(m_buffer, &uavDesc, uav.writeRef()));
+    SLANG_RETURN_NULL_ON_FAIL(m_device->m_device->CreateUnorderedAccessView(m_buffer, &uavDesc, uav.writeRef()));
 
     return uav.get();
 }

src/d3d11/d3d11-buffer.h

@@ -7,11 +7,13 @@ namespace rhi::d3d11 {
 class BufferImpl : public Buffer
 {
 public:
-    BufferImpl(Device* device, const BufferDesc& desc)
-        : Buffer(device, desc)
+    BufferImpl(DeviceImpl* device, const BufferDesc& desc)
+        : Buffer(desc)
+        , m_device(device)
     {
     }
 
+    DeviceImpl* m_device;
     MapFlavor m_mapFlavor;
     D3D11_USAGE m_d3dUsage;
     ComPtr<ID3D11Buffer> m_buffer;

src/d3d11/d3d11-device.cpp

@@ -736,15 +736,15 @@ Result DeviceImpl::createSampler(SamplerDesc const& desc, ISampler** outSampler)
     ComPtr<ID3D11SamplerState> sampler;
     SLANG_RETURN_ON_FAIL(m_device->CreateSamplerState(&dxDesc, sampler.writeRef()));
 
-    RefPtr<SamplerImpl> samplerImpl = new SamplerImpl(this, desc);
+    RefPtr<SamplerImpl> samplerImpl = new SamplerImpl(desc);
     samplerImpl->m_sampler = sampler;
     returnComPtr(outSampler, samplerImpl);
     return SLANG_OK;
 }
 
 Result DeviceImpl::createTextureView(ITexture* texture, const TextureViewDesc& desc, ITextureView** outView)
 {
-    RefPtr<TextureViewImpl> view = new TextureViewImpl(this, desc);
+    RefPtr<TextureViewImpl> view = new TextureViewImpl(desc);
     view->m_texture = static_cast<TextureImpl*>(texture);
     if (view->m_desc.format == Format::Unknown)
         view->m_desc.format = view->m_texture->m_desc.format;

src/d3d11/d3d11-sampler.h

@@ -7,8 +7,8 @@ namespace rhi::d3d11 {
 class SamplerImpl : public Sampler
 {
 public:
-    SamplerImpl(Device* device, const SamplerDesc& desc)
-        : Sampler(device, desc)
+    SamplerImpl(const SamplerDesc& desc)
+        : Sampler(desc)
     {
     }
 

src/d3d11/d3d11-texture-view.h

@@ -8,8 +8,8 @@ namespace rhi::d3d11 {
 class TextureViewImpl : public TextureView
 {
 public:
-    TextureViewImpl(Device* device, const TextureViewDesc& desc)
-        : TextureView(device, desc)
+    TextureViewImpl(const TextureViewDesc& desc)
+        : TextureView(desc)
     {
     }
 

src/d3d11/d3d11-texture.cpp

@@ -13,8 +13,7 @@ ID3D11RenderTargetView* TextureImpl::getRTV(Format format, const SubresourceRang
     if (rtv)
         return rtv;
 
-    DeviceImpl* device = static_cast<DeviceImpl*>(m_device.get());
-    SLANG_RETURN_NULL_ON_FAIL(device->m_device->CreateRenderTargetView(m_resource, nullptr, rtv.writeRef()));
+    SLANG_RETURN_NULL_ON_FAIL(m_device->m_device->CreateRenderTargetView(m_resource, nullptr, rtv.writeRef()));
 
     return rtv;
 }
@@ -28,8 +27,7 @@ ID3D11DepthStencilView* TextureImpl::getDSV(Format format, const SubresourceRang
     if (dsv)
         return dsv;
 
-    DeviceImpl* device = static_cast<DeviceImpl*>(m_device.get());
-    SLANG_RETURN_NULL_ON_FAIL(device->m_device->CreateDepthStencilView(m_resource, nullptr, dsv.writeRef()));
+    SLANG_RETURN_NULL_ON_FAIL(m_device->m_device->CreateDepthStencilView(m_resource, nullptr, dsv.writeRef()));
 
     return dsv;
 }
@@ -47,8 +45,7 @@ ID3D11ShaderResourceView* TextureImpl::getSRV(Format format, const SubresourceRa
     D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
     initSrvDesc(m_desc, D3DUtil::getMapFormat(format), srvDesc);
 
-    DeviceImpl* device = static_cast<DeviceImpl*>(m_device.get());
-    SLANG_RETURN_NULL_ON_FAIL(device->m_device->CreateShaderResourceView(m_resource, &srvDesc, srv.writeRef()));
+    SLANG_RETURN_NULL_ON_FAIL(m_device->m_device->CreateShaderResourceView(m_resource, &srvDesc, srv.writeRef()));
 
     return srv;
 }
@@ -62,8 +59,7 @@ ID3D11UnorderedAccessView* TextureImpl::getUAV(Format format, const SubresourceR
     if (uav)
         return uav;
 
-    DeviceImpl* device = static_cast<DeviceImpl*>(m_device.get());
-    SLANG_RETURN_NULL_ON_FAIL(device->m_device->CreateUnorderedAccessView(m_resource, nullptr, uav.writeRef()));
+    SLANG_RETURN_NULL_ON_FAIL(m_device->m_device->CreateUnorderedAccessView(m_resource, nullptr, uav.writeRef()));
 
     return uav;
 }

src/d3d11/d3d11-texture.h

@@ -7,11 +7,13 @@ namespace rhi::d3d11 {
 class TextureImpl : public Texture
 {
 public:
-    TextureImpl(Device* device, const TextureDesc& desc)
-        : Texture(device, desc)
+    TextureImpl(DeviceImpl* device, const TextureDesc& desc)
+        : Texture(desc)
+        , m_device(device)
     {
     }
 
+    DeviceImpl* m_device;
     ComPtr<ID3D11Resource> m_resource;
 
     struct ViewKey

src/d3d12/d3d12-buffer.cpp

@@ -3,27 +3,27 @@
 
 namespace rhi::d3d12 {
 
-BufferImpl::BufferImpl(Device* device, const BufferDesc& desc)
-    : Buffer(device, desc)
+BufferImpl::BufferImpl(DeviceImpl* device, const BufferDesc& desc)
+    : Buffer(desc)
+    , m_device(device)
     , m_defaultState(D3DUtil::getResourceState(desc.defaultState))
 {
 }
 
 BufferImpl::~BufferImpl()
 {
-    DeviceImpl* device = static_cast<DeviceImpl*>(m_device.get());
     for (auto& srv : m_srvs)
     {
         if (srv.second)
         {
-            device->m_cpuViewHeap->free(srv.second);
+            m_device->m_cpuViewHeap->free(srv.second);
         }
     }
     for (auto& uav : m_uavs)
     {
         if (uav.second)
         {
-            device->m_cpuViewHeap->free(uav.second);
+            m_device->m_cpuViewHeap->free(uav.second);
         }
     }
 
@@ -127,9 +127,8 @@ D3D12Descriptor BufferImpl::getSRV(Format format, uint32_t stride, const BufferR
         viewDesc.Buffer.NumElements = UINT(range.size / sizeInfo.blockSizeInBytes);
     }
 
-    DeviceImpl* device = static_cast<DeviceImpl*>(m_device.get());
-    device->m_cpuViewHeap->allocate(&descriptor);
-    device->m_device->CreateShaderResourceView(m_resource.getResource(), &viewDesc, descriptor.cpuHandle);
+    m_device->m_cpuViewHeap->allocate(&descriptor);
+    m_device->m_device->CreateShaderResourceView(m_resource.getResource(), &viewDesc, descriptor.cpuHandle);
 
     return descriptor;
 }
@@ -166,9 +165,8 @@ D3D12Descriptor BufferImpl::getUAV(Format format, uint32_t stride, const BufferR
         viewDesc.Buffer.NumElements = UINT(range.size / sizeInfo.blockSizeInBytes);
     }
 
-    DeviceImpl* device = static_cast<DeviceImpl*>(m_device.get());
-    device->m_cpuViewHeap->allocate(&descriptor);
-    device->m_device->CreateUnorderedAccessView(m_resource.getResource(), nullptr, &viewDesc, descriptor.cpuHandle);
+    m_device->m_cpuViewHeap->allocate(&descriptor);
+    m_device->m_device->CreateUnorderedAccessView(m_resource.getResource(), nullptr, &viewDesc, descriptor.cpuHandle);
 
     return descriptor;
 }

src/d3d12/d3d12-buffer.h

@@ -7,10 +7,11 @@ namespace rhi::d3d12 {
 class BufferImpl : public Buffer
 {
 public:
-    BufferImpl(Device* device, const BufferDesc& desc);
+    BufferImpl(DeviceImpl* device, const BufferDesc& desc);
 
     ~BufferImpl();
 
+    DeviceImpl* m_device;
     /// The resource in gpu memory, allocated on the correct heap relative to the cpu access flag
     D3D12Resource m_resource;
     D3D12_RESOURCE_STATES m_defaultState;

src/d3d12/d3d12-device.cpp

@@ -1334,7 +1334,7 @@ Result DeviceImpl::createSampler(SamplerDesc const& desc, ISampler** outSampler)
     // entries that we check before we go to the heap, and then
     // when we are done with a sampler we simply add it to the free list.
     //
-    RefPtr<SamplerImpl> samplerImpl = new SamplerImpl(this, desc);
+    RefPtr<SamplerImpl> samplerImpl = new SamplerImpl(desc);
     samplerImpl->m_allocator = samplerHeap;
     samplerImpl->m_descriptor = cpuDescriptor;
     returnComPtr(outSampler, samplerImpl);
@@ -1343,7 +1343,7 @@ Result DeviceImpl::createSampler(SamplerDesc const& desc, ISampler** outSampler)
 
 Result DeviceImpl::createTextureView(ITexture* texture, const TextureViewDesc& desc, ITextureView** outView)
 {
-    RefPtr<TextureViewImpl> view = new TextureViewImpl(this, desc);
+    RefPtr<TextureViewImpl> view = new TextureViewImpl(desc);
     view->m_texture = static_cast<TextureImpl*>(texture);
     if (view->m_desc.format == Format::Unknown)
         view->m_desc.format = view->m_texture->m_desc.format;