Merge pull request #116 from jchung01/master

Remove usage of GLSM push/popAttrib
NovaEngineering-Source · Aug 29, 2024 · 6c95a12 · 6c95a12
2 parents f219a37 + 0086222
commit 6c95a12
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/com/cleanroommc/client/preview/renderer/scene/WorldSceneRenderer.java b/src/main/java/com/cleanroommc/client/preview/renderer/scene/WorldSceneRenderer.java
@@ -304,7 +304,7 @@ protected void setupCamera(PositionedRect positionedRect) {
         int width = positionedRect.getSize().width;
         int height = positionedRect.getSize().height;
 
-        GlStateManager.pushAttrib();
+        // GlStateManager.pushAttrib();
 
         Minecraft.getMinecraft().entityRenderer.disableLightmap();
         GlStateManager.disableLighting();
@@ -355,8 +355,9 @@ protected void resetCamera() {
         GlStateManager.enableBlend();
         GlStateManager.disableDepth();
 
-        //reset attributes
-        GlStateManager.popAttrib();
+        // TODO: Might need to properly reset remaining attributes?
+        // but this method shouldn't be used - see Forge#1637
+        // GlStateManager.popAttrib();
     }
 
     protected void drawWorld() {

diff --git a/src/main/java/kport/modularmagic/common/integration/jei/render/ConstellationRenderer.java b/src/main/java/kport/modularmagic/common/integration/jei/render/ConstellationRenderer.java
@@ -36,7 +36,6 @@ public void render(Minecraft minecraft, int xPosition, int yPosition, @Nullable
         }
 
         GlStateManager.pushMatrix();
-        GlStateManager.pushAttrib();
 
         texBlack.bind();
         drawRect(xPosition, yPosition, 58, 58);
@@ -67,7 +66,6 @@ public float getBrightness() {
             }, true, false);
         }
 
-        GlStateManager.popAttrib();
         GlStateManager.popMatrix();
     }