diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-22 07:34:02 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-22 07:34:02 +0200 |
| commit | 1dafbae0006de63621b7721cca7557756fcfd8ba (patch) | |
| tree | c127743200fb1696e146aa782826b886ab6b6794 /src/quick/scenegraph/qsgrhisupport.cpp | |
| parent | 5728f48834b9225a36d3e1dae44ced7579cde358 (diff) | |
| parent | 6555642db7b3b992335f98dc01863db4beea3fd4 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iafb7061945e011542fbf0f6ebe776f0a4187b0a4
Diffstat (limited to 'src/quick/scenegraph/qsgrhisupport.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgrhisupport.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/quick/scenegraph/qsgrhisupport.cpp b/src/quick/scenegraph/qsgrhisupport.cpp index b9a81789e0..2a49a0958d 100644 --- a/src/quick/scenegraph/qsgrhisupport.cpp +++ b/src/quick/scenegraph/qsgrhisupport.cpp @@ -38,10 +38,15 @@ ****************************************************************************/ #include "qsgrhisupport_p.h" -#include "qsgdefaultrendercontext_p.h" +#include "qsgcontext_p.h" +#if QT_CONFIG(opengl) +# include "qsgdefaultrendercontext_p.h" +#endif + #include <QtQuick/private/qquickitem_p.h> #include <QtQuick/private/qquickwindow_p.h> +#include <QtGui/qwindow.h> #if QT_CONFIG(vulkan) #include <QtGui/qvulkaninstance.h> #endif @@ -382,9 +387,15 @@ static const void *qsgrhi_mtl_rifResource(QSGRendererInterface::Resource res, co } #endif -const void *QSGRhiSupport::rifResource(QSGRendererInterface::Resource res, const QSGDefaultRenderContext *rc) +const void *QSGRhiSupport::rifResource(QSGRendererInterface::Resource res, + const QSGDefaultRenderContext *rc) { +#if QT_CONFIG(opengl) QRhi *rhi = rc->rhi(); +#else + Q_UNUSED(rc) + QRhi *rhi = nullptr; +#endif if (res == QSGRendererInterface::RhiResource || !rhi) return rhi; |