mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

build/gl/meson: check for GLES3/gl3ext.h existence

Browse source 
791e7522eb for meson

https://bugzilla.gnome.org/show_bug.cgi?id=781885
This commit is contained in:
Matthew Waters 2017-05-11 20:05:24 +10:00
parent 791e7522eb
commit 7b615e92b6
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gst-libs/gst/gl/gstglconfig.h.meson
View file

@ -14,6 +14,7 @@ G_BEGIN_DECLS
#mesondefine GST_GL_HAVE_OPENGL #mesondefine GST_GL_HAVE_OPENGL
#mesondefine GST_GL_HAVE_GLES2 #mesondefine GST_GL_HAVE_GLES2
#mesondefine GST_GL_HAVE_GLES3 #mesondefine GST_GL_HAVE_GLES3
#mesondefine GST_GL_HAVE_GLES3EXT3_H
#mesondefine GST_GL_HAVE_WINDOW_X11 #mesondefine GST_GL_HAVE_WINDOW_X11
#mesondefine GST_GL_HAVE_WINDOW_COCOA #mesondefine GST_GL_HAVE_WINDOW_COCOA

11
gst-libs/gst/gl/meson.build
View file

@ -93,6 +93,7 @@ glconf_options = [
'GST_GL_HAVE_OPENGL', 'GST_GL_HAVE_OPENGL',
'GST_GL_HAVE_GLES2', 'GST_GL_HAVE_GLES2',
'GST_GL_HAVE_GLES3', 'GST_GL_HAVE_GLES3',
'GST_GL_HAVE_GLES3EXT3_H',
'GST_GL_HAVE_WINDOW_X11', 'GST_GL_HAVE_WINDOW_X11',
'GST_GL_HAVE_WINDOW_COCOA', 'GST_GL_HAVE_WINDOW_COCOA',
@ -305,6 +306,8 @@ endif
# GLES2 checks # GLES2 checks
gles2_dep = unneeded_dep gles2_dep = unneeded_dep
gles3_h = false
gles3ext3_h = false
if need_api_gles2 != 'no' if need_api_gles2 != 'no'
gles2_dep = dependency('glesv2', required : false) gles2_dep = dependency('glesv2', required : false)
if not gles2_dep.found() if not gles2_dep.found()
@ -328,9 +331,14 @@ if need_api_gles2 != 'no'
# include <OpenGLES/ES2/glext.h> # include <OpenGLES/ES2/glext.h>
#else''' #else'''
if gles3_h if gles3_h
gles3ext3_h = gles3_h and cc.has_header('GLES3/gl3ext.h', required : false, dependencies : gles2_dep)
gles_includes += ''' gles_includes += '''
# include <GLES3/gl3.h> # include <GLES3/gl3.h>
# include <GLES2/gl2ext.h>'''
if gles3ext3_h
gles_includes += '''
# include <GLES3/gl3ext.h>''' # include <GLES3/gl3ext.h>'''
endif
else else
gles_includes += ''' gles_includes += '''
# include <GLES2/gl2.h> # include <GLES2/gl2.h>
@ -368,6 +376,9 @@ if gles2_dep.found()
glconf.set10('GST_GL_HAVE_GLES2', 1) glconf.set10('GST_GL_HAVE_GLES2', 1)
if gles3_h if gles3_h
glconf.set10('GST_GL_HAVE_GLES3', 1) glconf.set10('GST_GL_HAVE_GLES3', 1)
if gles3ext3_h
glconf.set10('GST_GL_HAVE_GLES3EXT3_H', 1)
endif
endif endif
enabled_gl_apis += 'gles2' enabled_gl_apis += 'gles2'
endif endif