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

ALL: Rework OpenGL detection #3645

Merged
merged 5 commits into from Jan 18, 2022
Merged

ALL: Rework OpenGL detection #3645

merged 5 commits into from Jan 18, 2022

Conversation

@lephilousophe
Copy link
Member

@lephilousophe lephilousophe commented Jan 4, 2022

With the advent of GLAD, OpenGL libraries don't need to be linked with ScummVM for those platforms.
In addition, GLAD support is known at configure step by knowing the platform to configure.
This PR also tries to merge two configure paths: the one for 2D engines, and the one for 3D engines.

It builds correctly on Linux and Android. No other tests have been done yet.
In addition, create_project still has a USE_GLES2 define and no USE_GLES_MODE.

configure Outdated Show resolved Hide resolved
graphics/opengl/system_headers.h Outdated Show resolved Hide resolved
Replace it with USE_FORCED_GLES2
With GLAD it's not needed anymore to link against OpenGL libraries.
As configure knows better whether a platform supports GLAD, detection is
moved here.
To allow platforms where OpenGL should be linked at build time, the
tests are kept. Android uses them for now.
The OpenGL for Games was completely decoupled from the OpenGL for 2D
engines. This not the case anymore.
@lephilousophe
Copy link
Member Author

@lephilousophe lephilousophe commented Jan 17, 2022

I did some builds on platforms supported by buildbot and GLAD gets included only when necessary so this seems to be OK.
I think it's ready for review.

@lephilousophe lephilousophe marked this pull request as ready for review Jan 17, 2022
bluegr
bluegr approved these changes Jan 17, 2022
@aquadran aquadran merged commit f11295e into scummvm:master Jan 18, 2022
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants