diff options
Diffstat (limited to 'src/quick/scenegraph/qsgrhilayer_p.h')
| -rw-r--r-- | src/quick/scenegraph/qsgrhilayer_p.h | 56 |
1 files changed, 10 insertions, 46 deletions
diff --git a/src/quick/scenegraph/qsgrhilayer_p.h b/src/quick/scenegraph/qsgrhilayer_p.h index 6e3db911fa..922192ec5e 100644 --- a/src/quick/scenegraph/qsgrhilayer_p.h +++ b/src/quick/scenegraph/qsgrhilayer_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 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) 2019 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 QSGRHILAYER_P_H #define QSGRHILAYER_P_H @@ -53,13 +17,13 @@ #include <private/qsgadaptationlayer_p.h> #include <private/qsgcontext_p.h> #include <private/qsgtexture_p.h> -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> QT_BEGIN_NAMESPACE class QSGDefaultRenderContext; -class Q_QUICK_PRIVATE_EXPORT QSGRhiLayer : public QSGLayer +class Q_QUICK_EXPORT QSGRhiLayer : public QSGLayer { Q_OBJECT @@ -71,17 +35,17 @@ public: bool hasAlphaChannel() const override; bool hasMipmaps() const override; - QSize textureSize() const override { return m_size; } + QSize textureSize() const override { return m_pixelSize; } qint64 comparisonKey() const override; QRhiTexture *rhiTexture() const override; void commitTextureOperations(QRhi *rhi, QRhiResourceUpdateBatch *resourceUpdates) override; void setItem(QSGNode *item) override; - void setRect(const QRectF &rect) override; - void setSize(const QSize &size) override; + void setRect(const QRectF &logicalRect) override; + void setSize(const QSize &pixelSize) override; void setHasMipmaps(bool mipmap) override; - void setFormat(uint format) override; + void setFormat(Format format) override; void setLive(bool live) override; void setRecursive(bool recursive) override; void setDevicePixelRatio(qreal ratio) override { m_dpr = ratio; } @@ -102,8 +66,8 @@ private: void releaseResources(); QSGNode *m_item = nullptr; - QRectF m_rect; - QSize m_size; + QRectF m_logicalRect; + QSize m_pixelSize; qreal m_dpr = 1; QRhiTexture::Format m_format = QRhiTexture::RGBA8; |