diff options
Diffstat (limited to 'src/quick/scenegraph')
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp | 67 | ||||
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h | 5 | ||||
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterial.h | 2 | ||||
-rw-r--r-- | src/quick/scenegraph/qsgcontext.cpp | 19 | ||||
-rw-r--r-- | src/quick/scenegraph/qsgcontext_p.h | 4 | ||||
-rw-r--r-- | src/quick/scenegraph/qsgrenderloop.cpp | 23 | ||||
-rw-r--r-- | src/quick/scenegraph/qsgrenderloop_p.h | 3 | ||||
-rw-r--r-- | src/quick/scenegraph/qsgthreadedrenderloop.cpp | 2 | ||||
-rw-r--r-- | src/quick/scenegraph/qsgwindowsrenderloop.cpp | 2 |
9 files changed, 80 insertions, 47 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp index 9de7bb8667..8dfa0d2c2c 100644 --- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Jolla Ltd, author: <gunnar.sletta@jollamobile.com> ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQuick module of the Qt Toolkit. @@ -317,7 +318,7 @@ void Updater::updateStates(QSGNode *n) void Updater::visitNode(Node *n) { - if (m_added == 0 && n->dirtyState == 0 && m_force_update == 0 && m_transformChange == 0) + if (m_added == 0 && n->dirtyState == 0 && m_force_update == 0 && m_transformChange == 0 && m_opacityChange == 0) return; int count = m_added; @@ -394,13 +395,10 @@ void Updater::visitOpacityNode(Node *n) if (was != is) { renderer->m_rebuild = Renderer::FullRebuild; n->isOpaque = is; - } else if (!is) { - renderer->invalidateAlphaBatchesForRoot(m_roots.last()); - renderer->m_rebuild |= Renderer::BuildBatches; } - ++m_force_update; + ++m_opacityChange; SHADOWNODE_TRAVERSE(n) visitNode(*child); - --m_force_update; + --m_opacityChange; } else { if (m_added > 0) n->isOpaque = on->opacity() > OPAQUE_LIMIT; @@ -491,9 +489,16 @@ void Updater::visitGeometryNode(Node *n) } else { renderer->m_rebuild |= Renderer::FullRebuild; } - } else if (m_transformChange) { - Element *e = n->element(); - e->translateOnlyToRoot = QMatrix4x4_Accessor::isTranslate(*gn->matrix()); + } else { + if (m_transformChange) { + Element *e = n->element(); + e->translateOnlyToRoot = QMatrix4x4_Accessor::isTranslate(*gn->matrix()); + } + if (m_opacityChange) { + Element *e = n->element(); + if (e->batch) + renderer->invalidateBatchAndOverlappingRenderOrders(e->batch); + } } SHADOWNODE_TRAVERSE(n) visitNode(*child); @@ -971,12 +976,7 @@ void Renderer::nodeWasTransformed(Node *node, int *vertexCount) e->boundsComputed = false; if (e->batch) { if (!e->batch->isOpaque) { - if (e->root) { - m_taggedRoots << e->root; - m_rebuild |= BuildRenderListsForTaggedRoots; - } else { - m_rebuild |= FullRebuild; - } + invalidateBatchAndOverlappingRenderOrders(e->batch); } else if (e->batch->merged) { e->batch->needsUpload = true; } @@ -1176,15 +1176,8 @@ void Renderer::nodeChanged(QSGNode *node, QSGNode::DirtyState state) e->boundsComputed = false; Batch *b = e->batch; if (b) { - if (!e->batch->geometryWasChanged(gn)) { - m_rebuild |= Renderer::FullRebuild; - } else if (!b->isOpaque) { - if (e->root) { - m_taggedRoots << e->root; - m_rebuild |= BuildRenderListsForTaggedRoots; - } else { - m_rebuild |= FullRebuild; - } + if (!e->batch->geometryWasChanged(gn) || !e->batch->isOpaque) { + invalidateBatchAndOverlappingRenderOrders(e->batch); } else { b->needsUpload = true; } @@ -1197,7 +1190,7 @@ void Renderer::nodeChanged(QSGNode *node, QSGNode::DirtyState state) if (e) { if (e->batch) { if (!e->batch->isMaterialCompatible(e)) - m_rebuild = Renderer::FullRebuild; + invalidateBatchAndOverlappingRenderOrders(e->batch); } else { m_rebuild |= Renderer::BuildBatches; } @@ -1427,13 +1420,26 @@ void Renderer::buildRenderListsFromScratch() buildRenderLists(rootNode()); } -void Renderer::invalidateAlphaBatchesForRoot(Node *root) +void Renderer::invalidateBatchAndOverlappingRenderOrders(Batch *batch) { + Q_ASSERT(batch); + Q_ASSERT(batch->first); + + int first = batch->first->order; + int last = batch->lastOrderInBatch; + batch->invalidate(); + for (int i=0; i<m_alphaBatches.size(); ++i) { Batch *b = m_alphaBatches.at(i); - if (b->root == root || root == 0) - b->invalidate(); + if (b->first) { + int bf = b->first->order; + int bl = b->lastOrderInBatch; + if (bl > first && bf < last) + b->invalidate(); + } } + + m_rebuild |= BuildBatches; } /* Clean up batches by making it a consecutive list of "valid" @@ -1493,6 +1499,8 @@ void Renderer::prepareOpaqueBatches() next = ej; } } + + batch->lastOrderInBatch = next->order; } } @@ -1595,6 +1603,8 @@ void Renderer::prepareAlphaBatches() overlapBounds |= ej->bounds; } } + + batch->lastOrderInBatch = next->order; } @@ -2329,7 +2339,6 @@ void Renderer::render() type += " batches"; } - qDebug() << "Renderer::render()" << this << type; } diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h index d22ab4069e..c38c483df4 100644 --- a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h +++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h @@ -264,6 +264,8 @@ struct Batch int vertexCount; int indexCount; + int lastOrderInBatch; + uint isOpaque : 1; uint needsUpload : 1; uint merged : 1; @@ -351,6 +353,7 @@ private: int m_added; int m_transformChange; + int m_opacityChange; QMatrix4x4 m_identityMatrix; }; @@ -431,7 +434,7 @@ private: void prepareOpaqueBatches(); bool checkOverlap(int first, int last, const Rect &bounds); void prepareAlphaBatches(); - void invalidateAlphaBatchesForRoot(Node *root); + void invalidateBatchAndOverlappingRenderOrders(Batch *batch); void uploadBatch(Batch *b); void uploadMergedElement(Element *e, int vaOffset, char **vertexData, char **zData, char **indexData, quint16 *iBase, int *indexCount); diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h index bfe570ca02..98f4d8aecf 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.h +++ b/src/quick/scenegraph/coreapi/qsgmaterial.h @@ -103,7 +103,7 @@ protected: Q_DECLARE_PRIVATE(QSGMaterialShader) QSGMaterialShader(QSGMaterialShaderPrivate &dd); - friend class QSGContext; + friend class QSGRenderContext; friend class QSGBatchRenderer::ShaderManager; void setShaderSourceFile(QOpenGLShader::ShaderType type, const QString &sourceFile); diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp index 202ae91ac3..dd00f75fae 100644 --- a/src/quick/scenegraph/qsgcontext.cpp +++ b/src/quick/scenegraph/qsgcontext.cpp @@ -174,6 +174,11 @@ QSGContext::~QSGContext() { } +QSGRenderContext *QSGContext::createRenderContext() +{ + return new QSGRenderContext(this); +} + /*! * This function is used by the Qt WebEngine to set up context sharing * across multiple windows. Do not use it for any other purpose. @@ -423,6 +428,20 @@ void QSGRenderContext::registerFontengineForCleanup(QFontEngine *engine) } /*! + compile/initialize are protected member functions of QSGMaterialShader. + We expose them here for custom renderers. + */ +void QSGRenderContext::compileShader(QSGMaterialShader *shader) +{ + shader->compile(); +} + +void QSGRenderContext::initializeShader(QSGMaterialShader *shader) +{ + shader->initialize(); +} + +/*! Initializes the scene graph render context with the GL context \a context. This also emits the ready() signal so that the QML graph can start building scene graph nodes. */ diff --git a/src/quick/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h index 883287e35d..3b58cecd6a 100644 --- a/src/quick/scenegraph/qsgcontext_p.h +++ b/src/quick/scenegraph/qsgcontext_p.h @@ -112,6 +112,9 @@ public: bool hasBrokenIndexBufferObjects() const { return m_brokenIBOs; } + void compileShader(QSGMaterialShader *shader); + void initializeShader(QSGMaterialShader *shader); + Q_SIGNALS: void initialized(); void invalidated(); @@ -155,6 +158,7 @@ public: virtual void renderContextInitialized(QSGRenderContext *renderContext); virtual void renderContextInvalidated(QSGRenderContext *renderContext); + virtual QSGRenderContext *createRenderContext(); virtual QSGRectangleNode *createRectangleNode(); virtual QSGImageNode *createImageNode(); diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp index 5559745621..7b6e6d55ee 100644 --- a/src/quick/scenegraph/qsgrenderloop.cpp +++ b/src/quick/scenegraph/qsgrenderloop.cpp @@ -45,6 +45,7 @@ #include <QtCore/QCoreApplication> #include <QtCore/QTime> +#include <QtCore/QScopedPointer> #include <QtCore/private/qabstractanimation_p.h> #include <QtGui/QOpenGLContext> @@ -76,7 +77,7 @@ extern Q_GUI_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_ DEFINE_BOOL_CONFIG_OPTION(qmlNoThreadedRenderer, QML_BAD_GUI_RENDER_LOOP); DEFINE_BOOL_CONFIG_OPTION(qmlForceThreadedRenderer, QML_FORCE_THREADED_RENDERER); // Might trigger graphics driver threading bugs, use at own risk -QSGRenderLoop *QSGRenderLoop::s_instance = 0; +Q_GLOBAL_STATIC(QScopedPointer<QSGRenderLoop>, s_renderLoopInstance); QSGRenderLoop::~QSGRenderLoop() { @@ -142,8 +143,8 @@ bool QSGRenderLoop::useConsistentTiming() QSGRenderLoop *QSGRenderLoop::instance() { - if (!s_instance) { - s_instance = QSGContext::createWindowManager(); + if (s_renderLoopInstance->isNull()) { + s_renderLoopInstance->reset(QSGContext::createWindowManager()); bool info = qEnvironmentVariableIsSet("QSG_INFO"); @@ -153,7 +154,7 @@ QSGRenderLoop *QSGRenderLoop::instance() qDebug() << "QSG: using fixed animation steps"; } - if (!s_instance) { + if (s_renderLoopInstance->isNull()) { enum RenderLoopType { BasicRenderLoop, @@ -185,26 +186,26 @@ QSGRenderLoop *QSGRenderLoop::instance() switch (loopType) { case ThreadedRenderLoop: if (info) qDebug() << "QSG: threaded render loop"; - s_instance = new QSGThreadedRenderLoop(); + s_renderLoopInstance->reset(new QSGThreadedRenderLoop()); break; case WindowsRenderLoop: if (info) qDebug() << "QSG: windows render loop"; - s_instance = new QSGWindowsRenderLoop(); + s_renderLoopInstance->reset(new QSGWindowsRenderLoop()); break; default: if (info) qDebug() << "QSG: basic render loop"; - s_instance = new QSGGuiThreadRenderLoop(); + s_renderLoopInstance->reset(new QSGGuiThreadRenderLoop()); break; } } } - return s_instance; + return s_renderLoopInstance->data(); } void QSGRenderLoop::setInstance(QSGRenderLoop *instance) { - Q_ASSERT(!s_instance); - s_instance = instance; + Q_ASSERT(!s_renderLoopInstance); + s_renderLoopInstance->reset(instance); } QSGGuiThreadRenderLoop::QSGGuiThreadRenderLoop() @@ -212,7 +213,7 @@ QSGGuiThreadRenderLoop::QSGGuiThreadRenderLoop() , eventPending(false) { sg = QSGContext::createDefaultContext(); - rc = new QSGRenderContext(sg); + rc = sg->createRenderContext(); } QSGGuiThreadRenderLoop::~QSGGuiThreadRenderLoop() diff --git a/src/quick/scenegraph/qsgrenderloop_p.h b/src/quick/scenegraph/qsgrenderloop_p.h index 72bad16c63..46edd77eda 100644 --- a/src/quick/scenegraph/qsgrenderloop_p.h +++ b/src/quick/scenegraph/qsgrenderloop_p.h @@ -88,9 +88,6 @@ public: Q_SIGNALS: void timeToIncubate(); - -private: - static QSGRenderLoop *s_instance; }; QT_END_NAMESPACE diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp index bc08b70557..7cc4293f6c 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp +++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp @@ -706,7 +706,7 @@ QSGThreadedRenderLoop::QSGThreadedRenderLoop() QSGRenderContext *QSGThreadedRenderLoop::createRenderContext(QSGContext *sg) const { - return new QSGRenderContext(sg); + return sg->createRenderContext(); } void QSGThreadedRenderLoop::maybePostPolishRequest(Window *w) diff --git a/src/quick/scenegraph/qsgwindowsrenderloop.cpp b/src/quick/scenegraph/qsgwindowsrenderloop.cpp index c3656eac7a..63e3e958f6 100644 --- a/src/quick/scenegraph/qsgwindowsrenderloop.cpp +++ b/src/quick/scenegraph/qsgwindowsrenderloop.cpp @@ -85,7 +85,7 @@ QSGWindowsRenderLoop::QSGWindowsRenderLoop() qsg_debug_timer.start(); #endif - m_rc = new QSGRenderContext(m_sg); + m_rc = m_sg->createRenderContext(); m_animationDriver = m_sg->createAnimationDriver(m_sg); m_animationDriver->install(); |