From e04b5f931d062e3a3211a9c615e3205e357f5ad4 Mon Sep 17 00:00:00 2001
From: Sasha Szpakowski <slime73@gmail.com>
Date: Sun, 14 Apr 2024 11:31:10 -0300
Subject: [PATCH] Move internal auto-generation for canvas mipmaps to high
 level code.

---
 src/modules/graphics/Graphics.cpp        | 28 +++++++++++++++++++-----
 src/modules/graphics/metal/Graphics.mm   |  6 -----
 src/modules/graphics/opengl/Graphics.cpp |  7 ------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/modules/graphics/Graphics.cpp b/src/modules/graphics/Graphics.cpp
index 979c2cb9e..5f6a58af3 100644
--- a/src/modules/graphics/Graphics.cpp
+++ b/src/modules/graphics/Graphics.cpp
@@ -995,31 +995,33 @@ void Graphics::setRenderTargets(const RenderTargets &rts)
 	if (firsttex == nullptr)
 		return setRenderTarget();
 
-	const auto &prevRTs = state.renderTargets;
+	const auto &prevRTsRef = state.renderTargets;
 
-	if (rtcount == (int) prevRTs.colors.size())
+	if (rtcount == (int) prevRTsRef.colors.size())
 	{
 		bool modified = false;
 
 		for (int i = 0; i < rtcount; i++)
 		{
-			if (rts.colors[i] != prevRTs.colors[i])
+			if (rts.colors[i] != prevRTsRef.colors[i])
 			{
 				modified = true;
 				break;
 			}
 		}
 
-		if (!modified && rts.depthStencil != prevRTs.depthStencil)
+		if (!modified && rts.depthStencil != prevRTsRef.depthStencil)
 			modified = true;
 
-		if (rts.temporaryRTFlags != prevRTs.temporaryRTFlags)
+		if (rts.temporaryRTFlags != prevRTsRef.temporaryRTFlags)
 			modified = true;
 
 		if (!modified)
 			return;
 	}
 
+	const RenderTargetsStrongRef prevRTs = prevRTsRef;
+
 	if (rtcount > capabilities.limits[LIMIT_RENDER_TARGETS])
 		throw love::Exception("This system can't simultaneously render to %d textures.", rtcount);
 
@@ -1151,6 +1153,13 @@ void Graphics::setRenderTargets(const RenderTargets &rts)
 
 	resetProjection();
 
+	// generateMipmaps can't be used for depth/stencil textures.
+	for (const auto &rt : prevRTs.colors)
+	{
+		if (rt.texture && rt.texture->getMipmapsMode() == Texture::MIPMAPS_AUTO && rt.mipmap == 0)
+			rt.texture->generateMipmaps();
+	}
+
 	// Clear/reset the temporary depth/stencil buffers.
 	// TODO: make this deferred somehow to avoid double clearing if the user
 	// also calls love.graphics.clear after setCanvas.
@@ -1170,6 +1179,8 @@ void Graphics::setRenderTarget()
 	if (state.renderTargets.colors.empty() && state.renderTargets.depthStencil.texture == nullptr)
 		return;
 
+	const RenderTargetsStrongRef prevRTs = state.renderTargets;
+
 	flushBatchedDraws();
 	setRenderTargetsInternal(RenderTargets(), pixelWidth, pixelHeight, isGammaCorrect());
 
@@ -1177,6 +1188,13 @@ void Graphics::setRenderTarget()
 	renderTargetSwitchCount++;
 
 	resetProjection();
+
+	// generateMipmaps can't be used for depth/stencil textures.
+	for (const auto& rt : prevRTs.colors)
+	{
+		if (rt.texture && rt.texture->getMipmapsMode() == Texture::MIPMAPS_AUTO && rt.mipmap == 0)
+			rt.texture->generateMipmaps();
+	}
 }
 
 Graphics::RenderTargets Graphics::getRenderTargets() const
diff --git a/src/modules/graphics/metal/Graphics.mm b/src/modules/graphics/metal/Graphics.mm
index b06861a2e..87aea5e7a 100644
--- a/src/modules/graphics/metal/Graphics.mm
+++ b/src/modules/graphics/metal/Graphics.mm
@@ -1528,12 +1528,6 @@ void Graphics::endPass(bool presenting)
 	}
 
 	submitRenderEncoder(SUBMIT_DONE);
-
-	for (const auto &rt : rts.colors)
-	{
-		if (rt.texture->getMipmapsMode() == Texture::MIPMAPS_AUTO && rt.mipmap == 0)
-			rt.texture->generateMipmaps();
-	}
 }
 
 void Graphics::clear(OptionalColorD c, OptionalInt stencil, OptionalDouble depth)
diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp
index 50bf397a7..c26fa8c07 100644
--- a/src/modules/graphics/opengl/Graphics.cpp
+++ b/src/modules/graphics/opengl/Graphics.cpp
@@ -861,13 +861,6 @@ void Graphics::endPass(bool presenting)
 				glBlitFramebuffer(0, 0, w, h, 0, 0, w, h, mask, GL_NEAREST);
 		}
 	}
-
-	// generateMipmaps can't be used for depth/stencil textures.
-	for (const auto &rt : rts.colors)
-	{
-		if (rt.texture->getMipmapsMode() == Texture::MIPMAPS_AUTO && rt.mipmap == 0)
-			rt.texture->generateMipmaps();
-	}
 }
 
 void Graphics::clear(OptionalColorD c, OptionalInt stencil, OptionalDouble depth)