mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: Separate viv direct texture checks from viv-fb winsys check

Browse source 
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: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4950>
This commit is contained in:
Carlos Rafael Giani 2023-06-30 13:53:19 +02:00 committed by GStreamer Marge Bot
parent d317379287
commit d5a9ca8ef6
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build
View file

@ -922,12 +922,14 @@ if need_win_gbm != 'no'
endif endif
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 need_platform_egl != 'no' and need_win_viv_fb != 'no'
if egl_dep.found() and cc.has_function ('fbGetDisplay', dependencies : egl_dep) 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' enabled_gl_winsys += 'viv-fb'
glconf.set('GST_GL_HAVE_WINDOW_VIV_FB', 1) glconf.set('GST_GL_HAVE_WINDOW_VIV_FB', 1)
glconf.set('GST_GL_HAVE_VIV_DIRECTVIV', 1)
gl_priv_sources += [ gl_priv_sources += [
'viv-fb/gstgldisplay_viv_fb.c', 'viv-fb/gstgldisplay_viv_fb.c',
'viv-fb/gstglwindow_viv_fb_egl.c', 'viv-fb/gstglwindow_viv_fb_egl.c',
@ -940,7 +942,6 @@ if need_platform_egl != 'no' and need_win_viv_fb != 'no'
install_headers(gl_viv_fb_headers, subdir : 'gstreamer-1.0/gst/gl/viv-fb') install_headers(gl_viv_fb_headers, subdir : 'gstreamer-1.0/gst/gl/viv-fb')
endif endif
endif endif
endif
if need_win_android == 'yes' if need_win_android == 'yes'
if need_platform_egl == 'no' if need_platform_egl == 'no'