From 307212f4cd84512e33f9c3bdac4e304e2c2c89c7 Mon Sep 17 00:00:00 2001
From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com>
Date: Sun, 15 Mar 2026 05:42:14 +1100
Subject: [PATCH 1/2] Restore Linux fixed-function GL state after Iggy UI

---
 .../Platform/Linux/Linux_UIController.cpp     | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/Minecraft.Client/Platform/Linux/Linux_UIController.cpp b/Minecraft.Client/Platform/Linux/Linux_UIController.cpp
index 4a3080b59..7df76900e 100644
--- a/Minecraft.Client/Platform/Linux/Linux_UIController.cpp
+++ b/Minecraft.Client/Platform/Linux/Linux_UIController.cpp
@@ -12,6 +12,43 @@
 
 ConsoleUIController ui;
 
+static void restoreFixedFunctionStateAfterIggy() {
+    glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+    glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+    glDepthMask(GL_TRUE);
+
+    glDisable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glEnable(GL_ALPHA_TEST);
+    glAlphaFunc(GL_GREATER, 0.1f);
+    glEnable(GL_DEPTH_TEST);
+    glDepthFunc(GL_LEQUAL);
+    glEnable(GL_CULL_FACE);
+    glCullFace(GL_BACK);
+    glDisable(GL_STENCIL_TEST);
+    glDisable(GL_SCISSOR_TEST);
+    glDisable(GL_LIGHTING);
+    glEnable(GL_COLOR_MATERIAL);
+    glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
+    glShadeModel(GL_SMOOTH);
+
+    glClientActiveTexture(GL_TEXTURE1);
+    glActiveTexture(GL_TEXTURE1);
+    glDisable(GL_TEXTURE_2D);
+    glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+    glMatrixMode(GL_TEXTURE);
+    glLoadIdentity();
+
+    glClientActiveTexture(GL_TEXTURE0);
+    glActiveTexture(GL_TEXTURE0);
+    glEnable(GL_TEXTURE_2D);
+    glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+    glMatrixMode(GL_TEXTURE);
+    glLoadIdentity();
+
+    glMatrixMode(GL_MODELVIEW);
+}
+
 void ConsoleUIController::init(S32 w, S32 h) {
 #ifdef _ENABLEIGGY
     // Shared init
@@ -49,6 +86,7 @@ void ConsoleUIController::render() {
     renderScenes();
 
     gdraw_GL_NoMoreGDrawThisFrame();
+    restoreFixedFunctionStateAfterIggy();
 #endif
 }
 

From be3d53f10183e1091916b2a92f76555feee3a839 Mon Sep 17 00:00:00 2001
From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com>
Date: Sun, 15 Mar 2026 06:52:46 +1100
Subject: [PATCH 2/2] Trim Linux Iggy GL reset from tropicaaal and ffqq
 feedback

---
 .../Platform/Linux/Linux_UIController.cpp             | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/Minecraft.Client/Platform/Linux/Linux_UIController.cpp b/Minecraft.Client/Platform/Linux/Linux_UIController.cpp
index 7df76900e..78851ef7f 100644
--- a/Minecraft.Client/Platform/Linux/Linux_UIController.cpp
+++ b/Minecraft.Client/Platform/Linux/Linux_UIController.cpp
@@ -14,23 +14,12 @@ ConsoleUIController ui;
 
 static void restoreFixedFunctionStateAfterIggy() {
     glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-    glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-    glDepthMask(GL_TRUE);
-
-    glDisable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     glEnable(GL_ALPHA_TEST);
     glAlphaFunc(GL_GREATER, 0.1f);
     glEnable(GL_DEPTH_TEST);
     glDepthFunc(GL_LEQUAL);
     glEnable(GL_CULL_FACE);
     glCullFace(GL_BACK);
-    glDisable(GL_STENCIL_TEST);
-    glDisable(GL_SCISSOR_TEST);
-    glDisable(GL_LIGHTING);
-    glEnable(GL_COLOR_MATERIAL);
-    glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
-    glShadeModel(GL_SMOOTH);
 
     glClientActiveTexture(GL_TEXTURE1);
     glActiveTexture(GL_TEXTURE1);