diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/AutoClosableAbstractTexture.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/AutoClosableAbstractTexture.java index ba5648877..e333de8c1 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/AutoClosableAbstractTexture.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/AutoClosableAbstractTexture.java @@ -6,7 +6,9 @@ import org.lwjgl.opengl.GL11; public abstract class AutoClosableAbstractTexture extends AbstractTexture implements AutoCloseable { @Override - public void close() throws Exception {} + public void close() { + deleteGlTexture(); + } // TODO: Is this needed? public void bind() { diff --git a/src/main/java/net/coderbot/iris/Iris.java b/src/main/java/net/coderbot/iris/Iris.java index 73489b8d0..fcd933a88 100644 --- a/src/main/java/net/coderbot/iris/Iris.java +++ b/src/main/java/net/coderbot/iris/Iris.java @@ -828,6 +828,7 @@ public class Iris { currentPack = null; getPipelineManager().destroyPipeline(); + PBRTextureManager.INSTANCE.clear(); // Close the zip filesystem that the shaderpack was loaded from // diff --git a/src/main/java/net/coderbot/iris/texture/pbr/PBRAtlasTexture.java b/src/main/java/net/coderbot/iris/texture/pbr/PBRAtlasTexture.java index 501653774..ce14c9db0 100644 --- a/src/main/java/net/coderbot/iris/texture/pbr/PBRAtlasTexture.java +++ b/src/main/java/net/coderbot/iris/texture/pbr/PBRAtlasTexture.java @@ -140,5 +140,8 @@ public class PBRAtlasTexture extends AutoClosableAbstractTexture { case SPECULAR -> pbrHolder.setSpecularAtlas(null); } } + + clear(); + super.close(); } } diff --git a/src/main/java/net/coderbot/iris/texture/pbr/PBRTextureManager.java b/src/main/java/net/coderbot/iris/texture/pbr/PBRTextureManager.java index 6299d951b..c18becc1d 100644 --- a/src/main/java/net/coderbot/iris/texture/pbr/PBRTextureManager.java +++ b/src/main/java/net/coderbot/iris/texture/pbr/PBRTextureManager.java @@ -126,7 +126,16 @@ public class PBRTextureManager { } private static void closeTexture(AbstractTexture texture) { - texture.deleteGlTexture(); + if (texture instanceof AutoCloseable closeable) { + try { + closeable.close(); + return; + } catch (Exception e) { + Iris.logger.error("Failed to close PBR texture", e); + } + } + + texture.deleteGlTexture(); } public static void notifyPBRTexturesChanged() {