Substitute QGL classes with QOpenGL

Gui/CurveGui.cpp

@@ -45,6 +45,10 @@
 #include "Gui/CurveWidgetPrivate.h"
 #include "Gui/KnobGui.h"
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+#include <QOpenGLContext>
+#endif
+
 NATRON_NAMESPACE_ENTER
 
 CurveGui::CurveGui(CurveWidget *curveWidget,
@@ -299,7 +303,7 @@ CurveGui::drawCurve(int curveIndex,
         return;
     }
 
-    assert( QGLContext::currentContext() == _curveWidget->context() );
+    assert( QOpenGLContext::currentContext() == _curveWidget->context() );
 
     std::vector<float> vertices, exprVertices;
     double x1 = 0;

Gui/CurveWidget.cpp

@@ -70,6 +70,10 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
 #include "Gui/TabWidget.h"
 #include "Gui/ViewerGL.h"
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+#include <QOpenGLContext>
+#endif
+
 NATRON_NAMESPACE_ENTER
 
 /*****************************CURVE WIDGET***********************************************/
@@ -116,8 +120,12 @@ CurveWidget::CurveWidget(Gui* gui,
                          CurveSelection* selection,
                          TimeLinePtr timeline,
                          QWidget* parent,
-                         const QGLWidget* shareWidget)
-    : QGLWidget(parent, shareWidget)
+                         const QOpenGLWidget* shareWidget)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+    : QOpenGLWidget(parent)
+#else
+    : QOpenGLWidget(parent, shareWidget)
+#endif
     , _imp( new CurveWidgetPrivate(gui, selection, timeline, this) )
 {
     // always running in the main thread
@@ -435,7 +443,11 @@ CurveWidget::swapOpenGLBuffers()
     // always running in the main thread
     assert( qApp && qApp->thread() == QThread::currentThread() );
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+    update();
+#else
     swapBuffers();
+#endif
 }
 
 /**
@@ -486,7 +498,7 @@ CurveWidget::getScreenPixelRatio() const
     assert( qApp && qApp->thread() == QThread::currentThread() );
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    return windowHandle()->devicePixelRatio();
+    return devicePixelRatio();
 #else
     return _imp->_gui ? _imp->_gui->devicePixelRatio() : 1.;
 #endif
@@ -579,7 +591,7 @@ CurveWidget::resizeGL(int width,
 {
     // always running in the main thread
     assert( qApp && qApp->thread() == QThread::currentThread() );
-    assert( QGLContext::currentContext() == context() );
+    assert( QOpenGLContext::currentContext() == context() );
 
     if ( !appPTR->isOpenGLLoaded() ) {
         return;
@@ -620,7 +632,7 @@ CurveWidget::paintGL()
 {
     // always running in the main thread
     assert( qApp && qApp->thread() == QThread::currentThread() );
-    assert( QGLContext::currentContext() == context() );
+    assert( QOpenGLContext::currentContext() == context() );
 
     if ( !appPTR->isOpenGLLoaded() ) {
         return;
@@ -735,7 +747,7 @@ CurveWidget::renderText(double x,
 {
     // always running in the main thread
     assert( qApp && qApp->thread() == QThread::currentThread() );
-    assert( QGLContext::currentContext() == context() );
+    assert( QOpenGLContext::currentContext() == context() );
 
     if ( text.isEmpty() ) {
         return;
@@ -1241,7 +1253,7 @@ CurveWidget::mouseMoveEvent(QMouseEvent* e)
 
     if (_imp->_state == eEventStateNone) {
         // nothing else to do
-        QGLWidget::mouseMoveEvent(e);
+        QOpenGLWidget::mouseMoveEvent(e);
 
         return;
     }
@@ -1364,7 +1376,7 @@ CurveWidget::mouseMoveEvent(QMouseEvent* e)
     if (mustUpdate) {
         update();
     }
-    QGLWidget::mouseMoveEvent(e);
+    QOpenGLWidget::mouseMoveEvent(e);
 } // mouseMoveEvent
 
 void
@@ -1622,15 +1634,15 @@ CurveWidget::keyPressEvent(QKeyEvent* e)
         if (ce) {
             ce->handleUnCaughtKeyPressEvent(e);
         }
-        QGLWidget::keyPressEvent(e);
+        QOpenGLWidget::keyPressEvent(e);
     }
 } // keyPressEvent
 
 void
 CurveWidget::enterEvent(QEvent* e)
 {
     setFocus();
-    QGLWidget::enterEvent(e);
+    QOpenGLWidget::enterEvent(e);
 }
 
 void
@@ -2128,7 +2140,7 @@ CurveWidget::onUpdateOnPenUpActionTriggered()
 void
 CurveWidget::focusInEvent(QFocusEvent* e)
 {
-    QGLWidget::focusInEvent(e);
+    QOpenGLWidget::focusInEvent(e);
 }
 
 void

Gui/CurveWidget.h

@@ -39,14 +39,19 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtOpenGL/QGLWidget>
 #include <QtCore/QMetaType>
 #include <QtCore/QSize>
 #include <QDialog>
 #include <QtCore/QByteArray>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+#include <QOpenGLWidget>
+#else
+#include "Gui/QGLWidgetCompat.h"
+#endif
+
 #include "Global/GlobalDefines.h"
 
 #include "Engine/OverlaySupport.h"
@@ -60,7 +65,7 @@ NATRON_NAMESPACE_ENTER
 class CurveWidgetPrivate;
 
 class CurveWidget
-    : public QGLWidget, public OverlaySupport
+    : public QOpenGLWidget, public OverlaySupport
 {
     friend class CurveGui;
     friend class CurveWidgetPrivate;
@@ -76,7 +81,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
                 CurveSelection* selection,
                 TimeLinePtr timeline = TimeLinePtr(),
                 QWidget* parent = NULL,
-                const QGLWidget* shareWidget = NULL);
+                const QOpenGLWidget* shareWidget = NULL);
 
     virtual ~CurveWidget() OVERRIDE;
 

Gui/CurveWidgetPrivate.cpp

@@ -51,6 +51,10 @@
 #include "Gui/Menu.h"
 #include "Gui/ticks.h"
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+#include <QOpenGLContext>
+#endif
+
 #define CLICK_DISTANCE_FROM_CURVE_ACCEPTANCE 5 //maximum distance from a curve that accepts a mouse click
 // (in widget pixels)
 #define CURSOR_WIDTH 15
@@ -289,7 +293,7 @@ CurveWidgetPrivate::drawSelectionRectangle(double screenPixelRatio)
 {
     // always running in the main thread
     assert( qApp && qApp->thread() == QThread::currentThread() );
-    assert( QGLContext::currentContext() == _widget->context() );
+    assert( QOpenGLContext::currentContext() == _widget->context() );
     {
         GLProtectAttrib a(GL_HINT_BIT | GL_ENABLE_BIT | GL_LINE_BIT | GL_COLOR_BUFFER_BIT | GL_CURRENT_BIT);
 
@@ -363,7 +367,7 @@ CurveWidgetPrivate::drawTimelineMarkers(double screenPixelRatio)
 {
     // always running in the main thread
     assert( qApp && qApp->thread() == QThread::currentThread() );
-    assert( QGLContext::currentContext() == _widget->context() );
+    assert( QOpenGLContext::currentContext() == _widget->context() );
     glCheckError();
 
     refreshTimelinePositions();
@@ -426,7 +430,7 @@ CurveWidgetPrivate::drawCurves(double screenPixelRatio)
 {
     // always running in the main thread
     assert( qApp && qApp->thread() == QThread::currentThread() );
-    assert( QGLContext::currentContext() == _widget->context() );
+    assert( QOpenGLContext::currentContext() == _widget->context() );
 
     //now draw each curve
     std::vector<CurveGuiPtr> visibleCurves;
@@ -444,7 +448,7 @@ CurveWidgetPrivate::drawScale(double screenPixelRatio)
     glCheckError();
     // always running in the main thread
     assert( qApp && qApp->thread() == QThread::currentThread() );
-    assert( QGLContext::currentContext() == _widget->context() );
+    assert( QOpenGLContext::currentContext() == _widget->context() );
 
     QPointF btmLeft = zoomCtx.toZoomCoordinates(0, _widget->height() - 1);
     QPointF topRight = zoomCtx.toZoomCoordinates(_widget->width() - 1, 0);
@@ -568,7 +572,7 @@ CurveWidgetPrivate::drawSelectedKeyFramesBbox(double screenPixelRatio)
 {
     // always running in the main thread
     assert( qApp && qApp->thread() == QThread::currentThread() );
-    assert( QGLContext::currentContext() == _widget->context() );
+    assert( QOpenGLContext::currentContext() == _widget->context() );
 
     {
         GLProtectAttrib a(GL_HINT_BIT | GL_ENABLE_BIT | GL_LINE_BIT | GL_COLOR_BUFFER_BIT | GL_CURRENT_BIT);

Gui/CustomParamInteract.cpp

@@ -47,6 +47,10 @@
 #include "Engine/AppInstance.h"
 #include "Engine/TimeLine.h"
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+#include <QOpenGLContext>
+#endif
+
 
 NATRON_NAMESPACE_ENTER
 
@@ -85,7 +89,7 @@ CustomParamInteract::CustomParamInteract(const KnobGuiPtr& knob,
                                          void* ofxParamHandle,
                                          const OfxParamOverlayInteractPtr & entryPoint,
                                          QWidget* parent)
-    : QGLWidget(parent)
+    : QOpenGLWidget(parent)
     , _imp( new CustomParamInteractPrivate(knob, ofxParamHandle, entryPoint) )
 {
     double minW, minH;
@@ -103,7 +107,7 @@ CustomParamInteract::paintGL()
 {
     // always running in the main thread
     assert( qApp && qApp->thread() == QThread::currentThread() );
-    assert( QGLContext::currentContext() == context() );
+    assert( QOpenGLContext::currentContext() == context() );
 
     if ( !appPTR->isOpenGLLoaded() ) {
         return;
@@ -149,7 +153,7 @@ CustomParamInteract::resizeGL(int w,
 {
     // always running in the main thread
     assert( qApp && qApp->thread() == QThread::currentThread() );
-    assert( QGLContext::currentContext() == context() );
+    assert( QOpenGLContext::currentContext() == context() );
 
     if ( !appPTR->isOpenGLLoaded() ) {
         return;
@@ -171,7 +175,11 @@ CustomParamInteract::sizeHint() const
 void
 CustomParamInteract::swapOpenGLBuffers()
 {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+    update();
+#else
     swapBuffers();
+#endif
 }
 
 void
@@ -201,7 +209,7 @@ double
 CustomParamInteract::getScreenPixelRatio() const
 {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    return windowHandle()->devicePixelRatio();
+    return devicePixelRatio();
 #else
     KnobGuiPtr k = _imp->knob.lock();
     return (k && k->getGui()) ? k->getGui()->devicePixelRatio() : 1.;

Gui/CustomParamInteract.h

@@ -36,11 +36,11 @@
 #include "Global/GLIncludes.h" //!<must be included before QGlWidget because of gl.h and glew.h
 #include "Global/GlobalDefines.h"
 
-CLANG_DIAG_OFF(deprecated)
-CLANG_DIAG_OFF(uninitialized)
-#include <QGLWidget>
-CLANG_DIAG_ON(deprecated)
-CLANG_DIAG_ON(uninitialized)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+#include <QOpenGLWidget>
+#else
+#include "Gui/QGLWidgetCompat.h"
+#endif
 
 #include "Engine/OverlaySupport.h"
 
@@ -50,7 +50,7 @@ NATRON_NAMESPACE_ENTER
 
 struct CustomParamInteractPrivate;
 class CustomParamInteract
-    : public QGLWidget, public OverlaySupport
+    : public QOpenGLWidget, public OverlaySupport
 {
 public:
     CustomParamInteract(const KnobGuiPtr& knob,

Gui/DopeSheetView.cpp

@@ -76,6 +76,10 @@
 #include "Gui/ZoomContext.h"
 #include "Gui/TabWidget.h"
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+#include <QOpenGLContext>
+#endif
+
 #define NATRON_DOPESHEET_MIN_RANGE_FIT 10
 
 NATRON_NAMESPACE_ENTER
@@ -110,14 +114,14 @@ running_in_main_thread()
 }
 
 void
-running_in_main_context(const QGLWidget *glWidget)
+running_in_main_context(const QOpenGLWidget *glWidget)
 {
-    assert( glWidget->context() == QGLContext::currentContext() );
+    assert( glWidget->context() == QOpenGLContext::currentContext() );
     Q_UNUSED(glWidget);
 }
 
 void
-running_in_main_thread_and_context(const QGLWidget *glWidget)
+running_in_main_thread_and_context(const QOpenGLWidget *glWidget)
 {
     running_in_main_thread();
     running_in_main_context(glWidget);
@@ -809,7 +813,10 @@ DopeSheetViewPrivate::generateKeyframeTextures()
         if (std::max( kfTexturesImages[i].width(), kfTexturesImages[i].height() ) != KF_PIXMAP_SIZE) {
             kfTexturesImages[i] = kfTexturesImages[i].scaled(KF_PIXMAP_SIZE, KF_PIXMAP_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation);
         }
-        kfTexturesImages[i] = QGLWidget::convertToGLFormat(kfTexturesImages[i]);
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
+        kfTexturesImages[i] = QOpenGLWidget::convertToGLFormat(kfTexturesImages[i]);
+#endif
         glBindTexture(GL_TEXTURE_2D, kfTexturesIDs[i]);
 
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@@ -2562,7 +2569,7 @@ DopeSheetView::DopeSheetView(DopeSheet *model,
                              Gui *gui,
                              const TimeLinePtr &timeline,
                              QWidget *parent)
-    : QGLWidget(parent)
+    : QOpenGLWidget(parent)
     , _imp( new DopeSheetViewPrivate(this) )
 {
     _imp->model = model;
@@ -2683,7 +2690,12 @@ DopeSheetView::swapOpenGLBuffers()
 {
     running_in_main_thread();
 
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+    update();
+#else
     swapBuffers();
+#endif
 }
 
 /**
@@ -2734,7 +2746,7 @@ double
 DopeSheetView::getScreenPixelRatio() const
 {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    return windowHandle()->devicePixelRatio();
+    return devicePixelRatio();
 #else
     return _imp->gui ? _imp->gui->devicePixelRatio() : 1.;
 #endif
@@ -3707,7 +3719,7 @@ DopeSheetView::wheelEvent(QWheelEvent *e)
 void
 DopeSheetView::focusInEvent(QFocusEvent *e)
 {
-    QGLWidget::focusInEvent(e);
+    QOpenGLWidget::focusInEvent(e);
 }
 
 NATRON_NAMESPACE_EXIT