From bd7c1adba9fa2f2a1f72608c2fb4f9dc1fdb5706 Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Fri, 30 Jun 2023 13:53:19 +0200 Subject: [PATCH] gl: Separate viv direct texture checks from viv-fb winsys check Vivante direct textures do not depend on the viv-fb windowing system. Decouple these two to be able to use direct textures even when viv-fb is not enabled. Part-of: --- .../gst-plugins-base/gst-libs/gst/gl/meson.build | 31 +++++++++++----------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build index 5fc775d..8195157 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build +++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build @@ -918,23 +918,24 @@ if need_win_gbm != 'no' endif endif +if cc.has_function ('glTexDirectVIV', dependencies : gles2_dep) + glconf.set('GST_GL_HAVE_VIV_DIRECTVIV', 1) +endif + if need_platform_egl != 'no' and need_win_viv_fb != 'no' if egl_dep.found() and cc.has_function ('fbGetDisplay', dependencies : egl_dep) - if cc.has_function ('glTexDirectVIV', dependencies : gles2_dep) - enabled_gl_winsys += 'viv-fb' - glconf.set('GST_GL_HAVE_WINDOW_VIV_FB', 1) - glconf.set('GST_GL_HAVE_VIV_DIRECTVIV', 1) - gl_priv_sources += [ - 'viv-fb/gstgldisplay_viv_fb.c', - 'viv-fb/gstglwindow_viv_fb_egl.c', - ] - gl_cpp_args += ['-DEGL_API_FB'] - gl_viv_fb_headers = [ - 'viv-fb/gstgldisplay_viv_fb.h', - 'viv-fb/gstglwindow_viv_fb_egl.h', - ] - install_headers(gl_viv_fb_headers, subdir : 'gstreamer-1.0/gst/gl/viv-fb') - endif + enabled_gl_winsys += 'viv-fb' + glconf.set('GST_GL_HAVE_WINDOW_VIV_FB', 1) + gl_priv_sources += [ + 'viv-fb/gstgldisplay_viv_fb.c', + 'viv-fb/gstglwindow_viv_fb_egl.c', + ] + gl_cpp_args += ['-DEGL_API_FB'] + gl_viv_fb_headers = [ + 'viv-fb/gstgldisplay_viv_fb.h', + 'viv-fb/gstglwindow_viv_fb_egl.h', + ] + install_headers(gl_viv_fb_headers, subdir : 'gstreamer-1.0/gst/gl/viv-fb') endif endif -- 2.7.4