diff options
Diffstat (limited to 'src/quick/scenegraph/qsgthreadedrenderloop_p.h')
-rw-r--r-- | src/quick/scenegraph/qsgthreadedrenderloop_p.h | 56 |
1 files changed, 14 insertions, 42 deletions
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop_p.h b/src/quick/scenegraph/qsgthreadedrenderloop_p.h index b8fae8e8da..5d209f2f0f 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop_p.h +++ b/src/quick/scenegraph/qsgthreadedrenderloop_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQuick module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QSGTHREADEDRENDERLOOP_P_H #define QSGTHREADEDRENDERLOOP_P_H @@ -52,7 +16,7 @@ // #include <QtCore/QThread> -#include <QtGui/QOpenGLContext> +#include <QtCore/QElapsedTimer> #include <private/qsgcontext_p.h> #include "qsgrenderloop_p.h" @@ -70,6 +34,7 @@ public: void show(QQuickWindow *) override {} void hide(QQuickWindow *) override; + void resize(QQuickWindow *window) override; void windowDestroyed(QQuickWindow *window) override; void exposureChanged(QQuickWindow *window) override; @@ -101,12 +66,18 @@ private: QQuickWindow *window; QSGRenderThread *thread; QSurfaceFormat actualWindowFormat; + QElapsedTimer timeBetweenPolishAndSyncs; + float psTimeAccumulator; + int psTimeSampleCount; uint updateDuringSync : 1; uint forceRenderPass : 1; + uint badVSync : 1; }; friend class QSGRenderThread; + + Window *windowFor(QQuickWindow *window); void releaseResources(Window *window, bool inDestructor); bool checkAndResetForceUpdate(QQuickWindow *window); @@ -114,14 +85,16 @@ private: void initialize(); void startOrStopAnimationTimer(); - void maybePostPolishRequest(Window *w); + void postUpdateRequest(Window *w); void waitForReleaseComplete(); void polishAndSync(Window *w, bool inExpose = false); void maybeUpdate(Window *window); void handleExposure(QQuickWindow *w); void handleObscurity(Window *w); + void releaseSwapchain(QQuickWindow *window); + bool eventFilter(QObject *watched, QEvent *event) override; QSGContext *sg; // Set of contexts that have been created but are now owned by @@ -133,10 +106,9 @@ private: int m_animation_timer; bool m_lockedForSync; + bool m_inPolish = false; }; - - QT_END_NAMESPACE #endif // QSGTHREADEDRENDERLOOP_P_H |