fix a silly memory leak in the IShaderCompiler::CCache

Author: devsh

include/nbl/core/alloc/VectorViewNullMemoryResource.h

@@ -13,13 +13,15 @@
 namespace nbl::core
 {
 
-class refctd_memory_resource : public IReferenceCounted
+class NBL_API2 refctd_memory_resource : public IReferenceCounted
 {
     public:
         virtual void* allocate(size_t bytes, size_t alignment) = 0;
 
         virtual void deallocate(void* p, size_t bytes, size_t alignment) = 0;
 };
+NBL_API2 smart_refctd_ptr<refctd_memory_resource> getDefaultMemoryResource();
+NBL_API2 void setDefaultMemoryResource(refctd_memory_resource* memoryResource);
 
 class std_memory_resource final : public refctd_memory_resource
 {
@@ -39,10 +41,26 @@ class std_memory_resource final : public refctd_memory_resource
     private:
         std::pmr::memory_resource* m_pmr;
 };
-
 NBL_API2 smart_refctd_ptr<std_memory_resource> getNullMemoryResource();
-NBL_API2 smart_refctd_ptr<refctd_memory_resource> getDefaultMemoryResource();
-NBL_API2 void setDefaultMemoryResource(refctd_memory_resource* memoryResource);
+
+template<typename T>
+class adoption_memory_resource final : public refctd_memory_resource
+{
+	public:
+		inline adoption_memory_resource(T&& _backer) : m_backer(std::move(_backer)) {}
+
+		inline void* allocate(std::size_t bytes, std::size_t alignment) override
+		{
+			assert(false); // should never be called
+		}
+        inline void deallocate(void* p, std::size_t bytes, std::size_t alignment) override {} // noop
+
+        T& getBacker() {return m_backer;}
+        const T& getBacker() const {return m_backer;}
+
+	protected:
+		T m_backer;
+};
 
 }
 

include/nbl/core/alloc/refctd_memory_resource.h

@@ -5,8 +5,6 @@
 #include "nbl/asset/utils/shadercUtils.h"
 #include "nbl/asset/utils/shaderCompiler_serialization.h"
 
-#include "nbl/core/alloc/VectorViewNullMemoryResource.h"
-
 #include <sstream>
 #include <regex>
 #include <iterator>
@@ -343,8 +341,8 @@ core::smart_refctd_ptr<ICPUBuffer> IShaderCompiler::CCache::serialize() const
     // Might as well memcpy everything
     memcpy(retVal.data() + SHADER_BUFFER_SIZE_BYTES + shaderBufferSize, dumpedContainerJson.data(), dumpedContainerJsonLength);
 
-    auto memoryResource = new core::VectorViewNullMemoryResource(std::move(retVal));
-    return ICPUBuffer::create({ { retValSize }, memoryResource->data(), core::make_smart_refctd_ptr<core::refctd_memory_resource>(memoryResource) });
+    auto memoryResource = core::make_smart_refctd_ptr<core::adoption_memory_resource<decltype(retVal)>>(std::move(retVal));
+    return ICPUBuffer::create({ { retValSize }, memoryResource->getBacker().data(),std::move(memoryResource)});
 }
 
 core::smart_refctd_ptr<IShaderCompiler::CCache> IShaderCompiler::CCache::deserialize(const std::span<const uint8_t> serializedCache)
@@ -417,8 +415,8 @@ bool nbl::asset::IShaderCompiler::CCache::SEntry::setContent(const asset::ICPUBu
     if (res != SZ_OK || propsSize != LZMA_PROPS_SIZE) return false;
     compressedSpirv.resize(propsSize + destLen);
 
-    auto memResource = new core::VectorViewNullMemoryResource(std::move(compressedSpirv));
-    spirv = ICPUBuffer::create({ { propsSize + destLen }, memResource->data(), core::make_smart_refctd_ptr<core::refctd_memory_resource>(memResource) });
+    auto memoryResource = core::make_smart_refctd_ptr<core::adoption_memory_resource<decltype(compressedSpirv)>>(std::move(compressedSpirv));
+    spirv = ICPUBuffer::create({ { propsSize + destLen }, memoryResource->getBacker().data(),std::move(memoryResource)});
 
     return true;
 }