From 444d4a94daf8c6ca20289902dfbc40c906d8e302 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 20 Oct 2025 20:39:13 -0400 Subject: [PATCH] Fix incorrect blend state for blur effects, followup to #10115 and fix for 10541 (#10678) --- .../blaze3d/platform/GlStateManager.java.patch | 12 ++++++++++++ .../client/renderer/GameRenderer.java.patch | 7 ++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/patches/minecraft/com/mojang/blaze3d/platform/GlStateManager.java.patch b/patches/minecraft/com/mojang/blaze3d/platform/GlStateManager.java.patch index c260d9bbe0..ed94583fd3 100644 --- a/patches/minecraft/com/mojang/blaze3d/platform/GlStateManager.java.patch +++ b/patches/minecraft/com/mojang/blaze3d/platform/GlStateManager.java.patch @@ -1,5 +1,17 @@ --- a/com/mojang/blaze3d/platform/GlStateManager.java +++ b/com/mojang/blaze3d/platform/GlStateManager.java +@@ -96,6 +_,11 @@ + BLEND.mode.enable(); + } + ++ public static boolean _getBlendState() { ++ RenderSystem.assertOnRenderThread(); ++ return BLEND.mode.enabled; ++ } ++ + public static void _blendFunc(int p_84329_, int p_84330_) { + RenderSystem.assertOnRenderThread(); + if (p_84329_ != BLEND.srcRgb || p_84330_ != BLEND.dstRgb) { @@ -493,9 +_,17 @@ } } diff --git a/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch index 3b3005e1ed..9acd256973 100644 --- a/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch @@ -9,15 +9,16 @@ } } -@@ -350,8 +_,11 @@ +@@ -350,8 +_,12 @@ public void processBlurEffect(float p_333718_) { float f = (float)this.minecraft.options.getMenuBackgroundBlurriness(); if (this.blurEffect != null && f >= 1.0F) { ++ boolean previousBlendState = GlStateManager._getBlendState(); + // FORGE: Blending the blur was removed in 1.21. This is necessary for screen layering to work properly. https://github.com/MinecraftForge/MinecraftForge/issues/10114 -+ RenderSystem.enableBlend(); ++ RenderSystem.disableBlend(); this.blurEffect.setUniform("Radius", f); this.blurEffect.process(p_333718_); -+ RenderSystem.disableBlend(); ++ if (previousBlendState) RenderSystem.enableBlend(); } }