Fix error handling on texture creation failure

hrydgard · Dec 15, 2023 · 43a2af4 · 43a2af4
1 parent 773bbbd
commit 43a2af4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Common/GPU/Vulkan/thin3d_vulkan.cpp b/Common/GPU/Vulkan/thin3d_vulkan.cpp
@@ -1298,7 +1298,7 @@ Texture *VKContext::CreateTexture(const TextureDesc &desc) {
 		return tex;
 	} else {
 		ERROR_LOG(G3D,  "Failed to create texture");
-		delete tex;
+		tex->Release();
 		return nullptr;
 	}
 }

diff --git a/Common/Render/ManagedTexture.cpp b/Common/Render/ManagedTexture.cpp
@@ -194,6 +194,10 @@ Draw::Texture *ManagedTexture::GetTexture() {
 		}
 		// Image load is done, texture creation is not.
 		texture_ = CreateTextureFromTempImage(draw_, pendingImage_, generateMips_, filename_.c_str());
+		if (!texture_) {
+			// Failed to create the texture for whatever reason, like dimensions. Don't retry next time.
+			state_ = LoadState::FAILED;
+		}
 		pendingImage_.Free();
 	}
 	return texture_;