Fix old resource was unallocated while in use in current frame.

Author: Nemirtingas

src/RendererHookInternal.cpp

@@ -37,11 +37,18 @@ void RendererHookInternal_t::_LoadResources()
 	if (_ResourcesToLoad.empty())
 		return;
 
+	for (auto& resource : _OldResourcesToUnload)
+		resource->UnloadOldResource();
+
+	_OldResourcesToUnload.clear();
+
 	auto batchSize = _ResourcesToLoad.size() > _BatchSize ? _BatchSize : _ResourcesToLoad.size();
+
 	for (int i = 0; i < batchSize; ++i)
 	{
-		if (_ResourcesToLoad[i]->IsLoaded())
-			_ResourcesToLoad[i]->Unload(false);
+		// Remove old resources next frame, it might be currently in use.
+		if (_ResourcesToLoad[i]->AttachementChanged())
+			_OldResourcesToUnload.emplace_back(_ResourcesToLoad[i]);
 
 		_ResourcesToLoad[i]->LoadAttachedResource();
 	}

src/RendererHookInternal.h

@@ -35,6 +35,7 @@ class RendererHookInternal_t : public RendererHook_t
     ResourceAutoLoad_t _AutoLoad;
     uint32_t _BatchSize;
     std::vector<RendererResourceInternal_t*> _ResourcesToLoad;
+    std::vector<RendererResourceInternal_t*> _OldResourcesToUnload;
 
 protected:
     RendererHookInternal_t();

src/RendererResourceInternal.cpp

@@ -62,19 +62,6 @@ bool RendererResourceInternal_t::_DoAutoLoad()
 	return _DoImmediateLoad();
 }
 
-bool RendererResourceInternal_t::_AttachementChanged()
-{
-	return !_OldRendererResource.expired();
-}
-
-void RendererResourceInternal_t::_UnloadOldResource()
-{
-	if (auto r = _OldRendererResource.lock())
-		_RendererHook->ReleaseImageResource(_OldRendererResource);
-
-	_OldRendererResource.reset();
-}
-
 void RendererResourceInternal_t::Delete()
 {
 	delete this;
@@ -104,7 +91,7 @@ bool RendererResourceInternal_t::LoadAttachedResource()
 {
 	if (IsLoaded())
 	{
-		if (!_AttachementChanged())
+		if (!AttachementChanged())
 			return true;
 
 		Unload(false);
@@ -113,7 +100,6 @@ bool RendererResourceInternal_t::LoadAttachedResource()
 	if (!CanBeLoaded())
 		return false;
 
-	_UnloadOldResource();
 	_RendererResource = _RendererHook->CreateImageResource(_Data, _Width, _Height);
 	return !_RendererResource.expired();
 }
@@ -132,14 +118,26 @@ bool RendererResourceInternal_t::Load(const void* data, uint32_t width, uint32_t
 
 uint64_t RendererResourceInternal_t::GetResourceId()
 {
-	if (_AttachementChanged() || !IsLoaded())
+	if (AttachementChanged() || !IsLoaded())
 	{
-		if (!_DoAutoLoad() && !_AttachementChanged())
+		if (!_DoAutoLoad() && !AttachementChanged())
 			return 0;
 	}
 
-	auto r = !_AttachementChanged() ? _RendererResource.lock() : _OldRendererResource.lock();
-	return r != nullptr ? *r : 0;
+	if (IsLoaded())
+	{
+		auto r = _RendererResource.lock();
+		if (r != nullptr)
+			return *r;
+	}
+	if (AttachementChanged())
+	{
+		auto r = _OldRendererResource.lock();
+		if (r != nullptr)
+			return *r;
+	}
+
+	return 0;
 }
 
 uint32_t RendererResourceInternal_t::Width() const
@@ -176,7 +174,7 @@ void RendererResourceInternal_t::ClearAttachedResource()
 
 void RendererResourceInternal_t::Unload(bool clearAttachedResource)
 {
-	_UnloadOldResource();
+	UnloadOldResource();
 
 	if (auto r = _RendererResource.lock())
 		_RendererHook->ReleaseImageResource(_RendererResource);
@@ -187,4 +185,17 @@ void RendererResourceInternal_t::Unload(bool clearAttachedResource)
 		ClearAttachedResource();
 }
 
+bool RendererResourceInternal_t::AttachementChanged()
+{
+	return !_OldRendererResource.expired();
+}
+
+void RendererResourceInternal_t::UnloadOldResource()
+{
+	if (auto r = _OldRendererResource.lock())
+		_RendererHook->ReleaseImageResource(_OldRendererResource);
+
+	_OldRendererResource.reset();
+}
+
 }

src/RendererResourceInternal.h

@@ -35,8 +35,6 @@ class RendererResourceInternal_t : public RendererResource_t
     bool _DoBatchLoad();
     bool _DoImmediateLoad();
     bool _DoAutoLoad();
-    bool _AttachementChanged();
-    void _UnloadOldResource();
 
 public:
     std::weak_ptr<uint64_t> _OldRendererResource;
@@ -81,6 +79,10 @@ class RendererResourceInternal_t : public RendererResource_t
     virtual void ClearAttachedResource();
 
     virtual void Unload(bool clearAttachedResource = true);
+
+    bool AttachementChanged();
+
+    void UnloadOldResource();
 };
 
 }