backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 07:07:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #236 from MatthewBeshay/fix/linux-iggy-ui-gl-state
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details

Browse source 
Restore Linux fixed-function GL state after Iggy UI
This commit is contained in:
Tropical 2026-03-14 15:05:12 -05:00 committed by GitHub
parent 89e87d874b be3d53f101
commit e45d3cb587
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Minecraft.Client/Platform/Linux/Linux_UIController.cpp
View file

@ -12,6 +12,32 @@
ConsoleUIController ui; ConsoleUIController ui;
static void restoreFixedFunctionStateAfterIggy() {
glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
glEnable(GL_ALPHA_TEST);
glAlphaFunc(GL_GREATER, 0.1f);
glEnable(GL_DEPTH_TEST);
glDepthFunc(GL_LEQUAL);
glEnable(GL_CULL_FACE);
glCullFace(GL_BACK);
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) { void ConsoleUIController::init(S32 w, S32 h) {
#ifdef _ENABLEIGGY #ifdef _ENABLEIGGY
// Shared init // Shared init
@ -49,6 +75,7 @@ void ConsoleUIController::render() {
renderScenes(); renderScenes();
gdraw_GL_NoMoreGDrawThisFrame(); gdraw_GL_NoMoreGDrawThisFrame();
restoreFixedFunctionStateAfterIggy();
#endif #endif
} }