more ICPUBuffer fixes

Signed-off-by: Ali Cheraghi <alichraghi@proton.me>

Author: alichraghi

include/nbl/asset/ICPUBuffer.h

@@ -130,6 +130,11 @@ class ICPUBuffer final : public asset::IBuffer, public IPreHashed
         asset::IBuffer({ params.size, EUF_TRANSFER_DST_BIT }), m_data(params.data),
         m_mem_resource(params.memoryResource), m_alignment(params.alignment) {}
 
+    ~ICPUBuffer() override {
+        if (m_data)
+            m_mem_resource->deallocate(m_data, m_creationParams.size, m_alignment);
+    }
+
     void* m_data;
     core::smart_refctd_ptr<core::refctd_memory_resource> m_mem_resource;
     size_t m_alignment;

include/nbl/core/alloc/refctd_memory_resource.h

@@ -35,7 +35,7 @@ class refctd_memory_resource : public core::IReferenceCounted
 
 NBL_API2 smart_refctd_ptr<refctd_memory_resource> getNullMemoryResource();
 NBL_API2 smart_refctd_ptr<refctd_memory_resource> getDefaultMemoryResource();
-NBL_API2 void setDefaultMemoryResource(smart_refctd_ptr<refctd_memory_resource> memoryResource);
+NBL_API2 void setDefaultMemoryResource(refctd_memory_resource* memoryResource);
 
 }
 

src/nbl/asset/ICPUImage.cpp

@@ -122,7 +122,7 @@ class CFlattenRegionsStreamHashImageFilter : public CMatchedSizeInOutImageFilter
 
 		auto getScratchAsBuffer = [&memory = state->scratch.memory](size_t size, size_t offset = 0ull)
 		{
-				return ICPUBuffer::create({ .size = size, .data = (uint8_t*)memory + offset }, core::adopt_memory); // adopt memory & don't free it on exit
+				return ICPUBuffer::create({ .size = size, .data = (uint8_t*)memory + offset, .memoryResource = core::getNullMemoryResource() }, core::adopt_memory); // adopt memory & don't free it on exit
 		};
 
 		/*

src/nbl/core/alloc/refctd_memory_resource.cpp

@@ -24,7 +24,7 @@ smart_refctd_ptr<refctd_memory_resource> core::getDefaultMemoryResource()
     return default_memory_resource;
 }
 
-void core::setDefaultMemoryResource(smart_refctd_ptr<refctd_memory_resource> memoryResource)
+void core::setDefaultMemoryResource(refctd_memory_resource* memoryResource)
 {
-    default_memory_resource = memoryResource;
+    default_memory_resource = smart_refctd_ptr<refctd_memory_resource>(memoryResource, dont_grab);
 }