Fix possible hangs in ManagedTexture destruction. Change a thread name.

hrydgard · Jan 15, 2024 · 56c797e · 56c797e
1 parent 739f22f
commit 56c797e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Common/GPU/Vulkan/VulkanRenderManager.cpp b/Common/GPU/Vulkan/VulkanRenderManager.cpp
@@ -535,7 +535,7 @@ void VulkanRenderManager::ReleaseCompileQueue() {
 }
 
 void VulkanRenderManager::ThreadFunc() {
-	SetCurrentThreadName("RenderMan");
+	SetCurrentThreadName("VulkanRenderMan");
 	while (true) {
 		_dbg_assert_(useRenderThread_);
 

diff --git a/Common/Render/ManagedTexture.cpp b/Common/Render/ManagedTexture.cpp
@@ -35,11 +35,13 @@ class TextureLoadTask : public Task {
 			ERROR_LOG(IO, "Failed to read file '%s'", filename_.c_str());
 			filename_.clear();
 			*state_ = ManagedTexture::LoadState::FAILED;
+			waitable_->Notify();
 			return;
 		}
 
 		if (!tempImage_->LoadTextureLevels(buffer, fileSize, type_)) {
 			*state_ = ManagedTexture::LoadState::FAILED;
+			waitable_->Notify();
 			return;
 		}
 		delete[] buffer;