summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/imports/multimedia/qsgvideonode_i420.cpp2
-rw-r--r--src/imports/multimedia/qsgvideonode_rgb32.cpp5
2 files changed, 5 insertions, 2 deletions
diff --git a/src/imports/multimedia/qsgvideonode_i420.cpp b/src/imports/multimedia/qsgvideonode_i420.cpp
index c6970a5bd..11135c14b 100644
--- a/src/imports/multimedia/qsgvideonode_i420.cpp
+++ b/src/imports/multimedia/qsgvideonode_i420.cpp
@@ -255,7 +255,7 @@ void QSGVideoNode_I420::setCurrentFrame(const QVideoFrame &frame)
void QSGVideoNode_I420::bindTexture(int id, int unit, int w, int h, const uchar *bits)
{
- QGLFunctions *functions = QGLContext::currentContext()->functions();
+ QOpenGLFunctions *functions = QOpenGLContext::currentContext()->functions();
functions->glActiveTexture(unit);
glBindTexture(GL_TEXTURE_2D, id);
glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, w, h, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, bits);
diff --git a/src/imports/multimedia/qsgvideonode_rgb32.cpp b/src/imports/multimedia/qsgvideonode_rgb32.cpp
index 1c6738d28..dbb2e8b50 100644
--- a/src/imports/multimedia/qsgvideonode_rgb32.cpp
+++ b/src/imports/multimedia/qsgvideonode_rgb32.cpp
@@ -42,6 +42,9 @@
#include <QtDeclarative/qsgtexture.h>
+#include <QtGui/QOpenGLContext>
+#include <QtGui/QOpenGLFunctions>
+
QList<QVideoFrame::PixelFormat> QSGVideoNodeFactory_RGB32::supportedPixelFormats(
QAbstractVideoBuffer::HandleType handleType) const
{
@@ -101,7 +104,7 @@ void QSGVideoTexture_RGB32::bind()
}
if (m_frame.map(QAbstractVideoBuffer::ReadOnly)) {
- QGLFunctions *functions = QGLContext::currentContext()->functions();
+ QOpenGLFunctions *functions = QOpenGLContext::currentContext()->functions();
const uchar *bits = m_frame.bits();
functions->glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, m_textureId);