moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-01 23:35:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove RPi hacks that are not necessary on SDL 2.0.11

Browse Source
This commit is contained in:
Cameron Gutman 2020-02-24 19:55:16 -08:00
parent 489891ff3c
commit 9f41e98e3f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/main.cpp
View File

@ -314,7 +314,7 @@ int main(int argc, char *argv[])
if (!QFile("/dev/dri").exists()) { if (!QFile("/dev/dri").exists()) {
qWarning() << "Unable to find a KMSDRM display device!"; qWarning() << "Unable to find a KMSDRM display device!";
qWarning() << "On Raspberry Pi 2 and 3, you must enable the 'fake KMS' driver in raspi-config to use Moonlight outside of the GUI environment."; qWarning() << "On the Raspberry Pi, you must enable the 'fake KMS' driver in raspi-config to use Moonlight outside of the GUI environment.";
} }
} }
#endif #endif
@ -435,10 +435,10 @@ int main(int argc, char *argv[])
// Move the mouse to the bottom right so it's invisible when using // Move the mouse to the bottom right so it's invisible when using
// gamepad-only navigation. // gamepad-only navigation.
QCursor().setPos(0xFFFF, 0xFFFF); QCursor().setPos(0xFFFF, 0xFFFF);
#elif defined(Q_OS_LINUX) && (defined(__arm__) || defined(__aarch64__)) #elif !SDL_VERSION_ATLEAST(2, 0, 11) && defined(Q_OS_LINUX) && (defined(__arm__) || defined(__aarch64__))
if (qgetenv("SDL_VIDEO_GL_DRIVER").isEmpty() && QGuiApplication::platformName() == "eglfs") { if (qgetenv("SDL_VIDEO_GL_DRIVER").isEmpty() && QGuiApplication::platformName() == "eglfs") {
// Look for Raspberry Pi GLES libraries. SDL needs some help finding the correct // Look for Raspberry Pi GLES libraries. SDL 2.0.10 and earlier needs some help finding
// libraries for the KMSDRM backend if not compiled with the RPI backend enabled. // the correct libraries for the KMSDRM backend if not compiled with the RPI backend enabled.
if (SDL_LoadObject("libbrcmGLESv2.so") != nullptr) { if (SDL_LoadObject("libbrcmGLESv2.so") != nullptr) {
qputenv("SDL_VIDEO_GL_DRIVER", "libbrcmGLESv2.so"); qputenv("SDL_VIDEO_GL_DRIVER", "libbrcmGLESv2.so");
} }

2
app/streaming/session.cpp
View File

@ -462,6 +462,7 @@ bool Session::initialize()
break; break;
} }
#if !SDL_VERSION_ATLEAST(2, 0, 11)
// HACK: Using a full-screen window breaks mouse capture on the Pi's LXDE // HACK: Using a full-screen window breaks mouse capture on the Pi's LXDE
// GUI environment. Force the session to use windowed mode (which won't // GUI environment. Force the session to use windowed mode (which won't
// really matter anyway because the MMAL renderer always draws full-screen). // really matter anyway because the MMAL renderer always draws full-screen).
@ -470,6 +471,7 @@ bool Session::initialize()
"Forcing windowed mode on LXDE-Pi"); "Forcing windowed mode on LXDE-Pi");
m_FullScreenFlag = 0; m_FullScreenFlag = 0;
} }
#endif
// Check for validation errors/warnings and emit // Check for validation errors/warnings and emit
// signals for them, if appropriate // signals for them, if appropriate