diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2020-06-03 11:18:13 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2020-06-04 16:20:26 +0200 |
| commit | 70dd5e24ce29adeab48932082863b3e3e3e4ba47 (patch) | |
| tree | 40431af347a2a908d6314e2f765ed54ab9c9c0ae /src/quick/items/qquickrendercontrol.cpp | |
| parent | a2a9be9fa80c61464ef30cfcc7ceef42ddac73e2 (diff) | |
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>
Diffstat (limited to 'src/quick/items/qquickrendercontrol.cpp')
| -rw-r--r-- | src/quick/items/qquickrendercontrol.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp index 79cf8b73bc..6a84f55578 100644 --- a/src/quick/items/qquickrendercontrol.cpp +++ b/src/quick/items/qquickrendercontrol.cpp @@ -46,11 +46,10 @@ #include <QtQuick/private/qsgdefaultrendercontext_p.h> #include <QtQuick/private/qsgrhisupport_p.h> +#include <private/qsgrhishadereffectnode_p.h> + #if QT_CONFIG(opengl) # include <QOpenGLContext> -#if QT_CONFIG(quick_shadereffect) -# include <QtQuick/private/qquickopenglshadereffectnode_p.h> -#endif #endif #include <QtGui/private/qguiapplication_p.h> #include <qpa/qplatformintegration.h> @@ -207,12 +206,9 @@ void QQuickRenderControlPrivate::windowDestroyed() rc->invalidate(); QQuickWindowPrivate::get(window)->animationController.reset(); - -#if QT_CONFIG(quick_shadereffect) && QT_CONFIG(opengl) - if (QOpenGLContext::currentContext()) - QQuickOpenGLShaderEffectMaterial::cleanupMaterialCache(); +#if QT_CONFIG(quick_shadereffect) + QSGRhiShaderEffectNode::cleanupMaterialTypeCache(); #endif - window = nullptr; } } |