Bind the correct sampler for blit

Noxcrew · Nov 13, 2024 · b895419 · b895419
1 parent 59d6013
commit b895419
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/fabric/src/main/java/com/noxcrew/noxesium/feature/ui/render/DynamicElement.java b/fabric/src/main/java/com/noxcrew/noxesium/feature/ui/render/DynamicElement.java
@@ -280,6 +280,11 @@ public boolean changeFunc(int srcRgb, int dstRgb, int srcAlpha, int dstAlpha) {
         // If we are currently in a buffer with any custom blend
         // state we go back to a normal buffer!
         if (getBuffer(bufferIndex).getBlendState() != null && isNormal) {
+            // Re-enable blending and let it go through
+            SharedVertexBuffer.ignoreBlendStateHook = true;
+            GlStateManager._enableBlend();
+            SharedVertexBuffer.ignoreBlendStateHook = false;
+
             var buffer = getBuffer(elementsWereDrawn ? ++bufferIndex : bufferIndex);
             buffer.bind(guiGraphics);
             buffer.updateBlendState(null);
@@ -299,9 +304,11 @@ public boolean changeFunc(int srcRgb, int dstRgb, int srcAlpha, int dstAlpha) {
         if (elementsWereDrawn) allBuffersEmpty = false;
         elementsWereDrawn = false;
 
-        // Change the actual blending state to one that just copies directly to the buffer!
+        // Change the actual blending by disabling it completely which is slightly faster
+        // than using a different blending function that just copies it directly (which is
+        // what we want, we want to do the blending later)
         SharedVertexBuffer.ignoreBlendStateHook = true;
-        GlStateManager._blendFunc(GL14.GL_ONE, GL14.GL_ZERO);
+        GlStateManager._disableBlend();
         SharedVertexBuffer.ignoreBlendStateHook = false;
         return true;
     }

diff --git a/fabric/src/main/java/com/noxcrew/noxesium/feature/ui/render/SharedVertexBuffer.java b/fabric/src/main/java/com/noxcrew/noxesium/feature/ui/render/SharedVertexBuffer.java
@@ -116,7 +116,7 @@ public static void draw(List<BufferData> textureIds) {
 
                 // Change the current shader, bind the texture, and run it
                 shader = Objects.requireNonNull(RenderSystem.setShader(CoreShaders.BLIT_SCREEN), "Regular blit shader not loaded");
-                shader.bindSampler("SamplerIn", texture.textureId());
+                shader.bindSampler("InSampler", texture.textureId());
                 buffer.drawWithShader(NULL_MATRIX, NULL_MATRIX, shader);
 
                 // Set it back to the regular blending function