From 70dd5e24ce29adeab48932082863b3e3e3e4ba47 Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Wed, 3 Jun 2020 11:18:13 +0200
Subject: Remove QQuickOpenGLShaderEffect

This also removes QQuickUniformAnimator, which is not yet ported
to RHI (QTBUG-83976)

Task-number: QTBUG-83977
Change-Id: I3e656e6817ac991371b7f6557f050e122635d279
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
---
 src/quick/util/qquickanimator.cpp    |  2 +-
 src/quick/util/qquickanimator_p.h    |  4 ++--
 src/quick/util/qquickanimatorjob.cpp | 20 ++------------------
 src/quick/util/qquickanimatorjob_p.h |  4 ++--
 4 files changed, 7 insertions(+), 23 deletions(-)

(limited to 'src/quick/util')

diff --git a/src/quick/util/qquickanimator.cpp b/src/quick/util/qquickanimator.cpp
index d1ff78f8bc..3a7c3ef808 100644
--- a/src/quick/util/qquickanimator.cpp
+++ b/src/quick/util/qquickanimator.cpp
@@ -504,7 +504,7 @@ QQuickRotationAnimator::RotationDirection QQuickRotationAnimator::direction() co
     return d->direction;
 }
 
-#if QT_CONFIG(quick_shadereffect) && QT_CONFIG(opengl)
+#if 0 // QTBUG-83976
 /*!
     \qmltype UniformAnimator
     \instantiates QQuickUniformAnimator
diff --git a/src/quick/util/qquickanimator_p.h b/src/quick/util/qquickanimator_p.h
index 0bcf4c40a4..a7c219ce1a 100644
--- a/src/quick/util/qquickanimator_p.h
+++ b/src/quick/util/qquickanimator_p.h
@@ -184,7 +184,7 @@ protected:
     QString propertyName() const override { return QStringLiteral("rotation"); }
 };
 
-#if QT_CONFIG(quick_shadereffect) && QT_CONFIG(opengl)
+#if 0 // QTBUG-83976
 class QQuickUniformAnimatorPrivate;
 class Q_QUICK_PRIVATE_EXPORT QQuickUniformAnimator : public QQuickAnimator
 {
@@ -217,7 +217,7 @@ QML_DECLARE_TYPE(QQuickYAnimator)
 QML_DECLARE_TYPE(QQuickScaleAnimator)
 QML_DECLARE_TYPE(QQuickRotationAnimator)
 QML_DECLARE_TYPE(QQuickOpacityAnimator)
-#if QT_CONFIG(quick_shadereffect) && QT_CONFIG(opengl)
+#if 0 // QTBUG-83976
 QML_DECLARE_TYPE(QQuickUniformAnimator)
 #endif
 #endif // QQUICKANIMATOR_P_H
diff --git a/src/quick/util/qquickanimatorjob.cpp b/src/quick/util/qquickanimatorjob.cpp
index 8879ef1e57..b46e2db258 100644
--- a/src/quick/util/qquickanimatorjob.cpp
+++ b/src/quick/util/qquickanimatorjob.cpp
@@ -43,7 +43,7 @@
 #include "qquickanimator_p.h"
 #include "qquickanimator_p_p.h"
 #include <private/qquickitem_p.h>
-#if QT_CONFIG(quick_shadereffect) && QT_CONFIG(opengl)
+#if 0 // QTBUG-83976
 # include <private/qquickopenglshadereffectnode_p.h>
 # include <private/qquickopenglshadereffect_p.h>
 # include <private/qquickshadereffect_p.h>
@@ -431,9 +431,6 @@ void QQuickXAnimatorJob::writeBack()
 
 void QQuickXAnimatorJob::updateCurrentTime(int time)
 {
-#if QT_CONFIG(opengl)
-    Q_ASSERT(!m_controller || !m_controller->m_window->openglContext() || m_controller->m_window->openglContext()->thread() == QThread::currentThread());
-#endif
     if (!m_helper)
         return;
 
@@ -450,9 +447,6 @@ void QQuickYAnimatorJob::writeBack()
 
 void QQuickYAnimatorJob::updateCurrentTime(int time)
 {
-#if QT_CONFIG(opengl)
-    Q_ASSERT(!m_controller || !m_controller->m_window->openglContext() || m_controller->m_window->openglContext()->thread() == QThread::currentThread());
-#endif
     if (!m_helper)
         return;
 
@@ -469,9 +463,6 @@ void QQuickScaleAnimatorJob::writeBack()
 
 void QQuickScaleAnimatorJob::updateCurrentTime(int time)
 {
-#if QT_CONFIG(opengl)
-    Q_ASSERT(!m_controller || !m_controller->m_window->openglContext() || m_controller->m_window->openglContext()->thread() == QThread::currentThread());
-#endif
     if (!m_helper)
         return;
 
@@ -492,9 +483,6 @@ extern QVariant _q_interpolateCounterclockwiseRotation(qreal &f, qreal &t, qreal
 
 void QQuickRotationAnimatorJob::updateCurrentTime(int time)
 {
-#if QT_CONFIG(opengl)
-    Q_ASSERT(!m_controller || !m_controller->m_window->openglContext() || m_controller->m_window->openglContext()->thread() == QThread::currentThread());
-#endif
     if (!m_helper)
         return;
 
@@ -600,10 +588,6 @@ void QQuickOpacityAnimatorJob::writeBack()
 
 void QQuickOpacityAnimatorJob::updateCurrentTime(int time)
 {
-#if QT_CONFIG(opengl)
-    Q_ASSERT(!m_controller || !m_controller->m_window->openglContext() || m_controller->m_window->openglContext()->thread() == QThread::currentThread());
-#endif
-
     if (!m_opacityNode)
         return;
 
@@ -612,7 +596,7 @@ void QQuickOpacityAnimatorJob::updateCurrentTime(int time)
 }
 
 
-#if QT_CONFIG(quick_shadereffect) && QT_CONFIG(opengl)
+#if 0 // QTBUG-83976
 QQuickUniformAnimatorJob::QQuickUniformAnimatorJob()
     : m_node(nullptr)
     , m_uniformIndex(-1)
diff --git a/src/quick/util/qquickanimatorjob_p.h b/src/quick/util/qquickanimatorjob_p.h
index 74085526c0..eaec1946ba 100644
--- a/src/quick/util/qquickanimatorjob_p.h
+++ b/src/quick/util/qquickanimatorjob_p.h
@@ -69,7 +69,7 @@ class QQuickAbstractAnimation;
 
 class QQuickAnimatorController;
 class QQuickAnimatorProxyJobPrivate;
-class QQuickOpenGLShaderEffectNode;
+class QQuickShaderEffectNode;
 
 class QSGOpacityNode;
 
@@ -289,7 +289,7 @@ public:
 private:
     QSGOpacityNode *m_opacityNode;
 };
-#if QT_CONFIG(opengl)
+#if 0 // QTBUG-83976
 class Q_QUICK_PRIVATE_EXPORT QQuickUniformAnimatorJob : public QQuickAnimatorJob
 {
 public:
-- 
cgit v1.2.3