diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-10-07 09:33:50 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-10-07 10:18:17 +0200 |
| commit | dce305c4041a6ee65d486f3b31dc49c274ecdcbd (patch) | |
| tree | cc06cbc073270c5cc5dc960b042c562d70114887 | |
| parent | 74c898d5f5891553500426592a16419bd83776da (diff) | |
Revert "Temporarily drop a debug mode check in rhi-based stenciling"
The qt5 submodule update is now done in qtbase, so the code here can
now be migrated to follow the QRhi (private) API changes.
This reverts commit 7661b142a130df54af3a5430a29e3c82da086c7b.
Task-number: QTBUG-78995
Change-Id: I6995cd5e14b75622a51c9e95fb3178485d67d63d
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp index c8f1ebd986..34027cbac7 100644 --- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp @@ -2848,10 +2848,8 @@ void Renderer::updateClipState(const QSGClipNode *clipList, Batch *batch) // RHI else { if (qsg_topology(g->drawingMode()) != m_stencilClipCommon.topology) qWarning("updateClipState: Clip list entries have different primitive topologies, this is not currently supported."); -#if 0 // ### restore once the 5.14 submodule update is done - if (qsg_vertexInputFormat(*a) != m_stencilClipCommon.inputLayout.attributes().first().format()) + if (qsg_vertexInputFormat(*a) != m_stencilClipCommon.inputLayout.cbeginAttributes()->format()) qWarning("updateClipState: Clip list entries have different vertex input layouts, this is must not happen."); -#endif } #endif |