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

Allow GLX to still be used if EGL doesn't work for whatever reason #1877

Merged
merged 2 commits into from
Sep 29, 2022

Conversation

mosra
Copy link
Collaborator

@mosra mosra commented Sep 29, 2022

Motivation and Context

PR #1861 switched from GLX/EGL to unconditionally using EGL on Linux-y platforms. Which is a good thing to have in general, but there might still be cases where EGL might be broken, and for these it should be possible to switch back to something that works.

That has to be done manually by turning MAGNUM_TARGET_EGL to OFF in dependencies.cmake, and this PR makes necessary buildsystem fixes to make the code compile again. The default EGL workflow is not affected by these changes in any way.

Also contains a vaguely-related update for .gitignore.

How Has This Been Tested

Locally by setting the CMake option, running ninja and executing a few tests.

I have one for EGL, one for GLX, and one for external Magnum, and
`git add -i` takes ages if those aren't ignored.
@mosra mosra requested review from aclegg3 and 0mdc September 29, 2022 14:48
@facebook-github-bot facebook-github-bot added the CLA Signed Do not delete this pull request or issue due to inactivity. label Sep 29, 2022
@mosra mosra merged commit 8a98a56 into main Sep 29, 2022
@mosra mosra deleted the egl-allow-glx-fallback branch September 29, 2022 18:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed Do not delete this pull request or issue due to inactivity.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants