mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

qmlgl: Fix opengl header guard changes again

Browse source 
Reapply 3d708a5bfa in the correct place
after the iOS additions.
This commit is contained in:
Matthew Waters 2019-02-05 15:27:49 +11:00
parent 6ed7ddebf9
commit c92dcf513d
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ext/qt/gstqtgl.h
View file

@ -22,6 +22,15 @@
#include <QtGui/qtgui-config.h> #include <QtGui/qtgui-config.h>
#endif #endif
/* qt uses the same trick as us to typedef GLsync on GLES2 but to a different
* type which confuses the preprocessor. Instead of trying to reconcile the
* two, we instead use the GLsync definition from Qt from above, and ensure
* that we don't typedef GLsync in gstglfuncs.h */
#include <gst/gl/gstglconfig.h>
#undef GST_GL_HAVE_GLSYNC
#define GST_GL_HAVE_GLSYNC 1
#include <gst/gl/gstglfuncs.h>
/* The glext.h guard was renamed in 2018, but some software which /* The glext.h guard was renamed in 2018, but some software which
* includes their own copy of the GL headers (such as qt) might have * includes their own copy of the GL headers (such as qt) might have
* older version which use the old guard. This would result in the * older version which use the old guard. This would result in the
@ -41,12 +50,3 @@
#include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLContext>
#include <QtGui/QOpenGLFunctions> #include <QtGui/QOpenGLFunctions>
#endif /* defined(QT_OPENGL_ES_2) */ #endif /* defined(QT_OPENGL_ES_2) */
/* qt uses the same trick as us to typedef GLsync on GLES2 but to a different
* type which confuses the preprocessor. Instead of trying to reconcile the
* two, we instead use the GLsync definition from Qt from above, and ensure
* that we don't typedef GLsync in gstglfuncs.h */
#include <gst/gl/gstglconfig.h>
#undef GST_GL_HAVE_GLSYNC
#define GST_GL_HAVE_GLSYNC 1
#include <gst/gl/gstglfuncs.h>