From dc582a4e7a1bc688a6eb6fdf8427fb9736bf10c9 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Fri, 13 Sep 2024 00:16:23 +1000 Subject: [PATCH] Skip setting `SDL_HINT_VIDEO_X11_FORCE_EGL` on NixOS again see 60fae3540, 08bd14e80, and 3b62a38f1 --- src/BizHawk.Bizware.Graphics/OpenGL/SDL2OpenGLContext.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/BizHawk.Bizware.Graphics/OpenGL/SDL2OpenGLContext.cs b/src/BizHawk.Bizware.Graphics/OpenGL/SDL2OpenGLContext.cs index 9157066ddb..5dbd09185a 100644 --- a/src/BizHawk.Bizware.Graphics/OpenGL/SDL2OpenGLContext.cs +++ b/src/BizHawk.Bizware.Graphics/OpenGL/SDL2OpenGLContext.cs @@ -1,5 +1,7 @@ // #define DEBUG_OPENGL +using System.IO; + #if DEBUG_OPENGL using System.Runtime.InteropServices; #endif @@ -31,7 +33,7 @@ namespace BizHawk.Bizware.Graphics // try to use EGL if it is available // GLX is the old API, and is the more or less "deprecated" at this point, and potentially more buggy with some drivers // we do need to a bit more work, in case EGL is not actually available or potentially doesn't have desktop GL support - SDL_SetHint(SDL_HINT_VIDEO_X11_FORCE_EGL, "1"); + if (!Directory.Exists("/nix")/* this is just for me --yoshi */) SDL_SetHint(SDL_HINT_VIDEO_X11_FORCE_EGL, "1"); } // init SDL video