mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-14 08:56:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

render: make GLES2 renderer optional

Browse source 
Allow selecting whether the GLES2 renderer gets enabled.

Co-authored-by: Simon Ser <contact@emersion.fr>
This commit is contained in:
ayaka 2021-04-09 10:48:01 +08:00 • committed by Simon Ser
parent 122d6c6988
commit ed1924800d
9 changed files with 60 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
render/gles2/meson.build
View file

@ -1,3 +1,12 @@
glesv2 = dependency('glesv2', required: 'gles2' in renderers)
if not (glesv2.found() and egl.found())
subdir_done()
endif
features += { 'gles2-renderer': true }
wlr_deps += glesv2
wlr_files += files(
'pixel_format.c',
'renderer.c',

19
render/meson.build
View file

@ -1,7 +1,13 @@
renderers = get_option('renderers')
if 'auto' in renderers and get_option('auto_features').enabled()
renderers = ['gles2']
elif 'auto' in renderers and get_option('auto_features').disabled()
renderers = []
endif
wlr_files += files(
'allocator.c',
'dmabuf.c',
'egl.c',
'drm_format_set.c',
'gbm_allocator.c',
'pixel_format.c',
@ -11,5 +17,14 @@ wlr_files += files(
'wlr_texture.c',
)
subdir('gles2')
egl = dependency('egl', required: 'gles2' in renderers)
if egl.found()
wlr_deps += egl
wlr_files += files('egl.c')
endif
if 'gles2' in renderers or 'auto' in renderers
subdir('gles2')
endif
subdir('pixman')

1
render/pixman/meson.build
View file

@ -1,4 +1,5 @@
pixman = dependency('pixman-1')
wlr_deps += pixman
wlr_files += files(

18
render/wlr_renderer.c
View file

@ -2,13 +2,19 @@
#include <stdbool.h>
#include <stdlib.h>
#include <gbm.h>
#include <wlr/render/egl.h>
#include <wlr/render/gles2.h>
#include <wlr/render/pixman.h>
#include <wlr/render/interface.h>
#include <wlr/render/pixman.h>
#include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_matrix.h>
#include <wlr/util/log.h>
#include <wlr/config.h>
#if WLR_HAS_GLES2_RENDERER
#include <wlr/render/egl.h>
#include <wlr/render/gles2.h>
#endif
#include "util/signal.h"
#include "render/pixel_format.h"
#include "render/wlr_renderer.h"
@ -222,6 +228,7 @@ bool wlr_renderer_init_wl_display(struct wlr_renderer *r,
}
struct wlr_renderer *wlr_renderer_autocreate_with_drm_fd(int drm_fd) {
#if WLR_HAS_GLES2_RENDERER
struct gbm_device *gbm_device = gbm_create_device(drm_fd);
if (!gbm_device) {
wlr_log(WLR_ERROR, "Failed to create GBM device");
@ -241,9 +248,14 @@ struct wlr_renderer *wlr_renderer_autocreate_with_drm_fd(int drm_fd) {
if (!renderer) {
wlr_log(WLR_ERROR, "Failed to create GLES2 renderer");
wlr_egl_destroy(egl);
return NULL;
}
return renderer;
#endif
wlr_log(WLR_ERROR, "Failed to initialize any renderer");
return NULL;
}
struct wlr_renderer *wlr_renderer_autocreate(struct wlr_backend *backend) {