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

gl: fix gles3 header usage for older platforms

Browse source 
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.
This commit is contained in:
Matthew Waters 2016-05-03 19:58:00 +10:00
parent 8c03f448c3
commit 344e7db975
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
configure.ac
View file

@ -860,6 +860,10 @@ fi
dnl check if we can include both GL and GLES2 at the same time 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 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=" GL_INCLUDES="
#ifdef __GNUC__ #ifdef __GNUC__
# pragma GCC diagnostic push # 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/gl.h>
# include <OpenGLES/ES2/glext.h> # include <OpenGLES/ES2/glext.h>
# else # else
# include <GLES2/gl2.h> # if $GLES3_H_DEFINE
# include <GLES2/gl2ext.h>
# if $HAVE_GLES3_H
# include <GLES3/gl3.h> # include <GLES3/gl3.h>
# include <GLES3/gl3ext.h> # include <GLES3/gl3ext.h>
# else
# include <GLES2/gl2.h>
# include <GLES2/gl2ext.h>
# endif # endif
# endif # endif
# ifdef __APPLE__ # ifdef __APPLE__
@ -1329,11 +1334,12 @@ if test "x$USE_GLES2" = "xyes"; then
# include <OpenGLES/ES2/gl.h> # include <OpenGLES/ES2/gl.h>
# include <OpenGLES/ES2/glext.h> # include <OpenGLES/ES2/glext.h>
# else # else
# include <GLES2/gl2.h> # if $GST_GL_HAVE_GLES3
# include <GLES2/gl2ext.h>
# if GST_GL_HAVE_GLES3
# include <GLES3/gl3.h> # include <GLES3/gl3.h>
# include <GLES3/gl3ext.h> # include <GLES3/gl3ext.h>
# else
# include <GLES2/gl2.h>
# include <GLES2/gl2ext.h>
# endif # endif
# endif # endif
" "

5
gst-libs/gst/gl/gstglapi.h
View file

@ -39,11 +39,12 @@
# include <OpenGLES/ES2/gl.h> # include <OpenGLES/ES2/gl.h>
# include <OpenGLES/ES2/glext.h> # include <OpenGLES/ES2/glext.h>
# else # 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/gl3.h>
# include <GLES3/gl3ext.h> # include <GLES3/gl3ext.h>
# else
# include <GLES2/gl2.h>
# include <GLES2/gl2ext.h>
# endif # endif
# endif # endif
# if !GST_GL_HAVE_OPENGL # if !GST_GL_HAVE_OPENGL