From ec5a2c054cfcfbdc48247a1994807af3626a583b Mon Sep 17 00:00:00 2001 From: kichikuou Date: Sun, 1 Jan 2023 11:49:42 +0900 Subject: [PATCH] Use OpenGL ES by default This replaces `use_gles` boolean build option with `opengles` feature option. If OpenGL ES3 is available, it is preferred over desktop OpenGL. This can be overridden by `-Dopengles=disabled` meson flag. --- meson.build | 4 ++-- meson_options.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 53bdb2b..95974c1 100644 --- a/meson.build +++ b/meson.build @@ -14,8 +14,8 @@ png = dependency('libpng') cglm = dependency('cglm', fallback : ['cglm', 'cglm_dep']) sndfile = dependency('sndfile') -if get_option('use_gles') - gles = dependency('glesv2') +gles = dependency('glesv2', version : '>=3', required: get_option('opengles')) +if gles.found() gl_deps = [gles] add_project_arguments('-DUSE_GLES', language : 'c') else diff --git a/meson_options.txt b/meson_options.txt index ee54de0..d664ee1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,2 +1,2 @@ option('debugger', type : 'feature', value : 'auto') -option('use_gles', type : 'boolean', value : false, description : 'Target OpenGL ES 3.0') +option('opengles', type : 'feature', value : 'auto', description : 'Target OpenGL ES 3.0')