diff --git a/ext/qt/gstqtgl.h b/ext/qt/gstqtgl.h index 6bf8ea6010..4d0bb64c11 100644 --- a/ext/qt/gstqtgl.h +++ b/ext/qt/gstqtgl.h @@ -22,6 +22,15 @@ #include #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 +#undef GST_GL_HAVE_GLSYNC +#define GST_GL_HAVE_GLSYNC 1 +#include + /* 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 #include #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 -#undef GST_GL_HAVE_GLSYNC -#define GST_GL_HAVE_GLSYNC 1 -#include