diff options
Diffstat (limited to 'src/quick/scenegraph/qsgdefaultspritenode.cpp')
-rw-r--r-- | src/quick/scenegraph/qsgdefaultspritenode.cpp | 66 |
1 files changed, 17 insertions, 49 deletions
diff --git a/src/quick/scenegraph/qsgdefaultspritenode.cpp b/src/quick/scenegraph/qsgdefaultspritenode.cpp index e1a0c34858..242c844e9c 100644 --- a/src/quick/scenegraph/qsgdefaultspritenode.cpp +++ b/src/quick/scenegraph/qsgdefaultspritenode.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 "qsgdefaultspritenode_p.h" @@ -89,7 +53,7 @@ QQuickSpriteMaterial::~QQuickSpriteMaterial() class SpriteMaterialRhiShader : public QSGMaterialShader { public: - SpriteMaterialRhiShader(); + SpriteMaterialRhiShader(int viewCount); bool updateUniformData(RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override; @@ -97,10 +61,10 @@ public: QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override; }; -SpriteMaterialRhiShader::SpriteMaterialRhiShader() +SpriteMaterialRhiShader::SpriteMaterialRhiShader(int viewCount) { - setShaderFileName(VertexStage, QStringLiteral(":/qt-project.org/scenegraph/shaders_ng/sprite.vert.qsb")); - setShaderFileName(FragmentStage, QStringLiteral(":/qt-project.org/scenegraph/shaders_ng/sprite.frag.qsb")); + setShaderFileName(VertexStage, QStringLiteral(":/qt-project.org/scenegraph/shaders_ng/sprite.vert.qsb"), viewCount); + setShaderFileName(FragmentStage, QStringLiteral(":/qt-project.org/scenegraph/shaders_ng/sprite.frag.qsb"), viewCount); } bool SpriteMaterialRhiShader::updateUniformData(RenderState &state, @@ -116,20 +80,24 @@ bool SpriteMaterialRhiShader::updateUniformData(RenderState &state, QByteArray *buf = state.uniformData(); Q_ASSERT(buf->size() >= 96); - if (state.isMatrixDirty()) { - const QMatrix4x4 m = state.combinedMatrix(); - memcpy(buf->data(), m.constData(), 64); - changed = true; + const int shaderMatrixCount = newMaterial->viewCount(); + const int matrixCount = qMin(state.projectionMatrixCount(), shaderMatrixCount); + for (int viewIndex = 0; viewIndex < matrixCount; ++viewIndex) { + if (state.isMatrixDirty()) { + const QMatrix4x4 m = state.combinedMatrix(viewIndex); + memcpy(buf->data() + 64 * viewIndex, m.constData(), 64); + changed = true; + } } float animPosAndData[7] = { mat->animX1, mat->animY1, mat->animX2, mat->animY2, mat->animW, mat->animH, mat->animT }; - memcpy(buf->data() + 64, animPosAndData, 28); + memcpy(buf->data() + 64 * shaderMatrixCount, animPosAndData, 28); changed = true; if (state.isOpacityDirty()) { const float opacity = state.opacity(); - memcpy(buf->data() + 92, &opacity, 4); + memcpy(buf->data() + 64 * shaderMatrixCount + 16 + 12, &opacity, 4); changed = true; } @@ -156,7 +124,7 @@ void SpriteMaterialRhiShader::updateSampledImage(RenderState &state, int binding QSGMaterialShader *QQuickSpriteMaterial::createShader(QSGRendererInterface::RenderMode renderMode) const { Q_UNUSED(renderMode); - return new SpriteMaterialRhiShader; + return new SpriteMaterialRhiShader(viewCount()); } static QSGGeometry::Attribute Sprite_Attributes[] = { |