diff options
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsgrenderer.cpp')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgrenderer.cpp | 57 |
1 files changed, 13 insertions, 44 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgrenderer.cpp b/src/quick/scenegraph/coreapi/qsgrenderer.cpp index 4b3cd9f2c1..ffa3047850 100644 --- a/src/quick/scenegraph/coreapi/qsgrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgrenderer.cpp @@ -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 #include "qsgrenderer_p.h" #include "qsgnodeupdater_p.h" @@ -50,12 +14,19 @@ static QElapsedTimer frameTimer; static qint64 preprocessTime; static qint64 updatePassTime; +Q_TRACE_POINT(qtquick, QSG_preprocess_entry) +Q_TRACE_POINT(qtquick, QSG_preprocess_exit) +Q_TRACE_POINT(qtquick, QSG_update_entry) +Q_TRACE_POINT(qtquick, QSG_update_exit) +Q_TRACE_POINT(qtquick, QSG_renderScene_entry) +Q_TRACE_POINT(qtquick, QSG_renderScene_exit) + int qt_sg_envInt(const char *name, int defaultValue) { if (Q_LIKELY(!qEnvironmentVariableIsSet(name))) return defaultValue; bool ok = false; - int value = qgetenv(name).toInt(&ok); + int value = qEnvironmentVariableIntValue(name, &ok); return ok ? value : defaultValue; } @@ -95,15 +66,13 @@ QSGRenderer::QSGRenderer(QSGRenderContext *context) , m_current_uniform_data(nullptr) , m_current_resource_update_batch(nullptr) , m_rhi(nullptr) - , m_rt(nullptr) - , m_cb(nullptr) - , m_rp_desc(nullptr) - , m_external_rp_desc(nullptr) , m_node_updater(nullptr) , m_changed_emitted(false) , m_is_rendering(false) , m_is_preprocessing(false) { + m_current_projection_matrix.resize(1); + m_current_projection_matrix_native_ndc.resize(1); } @@ -143,7 +112,7 @@ void QSGRenderer::setNodeUpdater(QSGNodeUpdater *updater) bool QSGRenderer::isMirrored() const { - QMatrix4x4 matrix = projectionMatrix(); + QMatrix4x4 matrix = projectionMatrix(0); // Mirrored relative to the usual Qt coordinate system with origin in the top left corner. return matrix(0, 0) * matrix(1, 1) - matrix(0, 1) * matrix(1, 0) > 0; } |