diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2020-06-16 17:03:47 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2020-06-17 17:42:01 +0200 |
| commit | 83fb4f6743860bfb746e6243aad00513d498db4f (patch) | |
| tree | 816bf1a1d509124c6bfb4fc34cce2a4ed885f40e /src/quick/items/qquickrendercontrol.cpp | |
| parent | 48e919e9647fd07351be37e1ad7efdda9c550be9 (diff) | |
Clean up QT_CONFIG(opengl)
Accelerated graphics is now possible without OpenGL support. With
this change, a Qt build with -no-opengl can still run Qt Quick with
a Vulkan, Metal, or Direct3D backend.
Fixes: QTBUG-84027
Change-Id: Ib63c733d28cfdf7de16b138df136fa7628e1747b
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/quick/items/qquickrendercontrol.cpp')
| -rw-r--r-- | src/quick/items/qquickrendercontrol.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp index 53c0b6b731..51483bce57 100644 --- a/src/quick/items/qquickrendercontrol.cpp +++ b/src/quick/items/qquickrendercontrol.cpp @@ -203,8 +203,7 @@ void QQuickRenderControlPrivate::windowDestroyed() rc->invalidate(); QQuickWindowPrivate::get(window)->animationController.reset(); -// ### Qt 6 clean this up -#if QT_CONFIG(quick_shadereffect) && QT_CONFIG(opengl) +#if QT_CONFIG(quick_shadereffect) QSGRhiShaderEffectNode::cleanupMaterialTypeCache(); #endif window = nullptr; @@ -281,8 +280,6 @@ int QQuickRenderControl::samples() const bool QQuickRenderControl::initialize() { Q_D(QQuickRenderControl); -// ### Qt 6 clean this up -#if QT_CONFIG(opengl) if (!d->window) { qWarning("QQuickRenderControl::initialize called with no associated window"); return false; @@ -306,7 +303,6 @@ bool QQuickRenderControl::initialize() qWarning("QRhi is only compatible with default adaptation"); return false; } -#endif return true; } |