From d6fda19d2eb2adf4c05022aa486635084a559821 Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Sat, 25 May 2024 16:14:48 -0700
Subject: [PATCH] Fix texture caching in imgui 2d renderer

---
 .../Renderers/ImGui2DRenderer.cs                      | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/BizHawk.Bizware.Graphics/Renderers/ImGui2DRenderer.cs b/src/BizHawk.Bizware.Graphics/Renderers/ImGui2DRenderer.cs
index 9909738ab3..0771e08d45 100644
--- a/src/BizHawk.Bizware.Graphics/Renderers/ImGui2DRenderer.cs
+++ b/src/BizHawk.Bizware.Graphics/Renderers/ImGui2DRenderer.cs
@@ -135,7 +135,6 @@ namespace BizHawk.Bizware.Graphics
 		protected class ImGuiUserTexture
 		{
 			public Bitmap Bitmap;
-			public ITexture2D CachedTexture;
 			public bool WantCache;
 		}
 
@@ -196,9 +195,9 @@ namespace BizHawk.Bizware.Graphics
 						if (texId != IntPtr.Zero)
 						{
 							var userTex = (ImGuiUserTexture)GCHandle.FromIntPtr(texId).Target!;
-							if (userTex.CachedTexture != null)
+							if (userTex.WantCache && _resourceCache.TextureCache.TryGetValue(userTex.Bitmap, out var cachedTexture))
 							{
-								_resourceCache.SetTexture(userTex.CachedTexture);
+								_resourceCache.SetTexture(cachedTexture);
 							}
 							else
 							{
@@ -207,7 +206,6 @@ namespace BizHawk.Bizware.Graphics
 								if (userTex.WantCache)
 								{
 									_resourceCache.TextureCache.Add(userTex.Bitmap, tempTex);
-									userTex.CachedTexture = tempTex;
 									tempTex = null;
 								}
 							}
@@ -429,11 +427,6 @@ namespace BizHawk.Bizware.Graphics
 		public void DrawImage(Bitmap image, Rectangle destRect, int srcX, int srcY, int srcWidth, int srcHeight, bool cache)
 		{
 			var texture = new ImGuiUserTexture { Bitmap = image, WantCache = cache };
-			if (cache && _resourceCache.TextureCache.TryGetValue(image, out var cachedTexture))
-			{
-				texture.CachedTexture = cachedTexture;
-			}
-
 			var handle = GCHandle.Alloc(texture, GCHandleType.Normal);
 			_gcHandles.Add(handle);
 			var imgWidth = (float)image.Width;