qmlgl: Fix opengl header guard changes again
Reapply 3d708a5bfa8961cc37671bc3226976dfc9ba50ad in the correct place after the iOS additions.
This commit is contained in:
parent
6ed7ddebf9
commit
c92dcf513d
@ -22,6 +22,15 @@
|
||||
#include <QtGui/qtgui-config.h>
|
||||
#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
|
||||
* 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
|
||||
@ -41,12 +50,3 @@
|
||||
#include <QtGui/QOpenGLContext>
|
||||
#include <QtGui/QOpenGLFunctions>
|
||||
#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>
|
||||
|
Loading…
x
Reference in New Issue
Block a user