diff options
Diffstat (limited to 'src/quick/scenegraph')
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp | 14 | ||||
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h | 1 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp index 375ffac60b..688a5fcb44 100644 --- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp @@ -2531,17 +2531,6 @@ void Renderer::deleteRemovedElements() m_elementsToDelete.reset(); } -void Renderer::preprocess() -{ - // Bind our VAO. It's important that we do this here as the - // QSGRenderer::preprocess() call may well do work that requires - // a bound VAO. - if (m_vao) - m_vao->bind(); - - QSGRenderer::preprocess(); -} - void Renderer::render() { if (Q_UNLIKELY(debug_dump())) { @@ -2568,6 +2557,9 @@ void Renderer::render() qDebug() << "Renderer::render()" << this << type; } + if (m_vao) + m_vao->bind(); + if (m_rebuild & (BuildRenderLists | BuildRenderListsForTaggedRoots)) { bool complete = (m_rebuild & BuildRenderLists) != 0; if (complete) diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h index 50bea04f23..7fa5b21d7a 100644 --- a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h +++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h @@ -530,7 +530,6 @@ public: protected: void nodeChanged(QSGNode *node, QSGNode::DirtyState state); - void preprocess() Q_DECL_OVERRIDE; void render(); private: |