From ef46e5acbff1ab5581bc3d1d66b730bbffa966ca Mon Sep 17 00:00:00 2001
From: Jozufozu <jozsefaug@gmail.com>
Date: Wed, 14 Jul 2021 15:47:44 -0700
Subject: [PATCH] Fix gl error spam

 - CrumblingProgram was trying to upload a uniform before the location was queried.
 - Adjust WorldProgram init to mitigate this in the future.
---
 .../jozufozu/flywheel/core/crumbling/CrumblingProgram.java  | 6 ------
 .../com/jozufozu/flywheel/core/shader/WorldProgram.java     | 5 +++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingProgram.java b/src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingProgram.java
index cafe62259..d7e4514ec 100644
--- a/src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingProgram.java
+++ b/src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingProgram.java
@@ -25,12 +25,6 @@ public class CrumblingProgram extends WorldProgram {
 		uTextureScale = getUniformLocation("uTextureScale");
 	}
 
-	@Override
-	public void bind() {
-		super.bind();
-		setDefaultAtlasSize();
-	}
-
 	@Override
 	protected void registerSamplers() {
 		super.registerSamplers();
diff --git a/src/main/java/com/jozufozu/flywheel/core/shader/WorldProgram.java b/src/main/java/com/jozufozu/flywheel/core/shader/WorldProgram.java
index 70200ec58..b3a6b9868 100644
--- a/src/main/java/com/jozufozu/flywheel/core/shader/WorldProgram.java
+++ b/src/main/java/com/jozufozu/flywheel/core/shader/WorldProgram.java
@@ -5,6 +5,7 @@ import static org.lwjgl.opengl.GL20.glUniform3f;
 
 import java.util.List;
 
+import com.jozufozu.flywheel.backend.gl.shader.GlProgram;
 import com.jozufozu.flywheel.backend.loading.Program;
 import com.jozufozu.flywheel.core.shader.extension.IProgramExtension;
 import com.jozufozu.flywheel.util.AnimationTickHolder;
@@ -25,9 +26,9 @@ public class WorldProgram extends ExtensibleGlProgram {
 		uViewProjection = getUniformLocation("uViewProjection");
 		uCameraPos = getUniformLocation("uCameraPos");
 
-		bind();
+		super.bind();
 		registerSamplers();
-		unbind();
+		super.unbind();
 	}
 
 	protected void registerSamplers() {