From 1eab3b64db3a60fe47fc8ab532814521a857891c Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 11 Nov 2015 20:07:11 +0000 Subject: [PATCH] Use OpenGLHelper for multitexture, basically use ARB instead of GL13 if GL13 isn't available. --- .../vazkii/botania/client/core/handler/DebugHandler.java | 1 + .../client/gui/lexicon/button/GuiButtonCategory.java | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java index a7fb2f0b1..c4763f5b5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -57,6 +57,7 @@ public final class DebugHandler { event.left.add(" GL_MAX_TEXTURE_IMAGE_UNITS_ARB: " + GL11.glGetInteger(ARBFragmentShader.GL_MAX_TEXTURE_IMAGE_UNITS_ARB)); event.left.add(" GL_ARB_multitexture: " + caps.GL_ARB_multitexture); event.left.add(" GL_ARB_texture_non_power_of_two: " + caps.GL_ARB_texture_non_power_of_two); + event.left.add(" OpenGL13: " + caps.OpenGL13); } } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java index 7a3098dde..fde860590 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java @@ -11,6 +11,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -43,17 +44,17 @@ public class GuiButtonCategory extends GuiButtonLexicon { int maskUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "mask"); float heightMatch = ticksHovered / time; - GL13.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB); + OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB); GL11.glBindTexture(GL11.GL_TEXTURE_2D, r.getTexture(resource).getGlTextureId()); ARBShaderObjects.glUniform1iARB(imageUniform, 0); - GL13.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + ConfigHandler.glSecondaryTextureUnit); + OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + ConfigHandler.glSecondaryTextureUnit); GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glBindTexture(GL11.GL_TEXTURE_2D, r.getTexture(stencilResource).getGlTextureId()); ARBShaderObjects.glUniform1iARB(maskUniform, ConfigHandler.glSecondaryTextureUnit); ARBShaderObjects.glUniform1fARB(heightMatchUniform, heightMatch); - GL13.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB); + OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB); } }; static boolean boundStencil = false;