diff --git a/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java b/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java index 4bab4f717..906450a57 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java @@ -248,7 +248,7 @@ public class BatchingFontRenderer { batchCommands.sort(FontDrawCmd.DRAW_ORDER_COMPARATOR); final boolean isTextureEnabledBefore = GLStateManager.glIsEnabled(GL11.GL_TEXTURE_2D); - final int boundTextureBefore = GLStateManager.getBoundTexture(); + final int boundTextureBefore = GLStateManager.glGetInteger(GL11.GL_TEXTURE_BINDING_2D); boolean textureChanged = false; ResourceLocation lastTexture = DUMMY_RESOURCE_LOCATION; @@ -265,7 +265,7 @@ public class BatchingFontRenderer { glEnableClientState(GL_COLOR_ARRAY); glVertexPointer(2, 0, batchVtxPositions); glEnableClientState(GL_VERTEX_ARRAY); - glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + GLStateManager.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); // Use plain for loop to avoid allocations final FontDrawCmd[] cmdsData = batchCommands.elements(); @@ -274,9 +274,9 @@ public class BatchingFontRenderer { final FontDrawCmd cmd = cmdsData[i]; if (!Objects.equals(lastTexture, cmd.texture)) { if (lastTexture == null) { - GLStateManager.enableTexture(); + GLStateManager.glEnable(GL11.GL_TEXTURE_2D); } else if (cmd.texture == null) { - GLStateManager.disableTexture(); + GLStateManager.glDisable(GL11.GL_TEXTURE_2D); } if (cmd.texture != null) { ((FontRendererAccessor) underlying).angelica$bindTexture(cmd.texture); @@ -292,7 +292,7 @@ public class BatchingFontRenderer { glPopClientAttrib(); if (isTextureEnabledBefore) { - GLStateManager.enableTexture(); + GLStateManager.glEnable(GL11.GL_TEXTURE_2D); } if (textureChanged) { GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, boundTextureBefore); diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java index f1f9e2afc..6b792c8d9 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java @@ -74,6 +74,7 @@ import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER; public class GLStateManager { public static ContextCapabilities capabilities; + @Getter protected static boolean poppingAttributes; public static boolean BYPASS_CACHE = Boolean.parseBoolean(System.getProperty("angelica.disableGlCache", "false")); public static final int MAX_ATTRIB_STACK_DEPTH = GL11.glGetInteger(GL11.GL_MAX_ATTRIB_STACK_DEPTH); public static final int MAX_MODELVIEW_STACK_DEPTH = GL11.glGetInteger(GL11.GL_MAX_MODELVIEW_STACK_DEPTH); @@ -83,6 +84,11 @@ public class GLStateManager { public static final GLFeatureSet HAS_MULTIPLE_SET = new GLFeatureSet(); + @Getter protected static boolean NVIDIA; + @Getter protected static boolean AMD; + @Getter protected static boolean INTEL; + @Getter protected static boolean MESA; + // GLStateManager State Trackers private static final IntStack attribs = new IntArrayList(MAX_ATTRIB_STACK_DEPTH); protected static final IntegerStateStack activeTextureUnit = new IntegerStateStack(); @@ -131,7 +137,7 @@ public class GLStateManager { // Thread Checking @Getter private static final Thread MainThread = Thread.currentThread(); private static Thread CurrentThread = MainThread; - @Setter @Getter private static boolean runningSplash = false; + @Setter @Getter private static boolean runningSplash = true; private static int glListMode = 0; private static int glListId = -1; @@ -177,6 +183,18 @@ public class GLStateManager { .addFeature(GL11.GL_TEXTURE_ENV_COLOR) .addFeature(GL11.GL_TEXTURE_MATRIX) .addFeature(GL11.GL_VIEWPORT); + + String glVendor = GL11.glGetString(GL11.GL_VENDOR); + NVIDIA = glVendor.toLowerCase().contains("nvidia"); + AMD = glVendor.toLowerCase().contains("ati") || glVendor.toLowerCase().contains("amd"); + INTEL = glVendor.toLowerCase().contains("intel"); + MESA = glVendor.toLowerCase().contains("mesa"); + + if(AMD) { + // AMD Drivers seem to default to 0 for the matrix mode, so we need to set it to the default + GL11.glMatrixMode(GL11.GL_MODELVIEW); + } + } public static void init() { @@ -249,6 +267,9 @@ public class GLStateManager { } public static boolean glIsEnabled(int cap) { + if(shouldBypassCache()) { + return GL11.glIsEnabled(cap); + } return switch (cap) { case GL11.GL_ALPHA_TEST -> alphaTest.isEnabled(); case GL11.GL_BLEND -> blendMode.isEnabled(); @@ -493,7 +514,7 @@ public class GLStateManager { } } - if (mask != depthState.isEnabled()) { + if (shouldBypassCache() || mask != depthState.isEnabled()) { depthState.setEnabled(mask); GL11.glDepthMask(mask); } @@ -725,7 +746,6 @@ public class GLStateManager { public static void glDeleteTextures(int id) { onDeleteTexture(id); - textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.getValue()).setBinding(-1); GL11.glDeleteTextures(id); } @@ -734,7 +754,6 @@ public class GLStateManager { onDeleteTexture(ids.get(i)); } - textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.getValue()).setBinding(-1); GL11.glDeleteTextures(ids); } @@ -976,6 +995,12 @@ public class GLStateManager { if (AngelicaConfig.enableIris) { PBRTextureManager.INSTANCE.onDeleteTexture(id); } + + for(int i = 0; i < GLStateManager.MAX_TEXTURE_UNITS; i++) { + if(textures.getTextureUnitBindings(i).getBinding() == id) { + textures.getTextureUnitBindings(i).setBinding(0); + } + } } public static void makeCurrent(Drawable drawable) throws LWJGLException { @@ -1068,8 +1093,10 @@ public class GLStateManager { } public static void glPopAttrib() { + poppingAttributes = true; popState(); GL11.glPopAttrib(); + poppingAttributes = false; } // Matrix Operations @@ -1377,5 +1404,7 @@ public class GLStateManager { GL11.glColorMaterial(face, mode); } - + public static void glDepthRange(double near, double far) { + GL11.glDepthRange(near, far); + } } diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/RenderSystem.java b/src/main/java/com/gtnewhorizons/angelica/glsm/RenderSystem.java index 87b49589c..c7e534dfa 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/RenderSystem.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/RenderSystem.java @@ -4,6 +4,8 @@ import com.gtnewhorizons.angelica.glsm.dsa.DSAARB; import com.gtnewhorizons.angelica.glsm.dsa.DSAAccess; import com.gtnewhorizons.angelica.glsm.dsa.DSACore; import com.gtnewhorizons.angelica.glsm.dsa.DSAUnsupported; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.Nullable; import org.joml.Matrix4f; import org.joml.Vector3i; @@ -21,12 +23,12 @@ import java.nio.ByteBuffer; import java.nio.FloatBuffer; import java.nio.IntBuffer; -import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER; /** * This class is responsible for abstracting calls to OpenGL and asserting that calls are run on the render thread. */ public class RenderSystem { + private static final Logger LOGGER = LogManager.getLogger("RenderSystem"); private static DSAAccess dsaState; private static boolean hasMultibind; private static boolean supportsCompute; @@ -50,6 +52,7 @@ public class RenderSystem { } catch (NoSuchFieldError ignored) {} if (dsaState == null) { dsaState = new DSAUnsupported(); + LOGGER.info("No DSA support detected, falling back to legacy OpenGL."); } try { diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/stacks/BooleanStateStack.java b/src/main/java/com/gtnewhorizons/angelica/glsm/stacks/BooleanStateStack.java index c50df6280..91ce0d8a8 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/stacks/BooleanStateStack.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/stacks/BooleanStateStack.java @@ -32,6 +32,7 @@ public class BooleanStateStack extends BooleanState implements IStateStack { - private final int glCap; + protected final int glCap; - @Getter - private boolean enabled; + @Getter protected boolean enabled; public BooleanState(int glCap) { this.glCap = glCap; @@ -23,7 +22,7 @@ public class BooleanState implements ISettableState { } public void setEnabled(boolean enabled) { - if (GLStateManager.shouldBypassCache() || enabled != this.enabled) { + if (GLStateManager.shouldBypassCache() || enabled != this.enabled || (this.glCap == GL11.GL_BLEND && GLStateManager.isAMD() && GLStateManager.isPoppingAttributes())) { this.enabled = enabled; if (enabled) { GL11.glEnable(this.glCap); diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index a363d26e8..3e73f9aad 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -18,7 +18,6 @@ public enum Mixins { ANGELICA_STARTUP(new Builder("Angelica Startup").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) .setPhase(Phase.EARLY).addMixinClasses( "angelica.startup.MixinInitGLStateManager" - ,"angelica.startup.MixinSplashProgress" ) ), diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/startup/MixinSplashProgress.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/startup/MixinSplashProgress.java deleted file mode 100644 index 6ea598e02..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/startup/MixinSplashProgress.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.gtnewhorizons.angelica.mixins.early.angelica.startup; - -import com.gtnewhorizons.angelica.glsm.GLStateManager; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(targets="cpw/mods/fml/client/SplashProgress$3", remap = false) -public abstract class MixinSplashProgress { - @Inject(method = "setGL", at = @At(value = "INVOKE", target = "Ljava/util/concurrent/locks/Lock;lock()V", shift = At.Shift.AFTER)) - private void angelica$startSplash(CallbackInfo ci) { - GLStateManager.setRunningSplash(true); - } - -} diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java b/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java index fef9d5d8b..74f344785 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java @@ -121,6 +121,7 @@ public class RedirectorTransformer implements IClassTransformer { .add("glDeleteTextures") .add("glDepthFunc") .add("glDepthMask") + .add("glDepthRange") .add("glDrawArrays") .add("glDrawBuffer") .add("glEdgeFlag") diff --git a/src/test/java/com/gtnewhorizons/angelica/AngelicaExtension.java b/src/test/java/com/gtnewhorizons/angelica/AngelicaExtension.java index 041ad98e8..047450ac1 100644 --- a/src/test/java/com/gtnewhorizons/angelica/AngelicaExtension.java +++ b/src/test/java/com/gtnewhorizons/angelica/AngelicaExtension.java @@ -1,7 +1,7 @@ package com.gtnewhorizons.angelica; import com.gtnewhorizons.angelica.glsm.GLStateManager; -import org.junit.jupiter.api.extension.AfterAllCallback; +import com.gtnewhorizons.angelica.glsm.RenderSystem; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.ExtensionContext; @@ -22,11 +22,6 @@ public class AngelicaExtension implements BeforeAllCallback, AfterEachCallback, public static String glRenderer; public static String glVersion; - public static boolean NVIDIA; - public static boolean AMD; - public static boolean INTEL; - public static boolean MESA; - @Override public void beforeAll(ExtensionContext context) throws LWJGLException { if (!started) { @@ -41,6 +36,9 @@ public class AngelicaExtension implements BeforeAllCallback, AfterEachCallback, // Warm-up State Manager features GLStateManager.preInit(); + GLStateManager.setRunningSplash(false); // So we don't bypass the cache + GLStateManager.BYPASS_CACHE = false; // Just to be sure + RenderSystem.initRenderer(); context.getRoot().getStore(GLOBAL).put("AngelicaExtension", this); glVendor = GL11.glGetString(GL11.GL_VENDOR); glRenderer = GL11.glGetString(GL11.GL_RENDERER); @@ -49,11 +47,6 @@ public class AngelicaExtension implements BeforeAllCallback, AfterEachCallback, System.out.println("OpenGL Vendor: " + glVendor); System.out.println("OpenGL Renderer: " + glRenderer); System.out.println("OpenGL Version: " + glVersion); - - NVIDIA = glVendor.toLowerCase().contains("nvidia"); - AMD = glVendor.toLowerCase().contains("ati") || glVendor.toLowerCase().contains("amd"); - INTEL = glVendor.toLowerCase().contains("intel"); - MESA = glVendor.toLowerCase().contains("mesa"); } } diff --git a/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_PushPop_UnitTest.java b/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_PushPop_UnitTest.java index b2ae2c1c2..6217b9674 100644 --- a/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_PushPop_UnitTest.java +++ b/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_PushPop_UnitTest.java @@ -205,7 +205,7 @@ class GLSM_PushPop_UnitTest { bits.add(new GLBit(GL11.GL_DITHER, "Dither", true)); bits.add(new GLBit(GL11.GL_FOG, "Fog", false)); // This fails on the RESET test in xvfb - if(!(AngelicaExtension.MESA || AngelicaExtension.AMD)) { + if(!(GLStateManager.MESA || GLStateManager.AMD)) { for(i = 0 ; i < GL11.glGetInteger(GL11.GL_MAX_LIGHTS) ; i++) { bits.add(new GLBit(GL11.GL_LIGHT0 + i, "Light " + i, false)); } @@ -236,7 +236,7 @@ class GLSM_PushPop_UnitTest { bits.add(new GLBit(GL11.GL_MAP2_TEXTURE_COORD_3, "Map2 Texture Coord 3", false)); bits.add(new GLBit(GL11.GL_MAP2_TEXTURE_COORD_4, "Map2 Texture Coord 4", false)); // Seems to be broken at least on Nvidia - if(!AngelicaExtension.NVIDIA) bits.add(new GLBit(GL13.GL_MULTISAMPLE, "Multisample", true)); + if(!GLStateManager.NVIDIA) bits.add(new GLBit(GL13.GL_MULTISAMPLE, "Multisample", true)); bits.add(new GLBit(GL11.GL_NORMALIZE, "Normalize", false)); bits.add(new GLBit(GL11.GL_POINT_SMOOTH, "Point Smooth", false)); bits.add(new GLBit(GL11.GL_POLYGON_OFFSET_LINE, "Polygon Offset Line", false)); @@ -285,7 +285,7 @@ class GLSM_PushPop_UnitTest { GLStateManager.glFogf(GL11.GL_FOG_END, 0.5f); GLStateManager.glFogf(GL11.GL_FOG_START, 0.5f); GLStateManager.glFogf(GL11.GL_FOG_MODE, GL11.GL_LINEAR); - if(!AngelicaExtension.NVIDIA) GLStateManager.glFogf(GL11.GL_FOG_INDEX, 1f); + if(!GLStateManager.NVIDIA) GLStateManager.glFogf(GL11.GL_FOG_INDEX, 1f); verifyIsEnabled(GL11.GL_FOG, true, "Fog Enable"); verifyState(GL11.GL_FOG_COLOR, FLOAT_ARRAY_4_POINT_5, "Fog Color"); @@ -293,7 +293,7 @@ class GLSM_PushPop_UnitTest { verifyState(GL11.GL_FOG_END, 0.5f, "Fog End"); verifyState(GL11.GL_FOG_START, 0.5f, "Fog Start"); verifyState(GL11.GL_FOG_MODE, GL11.GL_LINEAR, "Fog Mode"); - if(!AngelicaExtension.NVIDIA) verifyState(GL11.GL_FOG_INDEX, 1f, "Fog Index"); + if(!GLStateManager.NVIDIA) verifyState(GL11.GL_FOG_INDEX, 1f, "Fog Index"); GLStateManager.glPopAttrib(); verifyIsEnabled(GL11.GL_FOG, false, "Fog Enable - Reset"); @@ -302,7 +302,7 @@ class GLSM_PushPop_UnitTest { verifyState(GL11.GL_FOG_END, 1f, "Fog End - Reset"); verifyState(GL11.GL_FOG_START, 0f, "Fog Start - Reset"); verifyState(GL11.GL_FOG_MODE, GL11.GL_EXP, "Fog Mode - Reset"); - if(!AngelicaExtension.NVIDIA) verifyState(GL11.GL_FOG_INDEX, 0f, "Fog Index - Reset"); + if(!GLStateManager.NVIDIA) verifyState(GL11.GL_FOG_INDEX, 0f, "Fog Index - Reset"); } @Test @@ -373,8 +373,135 @@ class GLSM_PushPop_UnitTest { verifyState(GL11.GL_SHADE_MODEL, GL11.GL_SMOOTH, "Shade Model - Reset"); bits.forEach(bit -> verifyState(bit.glEnum(), bit.initial(), bit.name() + " Reset State")); - - } + @Test + void testPushPopTextureBit() { + final ArrayList bits = new ArrayList<>(); + bits.add(new GLBit(GL11.GL_TEXTURE_GEN_S, "Texture Gen S", false)); + bits.add(new GLBit(GL11.GL_TEXTURE_GEN_T, "Texture Gen T", false)); + bits.add(new GLBit(GL11.GL_TEXTURE_GEN_R, "Texture Gen R", false)); + bits.add(new GLBit(GL11.GL_TEXTURE_GEN_Q, "Texture Gen Q", false)); + verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE0, "Initial Active Texture"); + verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Initial Texture Binding"); + + final int tex1 = GL11.glGenTextures(); + final int tex2 = GL11.glGenTextures(); + + GLStateManager.glPushAttrib(GL11.GL_TEXTURE_BIT); + GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, tex1); + verifyState(GL11.GL_TEXTURE_BINDING_2D, tex1, "Texture Binding - Unit 0"); + + GLStateManager.glActiveTexture(GL13.GL_TEXTURE1); + verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE1, "Active Texture"); + + verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding - Unit 1 - Switch"); + GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, tex2); + verifyState(GL11.GL_TEXTURE_BINDING_2D, tex2, "Texture Binding - Unit 1 - Set"); + + GLStateManager.glActiveTexture(GL13.GL_TEXTURE0); + verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE0, "Active Texture"); + verifyState(GL11.GL_TEXTURE_BINDING_2D, tex1, "Texture Binding - Unit 0"); + + GLStateManager.glActiveTexture(GL13.GL_TEXTURE1); + verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE1, "Active Texture"); + verifyState(GL11.GL_TEXTURE_BINDING_2D, tex2, "Texture Binding - Unit 1"); + + bits.forEach(bit -> { + verifyState(bit.glEnum(), bit.initial(), bit.name() + " Initial State"); + if(bit.initial()) { + GLStateManager.glDisable(bit.glEnum()); + } else { + GLStateManager.glEnable(bit.glEnum()); + } + verifyState(bit.glEnum(), !bit.initial(), bit.name() + " Toggle State"); + }); + + GLStateManager.glPopAttrib(); + verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE0, "Active Texture Unit 0 - Reset"); + verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding Unit 0 - Reset"); + GLStateManager.glActiveTexture(GL13.GL_TEXTURE1); + verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding Unit 1 - Reset"); + + bits.forEach(bit -> verifyState(bit.glEnum(), bit.initial(), bit.name() + " Reset State")); + + GLStateManager.glActiveTexture(GL13.GL_TEXTURE0); + GLStateManager.glDeleteTextures(tex1); + GLStateManager.glDeleteTextures(tex2); + } + + @Test + void testPushPopTextureBitMultiple() { + verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE0, "Initial Active Texture"); + verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Initial Texture Binding"); + + final int tex1 = GL11.glGenTextures(); + final int tex2 = GL11.glGenTextures(); + + GLStateManager.glPushAttrib(GL11.GL_TEXTURE_BIT); + GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, tex1); + GLStateManager.glActiveTexture(GL13.GL_TEXTURE1); + GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, tex1); + + GLStateManager.glPushAttrib(GL11.GL_TEXTURE_BIT); + verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE1, "Active Texture"); + verifyState(GL11.GL_TEXTURE_BINDING_2D, tex1, "Texture Binding - Unit 1"); + GLStateManager.glDeleteTextures(tex2); + verifyState(GL11.GL_TEXTURE_BINDING_2D, tex1, "Texture Binding - Unit 1"); + GLStateManager.glDeleteTextures(tex1); + verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding Deleted - Unit 1"); + GLStateManager.glActiveTexture(GL13.GL_TEXTURE0); + verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding Deleted - Unit 0"); + + GLStateManager.glPopAttrib(); + verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE1, "Active Texture - Reset 1"); + verifyState(GL11.GL_TEXTURE_BINDING_2D, tex1, "Texture Binding Deleted - Unit 1"); + GLStateManager.glDeleteTextures(tex1); + verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding Deleted - Unit 1"); + GLStateManager.glActiveTexture(GL13.GL_TEXTURE0); + verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding Deleted - Unit 0"); + + GLStateManager.glPopAttrib(); + verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE0, "Active Texture - Reset 2"); + verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding - Reset 2"); + } + + @Test + void testPushPopTransformBit() { + verifyState(GL11.GL_MATRIX_MODE, GL11.GL_MODELVIEW, "Initial Matrix Mode"); + verifyState(GL11.GL_NORMALIZE, false, "Initial Normalize"); + verifyState(GL12.GL_RESCALE_NORMAL, false, "Initial Rescale Normal"); + + GLStateManager.glPushAttrib(GL11.GL_TRANSFORM_BIT); + GLStateManager.glMatrixMode(GL11.GL_PROJECTION); + GLStateManager.glEnable(GL11.GL_NORMALIZE); + GLStateManager.glEnable(GL12.GL_RESCALE_NORMAL); + + verifyState(GL11.GL_MATRIX_MODE, GL11.GL_PROJECTION, "Matrix Mode"); + verifyState(GL11.GL_NORMALIZE, true, "Normalize"); + verifyState(GL12.GL_RESCALE_NORMAL, true, "Rescale Normal"); + + GLStateManager.glPopAttrib(); + verifyState(GL11.GL_MATRIX_MODE, GL11.GL_MODELVIEW, "Matrix Mode - Reset"); + verifyState(GL11.GL_NORMALIZE, false, "Normalize - Reset"); + verifyState(GL12.GL_RESCALE_NORMAL, false, "Rescale Normal - Reset"); + } + + @Test + void testPushPopViewportBit() { + GLStateManager.glViewport(0, 0, 800, 600); + verifyState(GL11.GL_VIEWPORT, new int[] { 0, 0, 800, 600 }, "Viewport - Initial"); + verifyState(GL11.GL_DEPTH_RANGE, new float[] { 0.0f, 1.0f }, "Depth Range - Initial"); + + GLStateManager.glPushAttrib(GL11.GL_VIEWPORT_BIT); + GLStateManager.glViewport(1, 1, 100, 100); + GLStateManager.glDepthRange(0.5, 1.0); + + verifyState(GL11.GL_VIEWPORT, new int[] { 1, 1, 100, 100 }, "Viewport"); + verifyState(GL11.GL_DEPTH_RANGE, new float[] { 0.5f, 1.0f }, "Depth Range"); + + GLStateManager.glPopAttrib(); + verifyState(GL11.GL_VIEWPORT, new int[] { 0, 0, 800, 600 }, "Viewport - Reset"); + verifyState(GL11.GL_DEPTH_RANGE, new float[] { 0.0f, 1.0f }, "Depth Range - Reset"); + } } diff --git a/src/test/java/com/gtnewhorizons/angelica/util/GLSMUtil.java b/src/test/java/com/gtnewhorizons/angelica/util/GLSMUtil.java index 36eac8a50..7c89218f3 100644 --- a/src/test/java/com/gtnewhorizons/angelica/util/GLSMUtil.java +++ b/src/test/java/com/gtnewhorizons/angelica/util/GLSMUtil.java @@ -6,6 +6,7 @@ import org.lwjgl.opengl.GL11; import java.nio.ByteBuffer; import java.nio.FloatBuffer; +import java.nio.IntBuffer; import java.util.stream.IntStream; import static org.junit.jupiter.api.Assertions.assertAll; @@ -55,6 +56,22 @@ public class GLSMUtil { () -> assertEquals(expected, GLStateManager.glGetFloat(glCap), 0.0001f, "GLSM State Mismatch") ); } + public static void verifyState(int glCap, int[] expected) { + verifyState(glCap, expected, "Int State Mismatch"); + } + + static final IntBuffer glIntBuffer = BufferUtils.createIntBuffer(16); + static final IntBuffer glsmIntBuffer = BufferUtils.createIntBuffer(16); + + public static void verifyState(int glCap, int[] expected, String message) { + GL11.glGetInteger(glCap, (IntBuffer) glIntBuffer.clear()); + GLStateManager.glGetInteger(glCap, (IntBuffer) glsmIntBuffer.clear()); + IntStream.range (0, expected.length).forEach(i -> assertAll(message, + () -> assertEquals(expected[i], glIntBuffer.get(i), "GL State Mismatch: " + i), + () -> assertEquals(expected[i], glsmIntBuffer.get(i), "GLSM State Mismatch: " + i) + )); + } + public static void verifyState(int glCap, float[] expected) { verifyState(glCap, expected, "Float State Mismatch");