diff options
Diffstat (limited to 'elements/gstqtvideosink/qtvideosinkdelegate.cpp')
| -rw-r--r-- | elements/gstqtvideosink/qtvideosinkdelegate.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/elements/gstqtvideosink/qtvideosinkdelegate.cpp b/elements/gstqtvideosink/qtvideosinkdelegate.cpp index 24d581e..be765ea 100644 --- a/elements/gstqtvideosink/qtvideosinkdelegate.cpp +++ b/elements/gstqtvideosink/qtvideosinkdelegate.cpp @@ -24,6 +24,7 @@ #include <QCoreApplication> #include <QStack> #include <QPainter> +#include <QOpenGLContext> #define QSIZE_FORMAT "(%d x %d)" #define QSIZE_FORMAT_ARGS(size) \ @@ -173,7 +174,7 @@ void QtVideoSinkDelegate::paint(QPainter *painter, const QRectF & targetArea) #ifndef GST_QT_VIDEO_SINK_NO_OPENGL if (m_glContext) { - Q_ASSERT_X(m_glContext == QGLContext::currentContext(), + Q_ASSERT_X(m_glContext == QOpenGLContext::currentContext(), "qtvideosink - paint", "Please use a QPainter that is initialized to paint on the " "GL surface that has the same context as the one given on the glcontext property" @@ -258,12 +259,12 @@ void QtVideoSinkDelegate::paint(QPainter *painter, const QRectF & targetArea) #ifndef GST_QT_VIDEO_SINK_NO_OPENGL -QGLContext *QtVideoSinkDelegate::glContext() const +QOpenGLContext *QtVideoSinkDelegate::glContext() const { return m_glContext; } -void QtVideoSinkDelegate::setGLContext(QGLContext *context) +void QtVideoSinkDelegate::setGLContext(QOpenGLContext *context) { if (m_glContext == context) return; @@ -272,7 +273,7 @@ void QtVideoSinkDelegate::setGLContext(QGLContext *context) m_supportedPainters = Generic; if (m_glContext) { - m_glContext->makeCurrent(); +// m_glContext->makeCurrent(); const QByteArray extensions(reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS))); GST_LOG_OBJECT(m_sink, "Available GL extensions: %s", extensions.constData()); @@ -283,8 +284,8 @@ void QtVideoSinkDelegate::setGLContext(QGLContext *context) #endif #ifndef QT_OPENGL_ES_2 - if (QGLShaderProgram::hasOpenGLShaderPrograms(m_glContext) - && extensions.contains("ARB_shader_objects")) + if (/*QGLShaderProgram::hasOpenGLShaderPrograms(m_glContext) + &&*/ extensions.contains("ARB_shader_objects")) #endif m_supportedPainters |= Glsl; } |