godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #25879 from hpvb/fix-25629 

Detect when primusrun/optirun is in use
This commit is contained in:
Rémi Verschelde 2019-02-14 17:06:20 +01:00 committed by GitHub
parent c6c788581e 84627140d7
commit 89eb79aef1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
platform/x11/os_x11.cpp
View File

@ -243,8 +243,37 @@ Error OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
// maybe contextgl wants to be in charge of creating the window // maybe contextgl wants to be in charge of creating the window
#if defined(OPENGL_ENABLED) #if defined(OPENGL_ENABLED)
if (getenv("DRI_PRIME") == NULL) { if (getenv("DRI_PRIME") == NULL) {
print_verbose("Detecting GPUs, set DRI_PRIME in the environment to override GPU detection logic."); int use_prime = -1;
int use_prime = detect_prime();
if (getenv("PRIMUS_DISPLAY") ||
getenv("PRIMUS_libGLd") ||
getenv("PRIMUS_libGLa") ||
getenv("PRIMUS_libGL") ||
getenv("PRIMUS_LOAD_GLOBAL") ||
getenv("BUMBLEBEE_SOCKET")) {
print_verbose("Optirun/primusrun detected. Skipping GPU detection");
use_prime = 0;
}
if (getenv("LD_LIBRARY_PATH")) {
String ld_library_path(getenv("LD_LIBRARY_PATH"));
Vector<String> libraries = ld_library_path.split(":");
for (int i = 0; i < libraries.size(); ++i) {
if (FileAccess::exists(libraries[i] + "/libGL.so.1") ||
FileAccess::exists(libraries[i] + "/libGL.so")) {
print_verbose("Custom libGL override detected. Skipping GPU detection");
use_prime = 0;
}
}
}
if (use_prime == -1) {
print_verbose("Detecting GPUs, set DRI_PRIME in the environment to override GPU detection logic.");
use_prime = detect_prime();
}
if (use_prime) { if (use_prime) {
print_line("Found discrete GPU, setting DRI_PRIME=1 to use it."); print_line("Found discrete GPU, setting DRI_PRIME=1 to use it.");