diff --git a/src/main/java/com/gtnewhorizons/angelica/hudcaching/HUDCaching.java b/src/main/java/com/gtnewhorizons/angelica/hudcaching/HUDCaching.java index 7531de5f3..63b03c519 100644 --- a/src/main/java/com/gtnewhorizons/angelica/hudcaching/HUDCaching.java +++ b/src/main/java/com/gtnewhorizons/angelica/hudcaching/HUDCaching.java @@ -76,7 +76,7 @@ public class HUDCaching { GLStateManager.glActiveTexture(GL13.GL_TEXTURE0); GLStateManager.enableTexture(); - if (!AngelicaConfig.hudCachingActive) { + if (!AngelicaConfig.hudCachingActive || mc.displayWidth < 16 || mc.displayHeight < 16) { ingame.renderGameOverlay(partialTicks, hasScreen, mouseX, mouseY); return; } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 65059c6f1..83d529389 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -35,6 +35,7 @@ public enum Mixins implements IMixins { , "angelica.MixinGameSettings" , "angelica.MixinMinecraft" , "angelica.MixinMinecraft_FrameHook" + , "angelica.MixinMinecraft_IconifyGuard" , "angelica.MixinMinecraftServer" , "angelica.bugfixes.MixinItemRenderer_EdgeDepth" , "angelica.bugfixes.MixinModelCreeper_AuraBodyInflate" 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 c4f272e69..567ab55e4 100644 --- a/src/main/java/net/coderbot/iris/gl/framebuffer/GlFramebuffer.java +++ b/src/main/java/net/coderbot/iris/gl/framebuffer/GlFramebuffer.java @@ -113,10 +113,13 @@ public class GlFramebuffer extends GlResource { GLStateManager.glDeleteFramebuffers(getGlId()); } - public boolean isComplete() { + public int getStatus() { bind(); + return GLStateManager.glCheckFramebufferStatus(GL30.GL_FRAMEBUFFER); + } - return GLStateManager.glCheckFramebufferStatus(GL30.GL_FRAMEBUFFER) == GL30.GL_FRAMEBUFFER_COMPLETE; + public boolean isComplete() { + return getStatus() == GL30.GL_FRAMEBUFFER_COMPLETE; } public int getId() { diff --git a/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java b/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java index 984b7d35e..989dfe262 100644 --- a/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java +++ b/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java @@ -1560,6 +1560,11 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R @Override public void beginLevelRendering() { + final Framebuffer mainFb = Minecraft.getMinecraft().getFramebuffer(); + if (mainFb == null || mainFb.framebufferWidth < 16 || mainFb.framebufferHeight < 16) { + return; + } + isRenderingFullScreenPass = false; isRenderingWorld = true; isBeforeTranslucent = true; diff --git a/src/main/java/net/coderbot/iris/pipeline/FixedFunctionWorldRenderingPipeline.java b/src/main/java/net/coderbot/iris/pipeline/FixedFunctionWorldRenderingPipeline.java index 4fbeaf67d..6c278462a 100644 --- a/src/main/java/net/coderbot/iris/pipeline/FixedFunctionWorldRenderingPipeline.java +++ b/src/main/java/net/coderbot/iris/pipeline/FixedFunctionWorldRenderingPipeline.java @@ -18,6 +18,7 @@ import net.coderbot.iris.shaderpack.texture.TextureStage; import net.coderbot.iris.uniforms.FrameUpdateNotifier; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.EntityRenderer; +import net.minecraft.client.shader.Framebuffer; import java.util.List; import java.util.OptionalInt; @@ -33,8 +34,12 @@ public class FixedFunctionWorldRenderingPipeline implements WorldRenderingPipeli @Override public void beginLevelRendering() { + final Framebuffer mainFb = Minecraft.getMinecraft().getFramebuffer(); + if (mainFb == null || mainFb.framebufferWidth < 16 || mainFb.framebufferHeight < 16) { + return; + } // Use the default Minecraft framebuffer and ensure that no programs are in use - Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(true); + mainFb.bindFramebuffer(true); GLStateManager.glUseProgram(0); } diff --git a/src/main/java/net/coderbot/iris/rendertarget/RenderTargets.java b/src/main/java/net/coderbot/iris/rendertarget/RenderTargets.java index 33f0beb07..0b2490403 100644 --- a/src/main/java/net/coderbot/iris/rendertarget/RenderTargets.java +++ b/src/main/java/net/coderbot/iris/rendertarget/RenderTargets.java @@ -12,6 +12,7 @@ import net.coderbot.iris.shaderpack.PackDirectives; import net.coderbot.iris.shaderpack.PackRenderTargetDirectives; import org.joml.Vector2i; import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL30; import java.util.ArrayList; import java.util.List; @@ -320,8 +321,9 @@ public class RenderTargets { framebuffer.drawBuffers(actualDrawBuffers); framebuffer.readBuffer(0); - if (!framebuffer.isComplete()) { - throw new IllegalStateException("Unexpected error while creating framebuffer"); + final int status = framebuffer.getStatus(); + if (status != GL30.GL_FRAMEBUFFER_COMPLETE) { + throw new IllegalStateException(String.format( "Unexpected error while creating framebuffer: glCheckFramebufferStatus=0x%X, size=%dx%d, drawBuffers=%d", status, cachedWidth, cachedHeight, drawBuffers.length)); } return framebuffer; diff --git a/src/main/java/net/coderbot/iris/shadows/ShadowRenderTargets.java b/src/main/java/net/coderbot/iris/shadows/ShadowRenderTargets.java index 21a8a7c9c..e4b0c5400 100644 --- a/src/main/java/net/coderbot/iris/shadows/ShadowRenderTargets.java +++ b/src/main/java/net/coderbot/iris/shadows/ShadowRenderTargets.java @@ -14,6 +14,7 @@ import net.coderbot.iris.pipeline.WorldRenderingPipeline; import net.coderbot.iris.rendertarget.RenderTarget; import net.coderbot.iris.shaderpack.PackShadowDirectives; import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL30; import java.util.ArrayList; import java.util.List; @@ -283,8 +284,9 @@ public class ShadowRenderTargets { framebuffer.drawBuffers(actualDrawBuffers); framebuffer.readBuffer(0); - if (!framebuffer.isComplete()) { - throw new IllegalStateException("Unexpected error while creating framebuffer"); + final int status = framebuffer.getStatus(); + if (status != GL30.GL_FRAMEBUFFER_COMPLETE) { + throw new IllegalStateException(String.format( "Unexpected error while creating shadow framebuffer: glCheckFramebufferStatus=0x%X, resolution=%d, drawBuffers=%d", status, resolution, drawBuffers.length)); } return framebuffer; diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinMinecraft_IconifyGuard.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinMinecraft_IconifyGuard.java new file mode 100644 index 000000000..1303cb358 --- /dev/null +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinMinecraft_IconifyGuard.java @@ -0,0 +1,24 @@ +package com.gtnewhorizons.angelica.mixins.early.angelica; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.EntityRenderer; +import net.minecraft.client.shader.Framebuffer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(Minecraft.class) +public class MixinMinecraft_IconifyGuard { + + @Redirect( + method = "runGameLoop", + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/EntityRenderer;updateCameraAndRender(F)V") + ) + private void angelica$skipRenderWhenIconified(EntityRenderer entityRenderer, float partialTicks) { + final Framebuffer fb = Minecraft.getMinecraft().getFramebuffer(); + if (fb == null || fb.framebufferWidth < 16 || fb.framebufferHeight < 16) { + return; + } + entityRenderer.updateCameraAndRender(partialTicks); + } +}