diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java index 294608f5c..5d73d5446 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java @@ -66,6 +66,7 @@ import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL13; import org.lwjgl.opengl.GL14; import org.lwjgl.opengl.GL20; +import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.Display; import org.lwjgl.opengl.GLContext; import org.lwjgl.opengl.KHRDebug; @@ -3786,4 +3787,56 @@ public class GLStateManager { return VENDOR == NVIDIA; } + @Getter protected static int drawFramebuffer = 0; + @Getter protected static int readFramebuffer = 0; + + public static void glBindFramebuffer(int target, int framebuffer) { + if (target == GL30.GL_FRAMEBUFFER) { + if (drawFramebuffer == framebuffer && readFramebuffer == framebuffer) return; + drawFramebuffer = framebuffer; + readFramebuffer = framebuffer; + } else if (target == GL30.GL_DRAW_FRAMEBUFFER) { + if (drawFramebuffer == framebuffer) return; + drawFramebuffer = framebuffer; + } else if (target == GL30.GL_READ_FRAMEBUFFER) { + if (readFramebuffer == framebuffer) return; + readFramebuffer = framebuffer; + } + GL30.glBindFramebuffer(target, framebuffer); + } + + public static void glDeleteFramebuffers(int framebuffer) { + if (drawFramebuffer == framebuffer) drawFramebuffer = 0; + if (readFramebuffer == framebuffer) readFramebuffer = 0; + GL30.glDeleteFramebuffers(framebuffer); + } + + public static int glGenFramebuffers() { + return GL30.glGenFramebuffers(); + } + + public static int glCheckFramebufferStatus(int target) { + return GL30.glCheckFramebufferStatus(target); + } + + public static void glFramebufferTexture2D(int target, int attachment, int textarget, int texture, int level) { + GL30.glFramebufferTexture2D(target, attachment, textarget, texture, level); + } + + public static void setActiveTexture(int textureUnit) { + glActiveTexture(textureUnit); + } + + public static void setLightmapTextureCoords(int unit, float x, float y) { + GL13.glMultiTexCoord2f(unit, x, y); + if (unit == GL13.GL_TEXTURE1) { + OpenGlHelper.lastBrightnessX = x; + OpenGlHelper.lastBrightnessY = y; + } + } + + public static boolean isFramebufferEnabled() { + return OpenGlHelper.framebufferSupported && Minecraft.getMinecraft().gameSettings.fboEnable; + } + } diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/dsa/DSAUnsupported.java b/src/main/java/com/gtnewhorizons/angelica/glsm/dsa/DSAUnsupported.java index 1077d08ac..582b82633 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/dsa/DSAUnsupported.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/dsa/DSAUnsupported.java @@ -2,7 +2,6 @@ package com.gtnewhorizons.angelica.glsm.dsa; import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.glsm.RenderSystem; -import net.minecraft.client.renderer.OpenGlHelper; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL13; @@ -77,13 +76,13 @@ public class DSAUnsupported implements DSAAccess { @Override public void readBuffer(int framebuffer, int buffer) { - OpenGlHelper.func_153171_g/*glBindFramebuffer*/(GL30.GL_FRAMEBUFFER, framebuffer); + GLStateManager.glBindFramebuffer(GL30.GL_FRAMEBUFFER, framebuffer); GL11.glReadBuffer(buffer); } @Override public void drawBuffers(int framebuffer, IntBuffer buffers) { - OpenGlHelper.func_153171_g/*glBindFramebuffer*/(GL30.GL_FRAMEBUFFER, framebuffer); + GLStateManager.glBindFramebuffer(GL30.GL_FRAMEBUFFER, framebuffer); GL20.glDrawBuffers(buffers); } @@ -135,21 +134,21 @@ public class DSAUnsupported implements DSAAccess { @Override public void blitFramebuffer(int source, int dest, int offsetX, int offsetY, int width, int height, int offsetX2, int offsetY2, int width2, int height2, int bufferChoice, int filter) { - OpenGlHelper.func_153171_g/*glBindFramebuffer*/(GL30.GL_READ_FRAMEBUFFER, source); - OpenGlHelper.func_153171_g/*glBindFramebuffer*/(GL30.GL_DRAW_FRAMEBUFFER, dest); + GLStateManager.glBindFramebuffer(GL30.GL_READ_FRAMEBUFFER, source); + GLStateManager.glBindFramebuffer(GL30.GL_DRAW_FRAMEBUFFER, dest); GL30.glBlitFramebuffer(offsetX, offsetY, width, height, offsetX2, offsetY2, width2, height2, bufferChoice, filter); } @Override public void framebufferTexture2D(int fb, int fbtarget, int attachment, int target, int texture, int levels) { - OpenGlHelper.func_153171_g/*glBindFramebuffer*/(fbtarget, fb); + GLStateManager.glBindFramebuffer(fbtarget, fb); GL30.glFramebufferTexture2D(fbtarget, attachment, target, texture, levels); } @Override public int createFramebuffer() { - final int framebuffer = OpenGlHelper.func_153165_e/*glGenFramebuffers*/(); - OpenGlHelper.func_153171_g/*glBindFramebuffer*/(GL30.GL_FRAMEBUFFER, framebuffer); + final int framebuffer = GLStateManager.glGenFramebuffers(); + GLStateManager.glBindFramebuffer(GL30.GL_FRAMEBUFFER, framebuffer); return framebuffer; } diff --git a/src/main/java/com/gtnewhorizons/angelica/hudcaching/HUDCaching.java b/src/main/java/com/gtnewhorizons/angelica/hudcaching/HUDCaching.java index 381e12086..694acbef0 100644 --- a/src/main/java/com/gtnewhorizons/angelica/hudcaching/HUDCaching.java +++ b/src/main/java/com/gtnewhorizons/angelica/hudcaching/HUDCaching.java @@ -20,7 +20,6 @@ import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiIngame; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.EntityRenderer; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraftforge.client.GuiIngameForge; import net.minecraftforge.client.event.RenderGameOverlayEvent; import org.lwjgl.opengl.GL11; @@ -68,7 +67,7 @@ public class HUDCaching { XaeroMinimapCore.beforeIngameGuiRender(partialTicks); } - if (!OpenGlHelper.isFramebufferEnabled()) { + if (!GLStateManager.isFramebufferEnabled()) { ingame.renderGameOverlay(partialTicks, hasScreen, mouseX, mouseY); return; } diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/shared/transformers/AngelicaRedirector.java b/src/main/java/com/gtnewhorizons/angelica/loading/shared/transformers/AngelicaRedirector.java index c324910c2..42ed98e96 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/shared/transformers/AngelicaRedirector.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/shared/transformers/AngelicaRedirector.java @@ -233,7 +233,15 @@ public final class AngelicaRedirector { ); methodRedirects.put(OpenGlHelper, RedirectMap.newMap() .add("glBlendFunc", "tryBlendFuncSeparate") - .add("func_148821_a", "tryBlendFuncSeparate")); + .add("func_148821_a", "tryBlendFuncSeparate") + .add("func_153171_g", "glBindFramebuffer") + .add("func_153174_h", "glDeleteFramebuffers") + .add("func_153165_e", "glGenFramebuffers") + .add("func_153167_i", "glCheckFramebufferStatus") + .add("func_153188_a", "glFramebufferTexture2D") + .add("setActiveTexture") + .add("setLightmapTextureCoords") + .add("isFramebufferEnabled")); methodRedirects.put(EXTBlendFunc, RedirectMap.newMap().add("glBlendFuncSeparateEXT", "tryBlendFuncSeparate")); methodRedirects.put(ARBMultiTexture, RedirectMap.newMap().add("glActiveTextureARB")); methodRedirects.put(Project, RedirectMap.newMap().add("gluPerspective")); diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index cb1e0918b..9b04dc81d 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -200,7 +200,6 @@ public enum Mixins implements IMixins { , "shaders.MixinFramebuffer" , "shaders.MixinItem" , "shaders.MixinLocale" - , "shaders.MixinOpenGlHelper" , "shaders.MixinRender" , "shaders.MixinRenderBiped" , "shaders.MixinRenderEntityFlame" diff --git a/src/main/java/com/gtnewhorizons/angelica/render/CloudRenderer.java b/src/main/java/com/gtnewhorizons/angelica/render/CloudRenderer.java index 69cd734cd..484333090 100644 --- a/src/main/java/com/gtnewhorizons/angelica/render/CloudRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/render/CloudRenderer.java @@ -31,7 +31,6 @@ import jss.notfine.core.Settings; import jss.notfine.gui.options.named.GraphicsQualityOff; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.EntityRenderer; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.texture.DynamicTexture; import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraft.client.resources.IResourceManager; @@ -40,6 +39,7 @@ import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL13; public class CloudRenderer implements IResourceManagerReloadListener { // Shared constants. @@ -337,12 +337,12 @@ public class CloudRenderer implements IResourceManagerReloadListener { texColor = newColor; } - GLStateManager.glActiveTexture(OpenGlHelper.lightmapTexUnit); + GLStateManager.glActiveTexture(GL13.GL_TEXTURE1); GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, COLOR_TEX.getGlTextureId()); GLStateManager.enableTexture(); // Bind the clouds texture last so the shader's sampler2D is correct. - GLStateManager.glActiveTexture(OpenGlHelper.defaultTexUnit); + GLStateManager.glActiveTexture(GL13.GL_TEXTURE0); mc.renderEngine.bindTexture(texture); vbo.setupState(); @@ -384,9 +384,9 @@ public class CloudRenderer implements IResourceManagerReloadListener { vbo.cleanupState(); // Unbind buffer and disable pointers. // Disable our coloring. - GLStateManager.glActiveTexture(OpenGlHelper.lightmapTexUnit); + GLStateManager.glActiveTexture(GL13.GL_TEXTURE1); GLStateManager.disableTexture(); - GLStateManager.glActiveTexture(OpenGlHelper.defaultTexUnit); + GLStateManager.glActiveTexture(GL13.GL_TEXTURE0); // Reset texture matrix. GLStateManager.glMatrixMode(GL11.GL_TEXTURE); diff --git a/src/main/java/net/coderbot/iris/pipeline/ShadowRenderer.java b/src/main/java/net/coderbot/iris/pipeline/ShadowRenderer.java index 6796b06da..578d77193 100644 --- a/src/main/java/net/coderbot/iris/pipeline/ShadowRenderer.java +++ b/src/main/java/net/coderbot/iris/pipeline/ShadowRenderer.java @@ -36,7 +36,6 @@ import net.coderbot.iris.uniforms.CelestialUniforms; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.EntityRenderer; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.client.renderer.culling.Frustrum; import net.minecraft.client.renderer.entity.RenderManager; @@ -538,7 +537,7 @@ public class ShadowRenderer { return; } int brightness = tile.getWorldObj().getLightBrightnessForSkyBlocks(tile.xCoord, tile.yCoord, tile.zCoord, 0); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) brightness % 65536, (float) brightness / 65536); + GLStateManager.setLightmapTextureCoords(GL13.GL_TEXTURE1, (float) brightness % 65536, (float) brightness / 65536); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); TileEntityRendererDispatcher.instance.renderTileEntityAt(tile, (double)tile.xCoord - cameraX, diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/terrain/MixinRenderGlobal.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/terrain/MixinRenderGlobal.java index 1b90b9d5a..25ecb1227 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/terrain/MixinRenderGlobal.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/terrain/MixinRenderGlobal.java @@ -17,7 +17,6 @@ import net.coderbot.iris.pipeline.WorldRenderingPipeline; import net.coderbot.iris.shadows.ShadowRenderingState; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.client.renderer.RenderHelper; @@ -31,6 +30,7 @@ import org.embeddedt.embeddium.impl.render.chunk.shader.ChunkShaderFogComponent; import org.embeddedt.embeddium.impl.render.terrain.SimpleWorldRenderer; import org.embeddedt.embeddium.impl.render.viewport.ViewportProvider; import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL13; import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -144,7 +144,7 @@ public class MixinRenderGlobal implements IRenderGlobalExt { RenderHelper.disableStandardItemLighting(); - GLStateManager.glActiveTexture(OpenGlHelper.defaultTexUnit); + GLStateManager.glActiveTexture(GL13.GL_TEXTURE0); GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, this.mc.getTextureMapBlocks().getGlTextureId()); GLStateManager.glEnable(GL11.GL_TEXTURE_2D); diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/client/renderer/entity/MixinRenderEntityLiving.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/client/renderer/entity/MixinRenderEntityLiving.java index 8ee42a2df..9a0d88190 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/client/renderer/entity/MixinRenderEntityLiving.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/client/renderer/entity/MixinRenderEntityLiving.java @@ -1,7 +1,7 @@ package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cit.client.renderer.entity; +import com.gtnewhorizons.angelica.glsm.GLStateManager; import net.minecraft.client.model.ModelBase; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RendererLivingEntity; import net.minecraft.entity.EntityLivingBase; @@ -13,6 +13,7 @@ import net.minecraftforge.common.MinecraftForge; import org.apache.logging.log4j.Logger; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import org.lwjgl.opengl.GL13; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; @@ -224,9 +225,9 @@ public abstract class MixinRenderEntityLiving extends Render { this.renderEquippedItems(entity, p_76986_9_); float f14 = entity.getBrightness(p_76986_9_); j = this.getColorMultiplier(entity, f14, p_76986_9_); - OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); + GLStateManager.setActiveTexture(GL13.GL_TEXTURE1); GL11.glDisable(GL11.GL_TEXTURE_2D); - OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); + GLStateManager.setActiveTexture(GL13.GL_TEXTURE0); if ((j >> 24 & 255) > 0 || entity.hurtTime > 0 || entity.deathTime > 0) { GL11.glDisable(GL11.GL_TEXTURE_2D); @@ -274,9 +275,9 @@ public abstract class MixinRenderEntityLiving extends Render { logger.error("Couldn't render entity", exception); } - OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); + GLStateManager.setActiveTexture(GL13.GL_TEXTURE1); GL11.glEnable(GL11.GL_TEXTURE_2D); - OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); + GLStateManager.setActiveTexture(GL13.GL_TEXTURE0); GL11.glEnable(GL11.GL_CULL_FACE); GL11.glPopMatrix(); this.passSpecialRender(entity, x, y, z); diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinOpenGlHelper.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinOpenGlHelper.java deleted file mode 100644 index aff6ac976..000000000 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinOpenGlHelper.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.gtnewhorizons.angelica.mixins.early.shaders; - -import net.minecraft.client.renderer.OpenGlHelper; -import org.lwjgl.opengl.GL30; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(OpenGlHelper.class) -public class MixinOpenGlHelper { - @Unique private static int iris$drawFramebuffer = 0; - @Unique private static int iris$readFramebuffer = 0; - - @Inject(method="func_153171_g", at=@At("HEAD"), cancellable=true) - private static void iris$avoidRedundantBind(int target, int framebuffer, CallbackInfo ci) { - if (target == GL30.GL_FRAMEBUFFER) { - if (iris$drawFramebuffer == target && iris$readFramebuffer == target) { - ci.cancel(); - } else { - iris$drawFramebuffer = framebuffer; - iris$readFramebuffer = framebuffer; - } - } else if (target == GL30.GL_DRAW_FRAMEBUFFER) { - if (iris$drawFramebuffer == target) { - ci.cancel(); - } else { - iris$drawFramebuffer = framebuffer; - } - } else if (target == GL30.GL_READ_FRAMEBUFFER) { - if (iris$readFramebuffer == target) { - ci.cancel(); - } else { - iris$readFramebuffer = framebuffer; - } - } else { - throw new IllegalStateException("Invalid framebuffer target: " + target); - } - } - - @Inject(method="func_153174_h", at=@At("HEAD")) - private static void iris$trackFramebufferDelete(int framebuffer, CallbackInfo ci) { - if (iris$drawFramebuffer == framebuffer) { - iris$drawFramebuffer = 0; - } - - if (iris$readFramebuffer == framebuffer) { - iris$readFramebuffer = 0; - } - } - -}