Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-23 06:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NoGUI: Prefer SDL host interface over DRM/KMS if display present

Browse source
This commit is contained in:
Connor McLaughlin 2021-02-04 23:47:05 +10:00
parent 3e9fdf22bf
commit d0667ba32a
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/duckstation-nogui/main.cpp
View file

@ -14,6 +14,20 @@
#ifdef WITH_SDL2 #ifdef WITH_SDL2
#include "sdl_host_interface.h" #include "sdl_host_interface.h"
static bool IsSDLHostInterfaceAvailable()
{
#if defined(__linux__)
// Only available if we have a X11 or Wayland display.
if (std::getenv("DISPLAY") || std::getenv("WAYLAND_DISPLAY"))
return true;
else
return false;
#else
// Always available on Windows/Apple.
return true;
#endif
}
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
@ -22,19 +36,19 @@
#include <shellapi.h> #include <shellapi.h>
#endif #endif
static std::unique_ptr<NoGUIHostInterface> CreateHostInterface(const char* platform) static std::unique_ptr<NoGUIHostInterface> CreateHostInterface()
{ {
const char* platform = std::getenv("DUCKSTATION_NOGUI_PLATFORM");
std::unique_ptr<NoGUIHostInterface> host_interface; std::unique_ptr<NoGUIHostInterface> host_interface;
#ifdef USE_DRMKMS #ifdef WITH_SDL2
// TODO: We should detect if we have a display here... if (!host_interface && (!platform || StringUtil::Strcasecmp(platform, "sdl") == 0) && IsSDLHostInterfaceAvailable())
if (!host_interface && (!platform || StringUtil::Strcasecmp(platform, "drm") == 0)) host_interface = SDLHostInterface::Create();
host_interface = DRMHostInterface::Create();
#endif #endif
#ifdef WITH_SDL2 #ifdef USE_DRMKMS
if (!host_interface && (!platform || StringUtil::Strcasecmp(platform, "sdl") == 0)) if (!host_interface && (!platform || StringUtil::Strcasecmp(platform, "drm") == 0))
host_interface = SDLHostInterface::Create(); host_interface = DRMHostInterface::Create();
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
@ -76,7 +90,7 @@ static int Run(std::unique_ptr<NoGUIHostInterface> host_interface, std::unique_p
int wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nShowCmd) int wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nShowCmd)
{ {
std::unique_ptr<NoGUIHostInterface> host_interface = CreateHostInterface(nullptr); std::unique_ptr<NoGUIHostInterface> host_interface = CreateHostInterface();
std::unique_ptr<SystemBootParameters> boot_params; std::unique_ptr<SystemBootParameters> boot_params;
{ {
@ -118,7 +132,7 @@ int wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
std::unique_ptr<NoGUIHostInterface> host_interface = CreateHostInterface(nullptr); std::unique_ptr<NoGUIHostInterface> host_interface = CreateHostInterface();
std::unique_ptr<SystemBootParameters> boot_params; std::unique_ptr<SystemBootParameters> boot_params;
if (!host_interface->ParseCommandLineParameters(argc, argv, &boot_params)) if (!host_interface->ParseCommandLineParameters(argc, argv, &boot_params))
return EXIT_FAILURE; return EXIT_FAILURE;