ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace most SDL_SetHint calls with SDL_SetHintWithPriority 

ensures calls actually do something and won't be ignored due to env vars
This commit is contained in:
CasualPokePlayer 2024-10-30 08:18:23 -07:00
parent 9f3630cbce
commit 6578c852a1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BizHawk.Bizware.Graphics/OpenGL/SDL2OpenGLContext.cs
View File

@ -29,7 +29,7 @@ namespace BizHawk.Bizware.Graphics
// make sure that Linux uses the x11 video driver
// we need this as mono winforms uses x11
// and the user could potentially try to force the wayland video driver via env vars
SDL_SetHint("SDL_VIDEODRIVER", "x11");
SDL_SetHintWithPriority("SDL_VIDEODRIVER", "x11", SDL_HintPriority.SDL_HINT_OVERRIDE);
// 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
@ -97,10 +97,10 @@ namespace BizHawk.Bizware.Graphics
// we will be turning a foreign window into an SDL window
// we need this so it knows that it is capable of using OpenGL functions
SDL_SetHint(SDL_HINT_VIDEO_FOREIGN_WINDOW_OPENGL, "1");
SDL_SetHintWithPriority(SDL_HINT_VIDEO_FOREIGN_WINDOW_OPENGL, "1", SDL_HintPriority.SDL_HINT_OVERRIDE);
// don't allow windows events to be pumped
// it's not needed and can be dangerous in some rare cases
SDL_SetHint(SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP, "0");
SDL_SetHintWithPriority(SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP, "0", SDL_HintPriority.SDL_HINT_OVERRIDE);
}
#if DEBUG_OPENGL

2
src/BizHawk.Bizware.Input/SDL2/SDL2InputAdapter.cs
View File

@ -37,7 +37,7 @@ namespace BizHawk.Bizware.Input
{
SDL_SetEventFilter(_sdlEventFilter, IntPtr.Zero);
// this is required as we create hidden (unfocused!) SDL windows in IGL backends
SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1");
SDL_SetHintWithPriority(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1", SDL_HintPriority.SDL_HINT_OVERRIDE);
}
private static void DoSDLEventLoop()

2
src/BizHawk.Client.EmuHawk/Program.cs
View File

@ -191,7 +191,7 @@ namespace BizHawk.Client.EmuHawk
// if this isn't done, SIGINT/SIGTERM get swallowed by SDL
if (OSTailoredCode.IsUnixHost)
{
SDL2.SDL.SDL_SetHint(SDL2.SDL.SDL_HINT_NO_SIGNAL_HANDLERS, "1");
SDL2.SDL.SDL_SetHintWithPriority(SDL2.SDL.SDL_HINT_NO_SIGNAL_HANDLERS, "1", SDL2.SDL.SDL_HintPriority.SDL_HINT_OVERRIDE);
}
var glInitCount = 0;