Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.2] Linux: Fix PRIME detection on Steam #46794

Merged

Conversation

akien-mga
Copy link
Member

To avoid trying to do PRIME detection on fake libGL.so as used by e.g.
Renderdoc or Primus, we skip detection if there's a libGL.so in
LD_LIBRARY_PATH... and our luck is that Steam defines it and includes
system paths too, thus the actual system libGL... 🤦

So if we detect Steam, we skip this check.


3.2 version of #46792.

To avoid trying to do PRIME detection on fake `libGL.so` as used by e.g.
Renderdoc or Primus, we skip detection if there's a `libGL.so` in
`LD_LIBRARY_PATH`... and our luck is that Steam defines it and includes
system paths too, thus the actual system `libGL`... 🤦

So if we detect Steam, we skip this check.

Co-authored-by: Hein-Pieter van Braam-Stewart <[email protected]>

(cherry picked from commit 562b1cd2cda2098e62c7501dae87393def99c23a)
@akien-mga akien-mga added this to the 3.2 milestone Mar 8, 2021
@akien-mga akien-mga requested a review from hpvb March 8, 2021 15:05
@akien-mga akien-mga requested a review from a team as a code owner March 8, 2021 15:05
@akien-mga akien-mga changed the title Linux: Fix PRIME detection on Steam [3.2] Linux: Fix PRIME detection on Steam Mar 8, 2021
@akien-mga akien-mga merged commit 9c30f70 into godotengine:3.2 Mar 8, 2021
@akien-mga akien-mga deleted the 3.2-linux-fix-detect_prime-steam branch March 8, 2021 15:30
@akien-mga akien-mga modified the milestones: 3.2, 3.3 Apr 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants