render: drop libEGL dependency if gles2 is disabled #3241

jbeich · 2021-10-05T02:24:38Z

Disabling gles2 currently violates reproducibility due to opportunistic lookup of libEGL even when auto-detection is disabled.

$ meson setup --auto-features=disabled _build
$ readelf -d _build/libwlroots.so | grep NEEDED.\*GL
 0x0000000000000001 NEEDED               Shared library: [libEGL.so.1]
$ nm --undefined-only -D _build/libwlroots.so | fgrep egl
                 U eglBindAPI
                 U eglCreateContext
                 U eglDestroyContext
                 U eglGetCurrentContext
                 U eglGetCurrentDisplay
                 U eglGetCurrentSurface
                 U eglGetError
                 U eglGetProcAddress
                 U eglInitialize
                 U eglMakeCurrent
                 U eglQueryContext
                 U eglQueryString
                 U eglReleaseThread
                 U eglTerminate

emersion · 2021-10-05T07:11:20Z

render/meson.build

-egl = dependency('egl', required: 'gles2' in renderers)
-if egl.found()
+if 'gles2' in renderers or 'auto' in renderers
+	egl = dependency('egl')


Hm, this isn't quite right. If running with auto, we'll want to look for the egl dep, and disable the gles2 renderer if it's missing. Here the egl dep is mandatory.

FWIW, I think we just need to wrap the original code as-is in the if 'gles2' in renderers or 'auto' in renderers condition you've added above and it should be good to go.

For `required` to disable search the value needs to be of `feature` type. Checking `gles2` via `in` keyword returns a `bool` but `required: false` makes the dependency optional instead of disabled.

emersion · 2021-11-01T15:59:32Z

wlroots has migrated to gitlab.freedesktop.org. This pull request has been moved to:

https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3241

emersion reviewed Oct 5, 2021

View reviewed changes

render: completely disable gles2 if requested but libEGL is found

154ca30

For `required` to disable search the value needs to be of `feature` type. Checking `gles2` via `in` keyword returns a `bool` but `required: false` makes the dependency optional instead of disabled.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

render: drop libEGL dependency if gles2 is disabled #3241

render: drop libEGL dependency if gles2 is disabled #3241

jbeich commented Oct 5, 2021 •

edited

emersion Oct 5, 2021

emersion Oct 20, 2021

emersion commented Nov 1, 2021

render: drop libEGL dependency if gles2 is disabled #3241

Are you sure you want to change the base?

render: drop libEGL dependency if gles2 is disabled #3241

Conversation

jbeich commented Oct 5, 2021 • edited

emersion Oct 5, 2021

Choose a reason for hiding this comment

emersion Oct 20, 2021

Choose a reason for hiding this comment

emersion commented Nov 1, 2021

jbeich commented Oct 5, 2021 •

edited