GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Add command-line switches to force X11 and Wayland SDL drivers

Browse Source
This commit is contained in:
Ari Vuollet
2024-07-25 21:34:28 +03:00
committed by Ari Vuollet
parent f318d3aadc
commit 0e5e0169bf
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/Engine/CommandLine.cpp
View File

@@ -145,6 +145,12 @@ bool CommandLine::Parse(const Char* cmdLine)
PARSE_BOOL_SWITCH("-monolog ", MonoLog); PARSE_BOOL_SWITCH("-monolog ", MonoLog);
PARSE_BOOL_SWITCH("-mute ", Mute); PARSE_BOOL_SWITCH("-mute ", Mute);
PARSE_BOOL_SWITCH("-lowdpi ", LowDPI); PARSE_BOOL_SWITCH("-lowdpi ", LowDPI);
#if PLATFORM_LINUX && PLATFORM_SDL
PARSE_BOOL_SWITCH("-wayland ", Wayland);
PARSE_BOOL_SWITCH("-x11 ", X11);
#endif
#if USE_EDITOR #if USE_EDITOR
PARSE_BOOL_SWITCH("-clearcache ", ClearCache); PARSE_BOOL_SWITCH("-clearcache ", ClearCache);
PARSE_BOOL_SWITCH("-clearcooker ", ClearCookerCache); PARSE_BOOL_SWITCH("-clearcooker ", ClearCookerCache);

14
Source/Engine/Engine/CommandLine.h
View File

@@ -127,6 +127,20 @@ public:
/// </summary> /// </summary>
Nullable<bool> LowDPI; Nullable<bool> LowDPI;
#if PLATFORM_LINUX && PLATFORM_SDL
/// <summary>
/// -wayland (prefer Wayland over X11 as display server)
/// </summary>
Nullable<bool> Wayland;
/// <summary>
/// -x11 (prefer X11 over Wayland as display server)
/// </summary>
Nullable<bool> X11;
#endif
#if USE_EDITOR #if USE_EDITOR
/// <summary> /// <summary>
/// -project !path! (Startup project path) /// -project !path! (Startup project path)

2
Source/Engine/Platform/SDL/SDLPlatform.cpp
View File

@@ -102,6 +102,8 @@ void SDLPlatform::LogInfo()
LOG(Info, "Using SDL version {}.{}.{} ({}), runtime: {}.{}.{} ({})", LOG(Info, "Using SDL version {}.{}.{} ({}), runtime: {}.{}.{} ({})",
SDL_VERSIONNUM_MAJOR(SDL_VERSION), SDL_VERSIONNUM_MINOR(SDL_VERSION), SDL_VERSIONNUM_MICRO(SDL_VERSION), String(SDL_REVISION), SDL_VERSIONNUM_MAJOR(SDL_VERSION), SDL_VERSIONNUM_MINOR(SDL_VERSION), SDL_VERSIONNUM_MICRO(SDL_VERSION), String(SDL_REVISION),
SDL_VERSIONNUM_MAJOR(runtimeVersion), SDL_VERSIONNUM_MINOR(runtimeVersion), SDL_VERSIONNUM_MICRO(runtimeVersion), String(SDL_GetRevision())); SDL_VERSIONNUM_MAJOR(runtimeVersion), SDL_VERSIONNUM_MINOR(runtimeVersion), SDL_VERSIONNUM_MICRO(runtimeVersion), String(SDL_GetRevision()));
LOG(Info, "SDL video driver: {}", String(SDL_GetCurrentVideoDriver()));
} }
bool SDLPlatform::CheckWindowDragging(Window* window, WindowHitCodes hit) bool SDLPlatform::CheckWindowDragging(Window* window, WindowHitCodes hit)