moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-04-16 13:23:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use EGL_VENDOR instead of NV-CONTROL for Nvidia detection

Browse Source 
The latter will still match on a hybrid system when the iGPU's EGL
implementation is in use. This scenario works properly with EGL
rendering in Qt and SDL, so we want to allow that.
This commit is contained in:
Cameron Gutman
2025-12-06 11:07:52 -06:00
parent c92dc2495e
commit 9c6d2bab19
4 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/wm.cpp
View File

@@ -18,6 +18,10 @@
#include <xf86drmMode.h>
#endif
#ifdef HAVE_EGL
#include <EGL/egl.h>
#endif
#define VALUE_SET 0x01
#define VALUE_TRUE 0x02
@@ -42,43 +46,39 @@ bool WMUtils::isRunningX11()
}
return !!(val & VALUE_TRUE);
#endif
#else
return false;
#endif
}
bool WMUtils::isRunningX11NvidiaProprietaryDriver()
bool WMUtils::isRunningNvidiaProprietaryDriver()
{
#ifdef HAS_X11
static SDL_atomic_t isRunningOnX11NvidiaDriver;
#ifdef HAVE_EGL
static SDL_atomic_t isRunningOnNvidiaDriver;
// If the value is not set yet, populate it now.
int val = SDL_AtomicGet(&isRunningOnX11NvidiaDriver);
int val = SDL_AtomicGet(&isRunningOnNvidiaDriver);
if (!(val & VALUE_SET)) {
Display* display = XOpenDisplay(nullptr);
bool nvidiaDriver = false;
if (display != nullptr) {
int opcode, event, error;
// We use the presence of the NV-CONTROL extension to indicate
// that the Nvidia proprietary driver is in use on native X11
nvidiaDriver = XQueryExtension(display, "NV-CONTROL", &opcode, &event, &error);
XCloseDisplay(display);
EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
if (display != EGL_NO_DISPLAY && eglInitialize(display, nullptr, nullptr)) {
const char* vendorString = eglQueryString(display, EGL_VENDOR);
nvidiaDriver = vendorString && strstr(vendorString, "NVIDIA") != NULL;
eglTerminate(display);
}
// Populate the value to return and have for next time.
// This can race with another thread populating the same data,
// but that's no big deal.
val = VALUE_SET | (nvidiaDriver ? VALUE_TRUE : 0);
SDL_AtomicSet(&isRunningOnX11NvidiaDriver, val);
SDL_AtomicSet(&isRunningOnNvidiaDriver, val);
}
return !!(val & VALUE_TRUE);
#endif
#else
return false;
#endif
}
bool WMUtils::isRunningWayland()
@@ -102,9 +102,9 @@ bool WMUtils::isRunningWayland()
}
return !!(val & VALUE_TRUE);
#endif
#else
return false;
#endif
}
bool WMUtils::isRunningWindowManager()
@@ -176,3 +176,14 @@ QString WMUtils::getDrmCardOverride()
return QString();
}
bool WMUtils::isEGLSafe()
{
// We can use EGL if:
// a) We're not using X11/Wayland (EGLFS requires it)
// b) We're using Wayland (even XWayland is fine)
// c) We're using X11 but not the Nvidia proprietary driver
//
// https://github.com/moonlight-stream/moonlight-qt/issues/1751
return !WMUtils::isRunningWindowManager() || WMUtils::isRunningWayland() || !WMUtils::isRunningNvidiaProprietaryDriver();
}