diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:52:20 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:52:20 +0100 |
| commit | 54535dec77e0855ba8268512399ad6f87c25adce (patch) | |
| tree | 00f56189168e02fcf4717e2343406cad07057604 /src/render | |
| parent | ecd193d7b5788fca8b478a02068060a078dc5738 (diff) | |
| parent | 96b1b9e3e198e751bb96eeb279106862ca38e7d7 (diff) | |
Merge remote-tracking branch 'origin/5.14.0' into 5.14
Change-Id: Ibf5f508eec94be4bae2df3ce2e1511de696dcd72
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/backend/abstractrenderer_p.h | 2 | ||||
| -rw-r--r-- | src/render/renderers/opengl/renderer/renderer.cpp | 3 | ||||
| -rw-r--r-- | src/render/renderers/opengl/renderer/renderer_p.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/render/backend/abstractrenderer_p.h b/src/render/backend/abstractrenderer_p.h index b618eda55..c8dd537c7 100644 --- a/src/render/backend/abstractrenderer_p.h +++ b/src/render/backend/abstractrenderer_p.h @@ -151,7 +151,7 @@ public: #if defined(QT_BUILD_INTERNAL) virtual void clearDirtyBits(BackendNodeDirtySet changes) = 0; #endif - virtual bool shouldRender() = 0; + virtual bool shouldRender() const = 0; virtual void skipNextFrame() = 0; virtual QVector<Qt3DCore::QAspectJobPtr> preRenderingJobs() = 0; diff --git a/src/render/renderers/opengl/renderer/renderer.cpp b/src/render/renderers/opengl/renderer/renderer.cpp index d79750726..d61d1d8ac 100644 --- a/src/render/renderers/opengl/renderer/renderer.cpp +++ b/src/render/renderers/opengl/renderer/renderer.cpp @@ -1753,12 +1753,11 @@ void Renderer::clearDirtyBits(BackendNodeDirtySet changes) } #endif -bool Renderer::shouldRender() +bool Renderer::shouldRender() const { // Only render if something changed during the last frame, or the last frame // was not rendered successfully (or render-on-demand is disabled) return (m_settings->renderPolicy() == QRenderSettings::Always - || m_renderThread == nullptr // <==> we use Scene3D || m_dirtyBits.marked != 0 || m_dirtyBits.remaining != 0 || !m_lastFrameCorrect.loadRelaxed()); diff --git a/src/render/renderers/opengl/renderer/renderer_p.h b/src/render/renderers/opengl/renderer/renderer_p.h index b2889bb0e..ee01754d3 100644 --- a/src/render/renderers/opengl/renderer/renderer_p.h +++ b/src/render/renderers/opengl/renderer/renderer_p.h @@ -207,7 +207,7 @@ public: #if defined(QT_BUILD_INTERNAL) void clearDirtyBits(BackendNodeDirtySet changes) override; #endif - bool shouldRender() override; + bool shouldRender() const override; void skipNextFrame() override; QVector<Qt3DCore::QAspectJobPtr> preRenderingJobs() override; |