浏览代码

Merge pull request #46794 from akien-mga/3.2-linux-fix-detect_prime-steam

[3.2] Linux: Fix PRIME detection on Steam
Rémi Verschelde 4 年之前
父节点
当前提交
9c30f70f64
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      platform/x11/os_x11.cpp

+ 4 - 1
platform/x11/os_x11.cpp

@@ -264,7 +264,10 @@ Error OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
 			use_prime = 0;
 		}
 
-		if (getenv("LD_LIBRARY_PATH")) {
+		// Some tools use fake libGL libraries and have them override the real one using
+		// LD_LIBRARY_PATH, so we skip them. *But* Steam also sets LD_LIBRARY_PATH for its
+		// runtime and includes system `/lib` and `/lib64`... so ignore Steam.
+		if (use_prime == -1 && getenv("LD_LIBRARY_PATH") && !getenv("STEAM_RUNTIME_LIBRARY_PATH")) {
 			String ld_library_path(getenv("LD_LIBRARY_PATH"));
 			Vector<String> libraries = ld_library_path.split(":");