diff options
Diffstat (limited to 'src/quick/scenegraph/qsgrhitextureglyphcache_p.h')
| -rw-r--r-- | src/quick/scenegraph/qsgrhitextureglyphcache_p.h | 50 |
1 files changed, 8 insertions, 42 deletions
diff --git a/src/quick/scenegraph/qsgrhitextureglyphcache_p.h b/src/quick/scenegraph/qsgrhitextureglyphcache_p.h index c3964ee09f..fbe020c3a2 100644 --- a/src/quick/scenegraph/qsgrhitextureglyphcache_p.h +++ b/src/quick/scenegraph/qsgrhitextureglyphcache_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 QSGRHITEXTUREGLYPHCACHE_P_H #define QSGRHITEXTUREGLYPHCACHE_P_H @@ -52,14 +16,17 @@ // #include <QtGui/private/qtextureglyphcache_p.h> -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> QT_BEGIN_NAMESPACE +class QSGDefaultRenderContext; + class QSGRhiTextureGlyphCache : public QImageTextureGlyphCache { public: - QSGRhiTextureGlyphCache(QRhi *rhi, QFontEngine::GlyphFormat format, const QTransform &matrix, + QSGRhiTextureGlyphCache(QSGDefaultRenderContext *rc, + QFontEngine::GlyphFormat format, const QTransform &matrix, const QColor &color = QColor()); ~QSGRhiTextureGlyphCache(); @@ -86,14 +53,13 @@ private: void prepareGlyphImage(QImage *img); QRhiTexture *createEmptyTexture(QRhiTexture::Format format); + QSGDefaultRenderContext *m_rc; QRhi *m_rhi; bool m_resizeWithTextureCopy; - QRhiResourceUpdateBatch *m_resourceUpdates = nullptr; QRhiTexture *m_texture = nullptr; QSize m_size; bool m_bgra = false; QVarLengthArray<QRhiTextureUploadEntry, 16> m_uploads; - QSet<QRhiTexture *> m_pendingDispose; }; QT_END_NAMESPACE |