diff options
author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 16:25:06 +0100 |
---|---|---|
committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 16:25:06 +0100 |
commit | 1d333d3375874efb8d37df37dc5ef561573794ad (patch) | |
tree | 2d8c995f64c05c84c1fcceb2c5cb40fcae69855f /examples/quick/scenegraph/rendernode/customrenderitem.cpp | |
parent | b106d86c433706928b0b0c206a0d9f831681e1bf (diff) | |
parent | e79a2658cde899d6ee11ec3c0d0a3768eb2c864b (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736
Diffstat (limited to 'examples/quick/scenegraph/rendernode/customrenderitem.cpp')
-rw-r--r-- | examples/quick/scenegraph/rendernode/customrenderitem.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/examples/quick/scenegraph/rendernode/customrenderitem.cpp b/examples/quick/scenegraph/rendernode/customrenderitem.cpp index e55cf0a2f4..aae91120a7 100644 --- a/examples/quick/scenegraph/rendernode/customrenderitem.cpp +++ b/examples/quick/scenegraph/rendernode/customrenderitem.cpp @@ -53,8 +53,9 @@ #include <QSGRendererInterface> #include "openglrenderer.h" +#ifdef Q_OS_MACOS #include "metalrenderer.h" -#include "d3d12renderer.h" +#endif #include "softwarerenderer.h" //! [1] @@ -101,14 +102,6 @@ QSGNode *CustomRenderItem::updatePaintNode(QSGNode *node, UpdatePaintNodeData *) #endif break; - case QSGRendererInterface::Direct3D12: // ### Qt 6: remove -#if QT_CONFIG(d3d12) - if (!n) - n = new D3D12RenderNode; - static_cast<D3D12RenderNode *>(n)->sync(this); -#endif - break; - case QSGRendererInterface::Software: if (!n) n = new SoftwareRenderNode; |