1 files changed, 17 insertions, 54 deletions

diff --git a/src/quick/scenegraph/qsgdefaultrendercontext_p.h b/src/quick/scenegraph/qsgdefaultrendercontext_p.h
index 002513c0e4..c3352aa89f 100644
--- a/src/quick/scenegraph/qsgdefaultrendercontext_p.h
+++ b/src/quick/scenegraph/qsgdefaultrendercontext_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 QSGDEFAULTRENDERCONTEXT_H
 #define QSGDEFAULTRENDERCONTEXT_H
@@ -52,13 +16,15 @@
 //
 
 #include <QtQuick/private/qsgcontext_p.h>
-#include <QtGui/private/qshader_p.h>
+#include <rhi/qshader.h>
 
 QT_BEGIN_NAMESPACE
 
 class QRhi;
 class QRhiCommandBuffer;
 class QRhiRenderPassDescriptor;
+class QRhiResourceUpdateBatch;
+class QRhiTexture;
 class QSGMaterialShader;
 class QSurface;
 
@@ -66,7 +32,7 @@ namespace QSGRhiAtlasTexture {
     class Manager;
 }
 
-class Q_QUICK_PRIVATE_EXPORT QSGDefaultRenderContext : public QSGRenderContext
+class Q_QUICK_EXPORT QSGDefaultRenderContext : public QSGRenderContext
 {
     Q_OBJECT
 public:
@@ -94,23 +60,17 @@ public:
                      QRhiCommandBuffer *cb,
                      const QQuickGraphicsConfiguration &config) override;
 
-    void beginNextFrame(QSGRenderer *renderer,
+    void beginNextFrame(QSGRenderer *renderer, const QSGRenderTarget &renderTarget,
                         RenderPassCallback mainPassRecordingStart,
                         RenderPassCallback mainPassRecordingEnd,
                         void *callbackUserData) override;
     void renderNextFrame(QSGRenderer *renderer) override;
     void endNextFrame(QSGRenderer *renderer) override;
 
-    void beginNextRhiFrame(QSGRenderer *renderer,
-                           QRhiRenderTarget *rt, QRhiRenderPassDescriptor *rp, QRhiCommandBuffer *cb,
-                           RenderPassCallback mainPassRecordingStart,
-                           RenderPassCallback mainPassRecordingEnd,
-                           void *callbackUserData) override;
-    void renderNextRhiFrame(QSGRenderer *renderer) override;
-    void endNextRhiFrame(QSGRenderer *renderer) override;
-
     void preprocess() override;
+    void invalidateGlyphCaches() override;
     QSGDistanceFieldGlyphCache *distanceFieldGlyphCache(const QRawFont &font, int renderTypeQuality) override;
+    QSGCurveGlyphAtlas *curveGlyphAtlas(const QRawFont &font) override;
 
     QSGTexture *createTexture(const QImage &image, uint flags) const override;
     QSGRenderer *createRenderer(QSGRendererInterface::RenderMode renderMode = QSGRendererInterface::RenderMode2D) override;
@@ -119,7 +79,6 @@ public:
     virtual void initializeRhiShader(QSGMaterialShader *shader, QShader::Variant shaderVariant);
 
     int maxTextureSize() const override { return m_maxTextureSize; }
-    bool separateIndexBuffer() const { return m_separateIndexBuffer; }
     bool useDepthBufferFor2D() const { return m_useDepthBufferFor2D; }
     int msaaSampleCount() const { return m_initParams.sampleCount; }
 
@@ -143,19 +102,23 @@ public:
         return m_currentDevicePixelRatio;
     }
 
-protected:
-    static QString fontKey(const QRawFont &font, int renderTypeQuality);
+    QRhiResourceUpdateBatch *maybeGlyphCacheResourceUpdates();
+    QRhiResourceUpdateBatch *glyphCacheResourceUpdates();
+    void deferredReleaseGlyphCacheTexture(QRhiTexture *texture);
+    void resetGlyphCacheResources();
 
+protected:
     InitParams m_initParams;
     QRhi *m_rhi;
     int m_maxTextureSize;
-    bool m_serializedRender;
     QSGRhiAtlasTexture::Manager *m_rhiAtlasManager;
     QRhiCommandBuffer *m_currentFrameCommandBuffer;
     QRhiRenderPassDescriptor *m_currentFrameRenderPass;
     qreal m_currentDevicePixelRatio;
-    bool m_separateIndexBuffer;
     bool m_useDepthBufferFor2D;
+    QRhiResourceUpdateBatch *m_glyphCacheResourceUpdates;
+    QSet<QRhiTexture *> m_pendingGlyphCacheTextures;
+    QHash<FontKey, QSGCurveGlyphAtlas *> m_curveGlyphAtlases;
 };
 
 QT_END_NAMESPACE