diff --git a/src/main/java/net/coderbot/iris/gl/framebuffer/GlFramebuffer.java b/src/main/java/net/coderbot/iris/gl/framebuffer/GlFramebuffer.java index 27bca9d1a..816b3108f 100644 --- a/src/main/java/net/coderbot/iris/gl/framebuffer/GlFramebuffer.java +++ b/src/main/java/net/coderbot/iris/gl/framebuffer/GlFramebuffer.java @@ -104,7 +104,7 @@ public class GlFramebuffer extends GlResource { @Override protected void destroyInternal() { - OpenGlHelper.func_153184_g/*glDeleteFramebuffers*/(getGlId()); + OpenGlHelper.func_153174_h/*glDeleteFramebuffers*/(getGlId()); } public boolean isComplete() { diff --git a/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java b/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java index c8cd3fd1e..8a01fc7b3 100644 --- a/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java +++ b/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java @@ -930,11 +930,21 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R // Destroy the composite rendering pipeline // // This destroys all the loaded composite programs as well. + prepareRenderer.destroy(); compositeRenderer.destroy(); deferredRenderer.destroy(); finalPassRenderer.destroy(); centerDepthSampler.destroy(); + // Destroy shadow compute programs + if (shadowComputes != null) { + for (ComputeProgram compute : shadowComputes) { + if (compute != null) { + compute.destroy(); + } + } + } + horizonRenderer.destroy(); // Make sure that any custom framebuffers are not bound before destroying render targets @@ -957,7 +967,7 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R // Destroy custom textures and the static samplers (normals, specular, and noise) customTextureManager.destroy(); -// whitePixel.releaseId(); + whitePixel.deleteGlTexture(); // Destroy custom images for (GlImage image : customImages) { diff --git a/src/main/java/net/coderbot/iris/postprocess/FinalPassRenderer.java b/src/main/java/net/coderbot/iris/postprocess/FinalPassRenderer.java index ff01d68b6..5e41223c2 100644 --- a/src/main/java/net/coderbot/iris/postprocess/FinalPassRenderer.java +++ b/src/main/java/net/coderbot/iris/postprocess/FinalPassRenderer.java @@ -453,5 +453,6 @@ public class FinalPassRenderer { if (finalPass != null) { finalPass.destroy(); } + colorHolder.destroy(); } }