diff options
| author | Matthew Waters <matthew@centricular.com> | 2016-05-03 19:58:00 +1000 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2016-05-03 20:02:34 +1000 |
| commit | 344e7db975951c85d4523d77fc8af837e65bfa4e (patch) | |
| tree | 64ce1bc4bd0cf845e217b75dd3a3e334556506af /configure.ac | |
| parent | 8c03f448c3cead4f6dbcaa5d6b1049b0f960cd2b (diff) | |
| download | gstreamer-plugins-bad-344e7db975951c85d4523d77fc8af837e65bfa4e.tar.gz | |
gl: fix gles3 header usage for older platforms
Some platforms provide an old version of GLES2/gl2.h and GLES2/gl2ext.h that
will fail when including GLES3/gl3.h due to missing typedef's.
Seen on the RPi.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index a63e983e4..23120c515 100644 --- a/configure.ac +++ b/configure.ac @@ -860,6 +860,10 @@ fi dnl check if we can include both GL and GLES2 at the same time if test "x$HAVE_GL" = "xyes" -a "x$HAVE_GLES2" = "xyes"; then + GLES3_H_DEFINE=0 + if test "x$HAVE_GLES3_H" == "xyes"; then + GLES3_H_DEFINE=1 + fi GL_INCLUDES=" #ifdef __GNUC__ # pragma GCC diagnostic push @@ -872,11 +876,12 @@ if test "x$HAVE_GL" = "xyes" -a "x$HAVE_GLES2" = "xyes"; then # include <OpenGLES/ES2/gl.h> # include <OpenGLES/ES2/glext.h> # else -# include <GLES2/gl2.h> -# include <GLES2/gl2ext.h> -# if $HAVE_GLES3_H +# if $GLES3_H_DEFINE # include <GLES3/gl3.h> # include <GLES3/gl3ext.h> +# else +# include <GLES2/gl2.h> +# include <GLES2/gl2ext.h> # endif # endif # ifdef __APPLE__ @@ -1329,11 +1334,12 @@ if test "x$USE_GLES2" = "xyes"; then # include <OpenGLES/ES2/gl.h> # include <OpenGLES/ES2/glext.h> # else -# include <GLES2/gl2.h> -# include <GLES2/gl2ext.h> -# if GST_GL_HAVE_GLES3 +# if $GST_GL_HAVE_GLES3 # include <GLES3/gl3.h> # include <GLES3/gl3ext.h> +# else +# include <GLES2/gl2.h> +# include <GLES2/gl2ext.h> # endif # endif " |