Remove unnecessary multi-texturing to keep state management simple. (#258)

Author: shartte

earlydisplay/src/main/java/net/neoforged/fml/earlydisplay/DisplayWindow.java

@@ -224,7 +224,7 @@ private void initRender(final @Nullable String mcVersion, final String forgeVers
         this.context = new RenderElement.DisplayContext(854, 480, fbScale, elementShader, colourScheme, performanceInfo);
         framebuffer = new EarlyFramebuffer(this.context);
         try {
-            this.font = new SimpleFont("Monocraft.ttf", fbScale, 200000, 1 + RenderElement.INDEX_TEXTURE_OFFSET);
+            this.font = new SimpleFont("Monocraft.ttf", fbScale, 200000);
         } catch (Throwable t) {
             LOGGER.error("Crash during font initialization", t);
             crashElegantly("An error occurred initializing a font for rendering. " + t.getMessage());

earlydisplay/src/main/java/net/neoforged/fml/earlydisplay/RenderElement.java

@@ -15,7 +15,6 @@
 import net.neoforged.fml.loading.progress.StartupNotificationManager;
 
 public class RenderElement {
-    static final int INDEX_TEXTURE_OFFSET = 5;
     private final SimpleBufferBuilder bb;
     private final Renderer renderer;
     static int globalAlpha = 255;
@@ -247,7 +246,8 @@ private static Initializer initializeText(SimpleFont font, TextGenerator textGen
     }
 
     private static void renderText(final SimpleFont font, final TextGenerator textGenerator, final SimpleBufferBuilder bb, final DisplayContext context) {
-        context.elementShader().updateTextureUniform(font.textureNumber());
+        GlState.activeTexture(GL_TEXTURE0);
+        GlState.bindTexture2D(font.textureId());
         context.elementShader().updateRenderTypeUniform(ElementShader.RenderType.FONT);
         bb.begin(SimpleBufferBuilder.Format.POS_TEX_COLOR, SimpleBufferBuilder.Mode.QUADS);
         textGenerator.accept(bb, font, context);
@@ -260,11 +260,12 @@ private static TextGenerator text(int x, int y, String text, int colour) {
 
     private static Initializer initializeTexture(final String textureFileName, int size, int textureNumber, TextureRenderer positionAndColour) {
         return () -> {
-            int[] imgSize = STBHelper.loadTextureFromClasspath(textureFileName, size, GL_TEXTURE0 + textureNumber + INDEX_TEXTURE_OFFSET);
+            var texture = STBHelper.loadTextureFromClasspath(textureFileName, size);
             return (bb, ctx, frame) -> {
-                ctx.elementShader().updateTextureUniform(textureNumber + INDEX_TEXTURE_OFFSET);
+                GlState.activeTexture(GL_TEXTURE0);
+                GlState.bindTexture2D(texture.textureId());
                 ctx.elementShader().updateRenderTypeUniform(ElementShader.RenderType.TEXTURE);
-                renderTexture(bb, ctx, frame, imgSize, positionAndColour);
+                renderTexture(bb, ctx, frame, texture.size(), positionAndColour);
             };
         };
     }
@@ -279,15 +280,15 @@ public static float clamp(float num, float min, float max) {
         if (num < min) {
             return min;
         } else {
-            return num > max ? max : num;
+            return Math.min(num, max);
         }
     }
 
     public static int clamp(int num, int min, int max) {
         if (num < min) {
             return min;
         } else {
-            return num > max ? max : num;
+            return Math.min(num, max);
         }
     }
 

earlydisplay/src/main/java/net/neoforged/fml/earlydisplay/STBHelper.java

@@ -39,13 +39,13 @@ public static ByteBuffer readFromClasspath(final String name, int initialCapacit
         return MemoryUtil.memSlice(buf); // we trim the final buffer to the size of the content
     }
 
-    public static int[] loadTextureFromClasspath(String file, int size, int textureNumber) {
+    public static ImageTexture loadTextureFromClasspath(String file, int size) {
         int[] lw = new int[1];
         int[] lh = new int[1];
         int[] lc = new int[1];
         var img = loadImageFromClasspath(file, size, lw, lh, lc);
         var texid = glGenTextures();
-        GlState.activeTexture(textureNumber);
+        GlState.activeTexture(GL_TEXTURE0);
         GlState.bindTexture2D(texid);
         GlDebug.labelTexture(texid, "EarlyDisplay " + file);
 //        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ -55,9 +55,13 @@ public static int[] loadTextureFromClasspath(String file, int size, int textureN
         glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, lw[0], lh[0], 0, GL_RGBA, GL_UNSIGNED_BYTE, img);
         GlState.activeTexture(GL_TEXTURE0);
         MemoryUtil.memFree(img);
-        return new int[] { lw[0], lh[0] };
+        return new ImageTexture(
+                texid,
+                new int[] { lw[0], lh[0] });
     }
 
+    public record ImageTexture(int textureId, int[] size) {}
+
     public static ByteBuffer loadImageFromClasspath(String file, int size, int[] width, int[] height, int[] channels) {
         ByteBuffer buf = STBHelper.readFromClasspath(file, size);
         return STBImage.stbi_load_from_memory(buf, width, height, channels, 4);

earlydisplay/src/main/java/net/neoforged/fml/earlydisplay/SimpleFont.java

@@ -19,7 +19,7 @@
 import org.lwjgl.stb.STBTTPackedchar;
 
 public class SimpleFont {
-    private final int textureNumber;
+    private final int textureId;
     private final int lineSpacing;
     private final int descent;
     private final int GLYPH_COUNT = 127 - 32;
@@ -42,7 +42,7 @@ Pos loadQuad(Pos pos, int colour, SimpleBufferBuilder bb) {
     /**
      * Build the font and store it in the textureNumber location
      */
-    public SimpleFont(String fontName, int scale, int bufferSize, int textureNumber) {
+    public SimpleFont(String fontName, int scale, int bufferSize) {
         ByteBuffer buf = STBHelper.readFromClasspath(fontName, bufferSize);
         var info = STBTTFontinfo.create();
         if (!stbtt_InitFont(info, buf)) {
@@ -56,10 +56,10 @@ public SimpleFont(String fontName, int scale, int bufferSize, int textureNumber)
         stbtt_GetScaledFontVMetrics(buf, 0, fontSize, ascent, descent, lineGap);
         this.lineSpacing = (int) (ascent[0] - descent[0] + lineGap[0]);
         this.descent = (int) Math.floor(descent[0]);
-        int fontTextureId = glGenTextures();
-        GlState.activeTexture(GL_TEXTURE0 + textureNumber);
-        this.textureNumber = textureNumber;
-        GlState.bindTexture2D(fontTextureId);
+        this.textureId = glGenTextures();
+        GlState.activeTexture(GL_TEXTURE0);
+        GlState.bindTexture2D(this.textureId);
+        GlDebug.labelTexture(this.textureId, "font texture " + fontName);
         try (var packedchars = STBTTPackedchar.malloc(GLYPH_COUNT)) {
             int texwidth = 256;
             int texheight = 128;
@@ -83,7 +83,6 @@ public SimpleFont(String fontName, int scale, int bufferSize, int textureNumber)
                     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
                 }
             }
-            GlState.activeTexture(GL_TEXTURE0);
             try (var q = STBTTAlignedQuad.malloc()) {
                 float[] x = new float[1];
                 float[] y = new float[1];
@@ -103,8 +102,8 @@ int lineSpacing() {
         return lineSpacing;
     }
 
-    int textureNumber() {
-        return textureNumber;
+    int textureId() {
+        return textureId;
     }
 
     int descent() {