From c20468cfa292e99357fd504fc5b5884f6078ca96 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 24 Jun 2022 07:20:42 +0200 Subject: [PATCH] render: use internal_features to indicate EGL support Instead of checking whether the wlr_egl dependencies are available in the GLES2 code, introduce internal_features['egl'] and check that field. When updating the EGL dependency list, we no longer need to update the GLES2 logic. --- meson.build | 1 + render/gles2/meson.build | 2 +- render/meson.build | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 971be7e63..992b09b64 100644 --- a/meson.build +++ b/meson.build @@ -96,6 +96,7 @@ features = { } internal_features = { 'xcb-errors': false, + 'egl': false, } wayland_project_options = ['tests=false', 'documentation=false'] diff --git a/render/gles2/meson.build b/render/gles2/meson.build index 8656714b6..504f0c11e 100644 --- a/render/gles2/meson.build +++ b/render/gles2/meson.build @@ -1,6 +1,6 @@ glesv2 = dependency('glesv2', required: 'gles2' in renderers) -if not (glesv2.found() and egl.found() and gbm.found()) +if not (glesv2.found() and internal_features['egl']) subdir_done() endif diff --git a/render/meson.build b/render/meson.build index 2bdcced8f..c8c6032fa 100644 --- a/render/meson.build +++ b/render/meson.build @@ -20,6 +20,7 @@ if 'gles2' in renderers or 'auto' in renderers if egl.found() and gbm.found() wlr_deps += [egl, gbm] wlr_files += files('egl.c') + internal_features += { 'egl': true } endif subdir('gles2') endif