From db79e086756a25e984247bf73c9032bd5367aca9 Mon Sep 17 00:00:00 2001
From: Michael Goddard <michael.goddard@nokia.com>
Date: Thu, 22 Sep 2011 12:28:40 +1000
Subject: [PATCH] Remove older QGLContext calls in favour of new
 QOpenGLContext.

Change-Id: I2669f48ebac5c14f5aaf85135f3d0adbf541d877
Reviewed-on: http://codereview.qt-project.org/5339
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
---
 src/imports/multimedia/qsgvideonode_i420.cpp  | 2 +-
 src/imports/multimedia/qsgvideonode_rgb32.cpp | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/imports/multimedia/qsgvideonode_i420.cpp b/src/imports/multimedia/qsgvideonode_i420.cpp
index c6970a5b..11135c14 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 1c6738d2..dbb2e8b5 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);