Remove QSGSharedDistanceFieldGlyphCache.

No known users of this interface exist, and not having it helps to make things
less complicated.

Change-Id: I3d749cfbde9e84e1c7b8dc5cbd952c5c51d347ee
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>

4 files changed, 1 insertions, 815 deletions

diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index 418d571ae6..2af8bc73ba 100644
--- a/src/quick/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -41,7 +41,6 @@
 #include <QtQuick/private/qsgdefaultglyphnode_p.h>
 #include <QtQuick/private/qsgdistancefieldglyphnode_p.h>
 #include <QtQuick/private/qsgdistancefieldglyphnode_p_p.h>
-#include <QtQuick/private/qsgshareddistancefieldglyphcache_p.h>
 #include <QtQuick/private/qsgatlastexture_p.h>
 #include <QtQuick/private/qsgrenderloop_p.h>
 #include <QtQuick/private/qsgdefaultlayer_p.h>
@@ -60,9 +59,6 @@
 #include <QtQuick/private/qsgtexture_p.h>
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtCore/private/qabstractanimation_p.h>
-#include <qpa/qplatformintegration.h>
-
-#include <qpa/qplatformsharedgraphicscache.h>
 
 #include <private/qobject_p.h>
 #include <qmutex.h>
@@ -572,35 +568,7 @@ QSGDistanceFieldGlyphCache *QSGRenderContext::distanceFieldGlyphCache(const QRaw
 
     QSGDistanceFieldGlyphCache *cache = m_distanceFieldCacheManager->cache(font);
     if (!cache) {
-        QPlatformIntegration *platformIntegration = QGuiApplicationPrivate::platformIntegration();
-        if (platformIntegration != 0
-            && platformIntegration->hasCapability(QPlatformIntegration::SharedGraphicsCache)) {
-            QFontEngine *fe = QRawFontPrivate::get(font)->fontEngine;
-            if (!fe->faceId().filename.isEmpty()) {
-                QByteArray keyName = fe->faceId().filename;
-                if (font.style() != QFont::StyleNormal)
-                    keyName += QByteArray(" I");
-                if (font.weight() != QFont::Normal)
-                    keyName += ' ' + QByteArray::number(font.weight());
-                keyName += QByteArray(" DF");
-                QPlatformSharedGraphicsCache *sharedGraphicsCache =
-                        platformIntegration->createPlatformSharedGraphicsCache(keyName);
-
-                if (sharedGraphicsCache != 0) {
-                    sharedGraphicsCache->ensureCacheInitialized(keyName,
-                                                                QPlatformSharedGraphicsCache::OpenGLTexture,
-                                                                QPlatformSharedGraphicsCache::Alpha8);
-
-                    cache = new QSGSharedDistanceFieldGlyphCache(keyName,
-                                                                 sharedGraphicsCache,
-                                                                 m_distanceFieldCacheManager,
-                                                                 openglContext(),
-                                                                 font);
-                }
-            }
-        }
-        if (!cache)
-            cache = new QSGDefaultDistanceFieldGlyphCache(m_distanceFieldCacheManager, openglContext(), font);
+        cache = new QSGDefaultDistanceFieldGlyphCache(m_distanceFieldCacheManager, openglContext(), font);
         m_distanceFieldCacheManager->insertCache(font, cache);
     }
 
diff --git a/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp
deleted file mode 100644
index 7104df9543..0000000000
--- a/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp
+++ /dev/null
@@ -1,656 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQuick module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://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 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#define EGL_EGLEXT_PROTOTYPES
-#define GL_GLEXT_PROTOTYPES
-#if defined(QSGSHAREDDISTANCEFIELDGLYPHCACHE_DEBUG)
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#endif
-
-#include "qsgshareddistancefieldglyphcache_p.h"
-
-#include <QtCore/qhash.h>
-#include <QtCore/qthread.h>
-#include <QtCore/qcoreapplication.h>
-
-#include <qpa/qplatformsharedgraphicscache.h>
-
-#include <QtQuick/qquickwindow.h>
-
-// #define QSGSHAREDDISTANCEFIELDGLYPHCACHE_DEBUG
-
-QT_BEGIN_NAMESPACE
-
-namespace {
-
-    class QSGInvokeEvent: public QEvent
-    {
-    public:
-        QSGInvokeEvent(QPlatformSharedGraphicsCache *cache,
-                       const QByteArray &cacheId = QByteArray(),
-                       const QVector<quint32> &glyphIds = QVector<quint32>(),
-                       bool inSceneGraphUpdate = false)
-            : QEvent(User)
-            , m_cache(cache)
-            , m_cacheId(cacheId)
-            , m_glyphIds(glyphIds)
-            , m_inSceneGraphUpdate(inSceneGraphUpdate)
-        {}
-
-        bool inSceneGraphUpdate() const { return m_inSceneGraphUpdate; }
-        QPlatformSharedGraphicsCache *cache() const { return m_cache; }
-
-        virtual void invoke() = 0;
-    protected:
-        QPlatformSharedGraphicsCache *m_cache;
-        QByteArray m_cacheId;
-        QVector<quint32> m_glyphIds;
-        bool m_inSceneGraphUpdate;
-    };
-
-    class QSGReleaseItemsEvent: public QSGInvokeEvent
-    {
-    public:
-        QSGReleaseItemsEvent(QPlatformSharedGraphicsCache *cache,
-                             const QByteArray &cacheId,
-                             const QVector<quint32> &glyphIds,
-                             bool inSceneGraphUpdate)
-            : QSGInvokeEvent(cache, cacheId, glyphIds, inSceneGraphUpdate)
-        {
-        }
-
-        void invoke()
-        {
-            m_cache->releaseItems(m_cacheId, m_glyphIds);
-        }
-    };
-
-    class QSGRequestItemsEvent: public QSGInvokeEvent
-    {
-    public:
-        QSGRequestItemsEvent(QPlatformSharedGraphicsCache *cache,
-                             const QByteArray &cacheId,
-                             const QVector<quint32> &glyphIds,
-                             bool inSceneGraphUpdate)
-            : QSGInvokeEvent(cache, cacheId, glyphIds, inSceneGraphUpdate)
-        {
-        }
-
-        void invoke()
-        {
-            m_cache->requestItems(m_cacheId, m_glyphIds);
-        }
-    };
-
-    class QSGInsertItemsEvent: public QSGInvokeEvent
-    {
-    public:
-        QSGInsertItemsEvent(QPlatformSharedGraphicsCache *cache,
-                            const QByteArray &cacheId,
-                            const QVector<quint32> &glyphIds,
-                            const QVector<QImage> &images,
-                            bool inSceneGraphUpdate)
-            : QSGInvokeEvent(cache, cacheId, glyphIds, inSceneGraphUpdate)
-            , m_images(images)
-        {
-        }
-
-        void invoke()
-        {
-            m_cache->insertItems(m_cacheId, m_glyphIds, m_images);
-        }
-
-    private:
-        QVector<QImage> m_images;
-    };
-
-    class QSGEndRequestBatchEvent: public QSGInvokeEvent
-    {
-    public:
-        QSGEndRequestBatchEvent(QPlatformSharedGraphicsCache *cache)
-            : QSGInvokeEvent(cache)
-        {
-        }
-
-        void invoke()
-        {
-            if (m_cache->requestBatchStarted())
-                m_cache->endRequestBatch();
-        }
-    };
-
-    class QSGMainThreadInvoker: public QObject
-    {
-    public:
-        bool event(QEvent *e)
-        {
-            if (e->type() == QEvent::User) {
-                Q_ASSERT(QThread::currentThread() == QCoreApplication::instance()->thread());
-
-                QSGInvokeEvent *invokeEvent = static_cast<QSGInvokeEvent *>(e);
-                if (invokeEvent->inSceneGraphUpdate()) {
-                    QPlatformSharedGraphicsCache *cache = invokeEvent->cache();
-                    if (!cache->requestBatchStarted())
-                        cache->beginRequestBatch();
-                }
-
-                static_cast<QSGInvokeEvent *>(e)->invoke();
-                return true;
-            }
-            return QObject::event(e);
-        }
-
-        static QSGMainThreadInvoker *instance()
-        {
-            if (m_invoker == 0) {
-                m_invoker = new QSGMainThreadInvoker;
-                m_invoker->moveToThread(QCoreApplication::instance()->thread());
-            }
-
-            return m_invoker;
-        }
-
-    private:
-        static QSGMainThreadInvoker *m_invoker;
-    };
-
-    QSGMainThreadInvoker* QSGMainThreadInvoker::m_invoker = 0;
-}
-
-QSGSharedDistanceFieldGlyphCache::QSGSharedDistanceFieldGlyphCache(const QByteArray &cacheId,
-                                                                   QPlatformSharedGraphicsCache *sharedGraphicsCache,
-                                                                   QSGDistanceFieldGlyphCacheManager *man,
-                                                                   QOpenGLContext *c,
-                                                                   const QRawFont &font)
-    : QSGDistanceFieldGlyphCache(man, c, font)
-    , m_cacheId(cacheId)
-    , m_sharedGraphicsCache(sharedGraphicsCache)
-    , m_isInSceneGraphUpdate(false)
-    , m_hasPostedEvents(false)
-{
-#if defined(QSGSHAREDDISTANCEFIELDGLYPHCACHE_DEBUG)
-    qDebug("QSGSharedDistanceFieldGlyphCache with id %s created in thread %p",
-           cacheId.constData(), QThread::currentThreadId());
-#endif
-
-    Q_ASSERT(sizeof(glyph_t) == sizeof(quint32));
-    Q_ASSERT(sharedGraphicsCache != 0);
-
-    connect(sharedGraphicsCache, SIGNAL(itemsMissing(QByteArray,QVector<quint32>)),
-            this, SLOT(reportItemsMissing(QByteArray,QVector<quint32>)),
-            Qt::DirectConnection);
-    connect(sharedGraphicsCache, SIGNAL(itemsAvailable(QByteArray,void*,QVector<quint32>,QVector<QPoint>)),
-            this, SLOT(reportItemsAvailable(QByteArray,void*,QVector<quint32>,QVector<QPoint>)),
-            Qt::DirectConnection);
-    connect(sharedGraphicsCache, SIGNAL(itemsUpdated(QByteArray,void*,QVector<quint32>,QVector<QPoint>)),
-            this, SLOT(reportItemsUpdated(QByteArray,void*,QVector<quint32>,QVector<QPoint>)),
-            Qt::DirectConnection);
-    connect(sharedGraphicsCache, SIGNAL(itemsInvalidated(QByteArray,QVector<quint32>)),
-            this, SLOT(reportItemsInvalidated(QByteArray,QVector<quint32>)),
-            Qt::DirectConnection);
-
-    Q_ASSERT(c);
-    QQuickWindow *window = static_cast<QQuickWindow *>(c->surface());
-    Q_ASSERT(window != 0);
-
-    connect(window, SIGNAL(beforeSynchronizing()), this, SLOT(sceneGraphUpdateStarted()),
-            Qt::DirectConnection);
-    connect(window, SIGNAL(beforeRendering()), this, SLOT(sceneGraphUpdateDone()),
-            Qt::DirectConnection);
-}
-
-QSGSharedDistanceFieldGlyphCache::~QSGSharedDistanceFieldGlyphCache()
-{
-    {
-        QHash<glyph_t, void *>::const_iterator it = m_bufferForGlyph.constBegin();
-        while (it != m_bufferForGlyph.constEnd()) {
-            m_sharedGraphicsCache->dereferenceBuffer(it.value());
-            ++it;
-        }
-    }
-
-    {
-        QHash<quint32, PendingGlyph>::const_iterator it = m_pendingReadyGlyphs.constBegin();
-        while (it != m_pendingReadyGlyphs.constEnd()) {
-            m_sharedGraphicsCache->dereferenceBuffer(it.value().buffer);
-            ++it;
-        }
-    }
-}
-
-void QSGSharedDistanceFieldGlyphCache::requestGlyphs(const QSet<glyph_t> &glyphs)
-{
-    typedef QSet<glyph_t>::const_iterator GlyphSetConstIt;
-
-    QMutexLocker locker(&m_pendingGlyphsMutex);
-
-#if defined(QSGSHAREDDISTANCEFIELDGLYPHCACHE_DEBUG)
-    qDebug("QSGSharedDistanceFieldGlyphCache::requestGlyphs() called for %s (%d glyphs)",
-           m_cacheId.constData(), glyphs.size());
-#endif
-
-    m_requestedGlyphsThatHaveNotBeenReturned.unite(glyphs);
-    m_requestedGlyphs.unite(glyphs);
-
-    QVector<quint32> glyphsVector;
-    glyphsVector.reserve(glyphs.size());
-
-    for (GlyphSetConstIt it = glyphs.constBegin(), cend = glyphs.constEnd(); it != cend; ++it) {
-        Q_ASSERT(!m_bufferForGlyph.contains(*it));
-        glyphsVector.append(*it);
-    }
-
-    m_hasPostedEvents = true;
-    QSGMainThreadInvoker *invoker = QSGMainThreadInvoker::instance();
-    QCoreApplication::postEvent(invoker, new QSGRequestItemsEvent(m_sharedGraphicsCache,
-                                                                  m_cacheId,
-                                                                  glyphsVector,
-                                                                  m_isInSceneGraphUpdate));
-}
-
-void QSGSharedDistanceFieldGlyphCache::waitForGlyphs()
-{
-    Q_ASSERT(!m_isInSceneGraphUpdate);
-    if (m_isInSceneGraphUpdate) {
-        qWarning("QSGSharedDistanceFieldGlyphCache::waitForGlyphs: Called from inside "
-                 "scenegraph update. Will freeze.");
-    }
-
-    {
-        QMutexLocker locker(&m_pendingGlyphsMutex);
-        while (!m_requestedGlyphsThatHaveNotBeenReturned.isEmpty())
-            m_pendingGlyphsCondition.wait(&m_pendingGlyphsMutex);
-    }
-}
-
-void QSGSharedDistanceFieldGlyphCache::storeGlyphs(const QList<QDistanceField> &glyphs)
-{
-    {
-        QMutexLocker locker(&m_pendingGlyphsMutex);
-#if defined(QSGSHAREDDISTANCEFIELDGLYPHCACHE_DEBUG)
-        qDebug("QSGSharedDistanceFieldGlyphCache::storeGlyphs() called for %s (%d glyphs)",
-               m_cacheId.constData(), glyphs.size());
-#endif
-
-        int glyphCount = glyphs.size();
-        QVector<quint32> glyphIds(glyphCount);
-        QVector<QImage> images(glyphCount);
-        for (int i = 0; i < glyphs.size(); ++i) {
-            const QDistanceField &df = glyphs.at(i);
-            m_requestedGlyphsThatHaveNotBeenReturned.insert(df.glyph());
-            glyphIds[i] = df.glyph();
-            // ### TODO: Handle QDistanceField in QPlatformSharedGraphicsCache
-            images[i] = df.toImage(QImage::Format_Indexed8);
-        }
-
-        m_hasPostedEvents = true;
-        QSGMainThreadInvoker *invoker = QSGMainThreadInvoker::instance();
-        QCoreApplication::postEvent(invoker, new QSGInsertItemsEvent(m_sharedGraphicsCache,
-                                                                     m_cacheId,
-                                                                     glyphIds,
-                                                                     images,
-                                                                     m_isInSceneGraphUpdate));
-    }
-
-    processPendingGlyphs();
-}
-
-void QSGSharedDistanceFieldGlyphCache::referenceGlyphs(const QSet<glyph_t> &glyphs)
-{
-    Q_UNUSED(glyphs);
-
-    // Intentionally empty. Not required in this implementation, since the glyphs are reference
-    // counted outside and releaseGlyphs() will only be called when there are no more references.
-}
-
-void QSGSharedDistanceFieldGlyphCache::releaseGlyphs(const QSet<glyph_t> &glyphs)
-{
-    typedef QSet<glyph_t>::const_iterator GlyphSetConstIt;
-
-#if defined(QSGSHAREDDISTANCEFIELDGLYPHCACHE_DEBUG)
-    qDebug("QSGSharedDistanceFieldGlyphCache::releaseGlyphs() called for %s (%d glyphs)",
-           m_cacheId.constData(), glyphs.size());
-#endif
-
-    m_requestedGlyphs.subtract(glyphs);
-
-    QVector<quint32> glyphsVector;
-    glyphsVector.reserve(glyphs.size());
-
-    for (GlyphSetConstIt glyphsIt = glyphs.constBegin(), cend = glyphs.constEnd(); glyphsIt != cend; ++glyphsIt) {
-        QHash<glyph_t, void *>::iterator bufferIt = m_bufferForGlyph.find(*glyphsIt);
-        if (bufferIt != m_bufferForGlyph.end()) {
-            void *buffer = bufferIt.value();
-            removeGlyph(*glyphsIt);
-            m_bufferForGlyph.erase(bufferIt);
-            Q_ASSERT(!m_bufferForGlyph.contains(*glyphsIt));
-
-            if (!m_sharedGraphicsCache->dereferenceBuffer(buffer)) {
-#if !defined(QT_NO_DEBUG)
-                bufferIt = m_bufferForGlyph.begin();
-                while (bufferIt != m_bufferForGlyph.end()) {
-                    Q_ASSERT(bufferIt.value() != buffer);
-                    ++bufferIt;
-                }
-#endif
-            }
-        }
-
-        glyphsVector.append(*glyphsIt);
-    }
-
-    m_hasPostedEvents = true;
-    QSGMainThreadInvoker *mainThreadInvoker = QSGMainThreadInvoker::instance();
-    QCoreApplication::postEvent(mainThreadInvoker, new QSGReleaseItemsEvent(m_sharedGraphicsCache,
-                                                                            m_cacheId,
-                                                                            glyphsVector,
-                                                                            m_isInSceneGraphUpdate));
-}
-
-void QSGSharedDistanceFieldGlyphCache::registerOwnerElement(QQuickItem *ownerElement)
-{
-    Owner &owner = m_registeredOwners[ownerElement];
-    if (owner.ref == 0) {
-        owner.item = ownerElement;
-
-        bool ok = connect(this, SIGNAL(glyphsPending()), ownerElement, SLOT(triggerPreprocess()));
-        Q_ASSERT_X(ok, Q_FUNC_INFO, "QML element that owns a glyph node must have triggerPreprocess() slot");
-        Q_UNUSED(ok);
-    }
-    ++owner.ref;
-}
-
-void QSGSharedDistanceFieldGlyphCache::unregisterOwnerElement(QQuickItem *ownerElement)
-{
-    QHash<QQuickItem *, Owner>::iterator it = m_registeredOwners.find(ownerElement);
-    if (it != m_registeredOwners.end() && --it->ref <= 0) {
-        if (it->item)
-            disconnect(this, SIGNAL(glyphsPending()), ownerElement, SLOT(triggerPreprocess()));
-        m_registeredOwners.erase(it);
-    }
-}
-
-namespace {
-    struct TextureContent {
-        QSize size;
-        QVector<glyph_t> glyphs;
-    };
-}
-
-void QSGSharedDistanceFieldGlyphCache::processPendingGlyphs()
-{
-    Q_ASSERT(QThread::currentThread() == thread());
-
-    waitForGlyphs();
-
-    {
-        QMutexLocker locker(&m_pendingGlyphsMutex);
-        if (m_pendingMissingGlyphs.isEmpty()
-            && m_pendingReadyGlyphs.isEmpty()
-            && m_pendingInvalidatedGlyphs.isEmpty()) {
-            return;
-        }
-
-        {
-            QVector<glyph_t> pendingMissingGlyphs;
-            pendingMissingGlyphs.reserve(m_pendingMissingGlyphs.size());
-
-            QSet<glyph_t>::const_iterator it = m_pendingMissingGlyphs.constBegin();
-            while (it != m_pendingMissingGlyphs.constEnd()) {
-                pendingMissingGlyphs.append(*it);
-                ++it;
-            }
-
-            markGlyphsToRender(pendingMissingGlyphs);
-        }
-
-        {
-            QVector<glyph_t> filteredPendingInvalidatedGlyphs;
-            filteredPendingInvalidatedGlyphs.reserve(m_pendingInvalidatedGlyphs.size());
-
-            QSet<glyph_t>::const_iterator it = m_pendingInvalidatedGlyphs.constBegin();
-            while (it != m_pendingInvalidatedGlyphs.constEnd()) {
-                bool rerequestGlyph = false;
-
-                // The glyph was invalidated right after being posted as ready, we throw away
-                // the ready glyph and rerequest it to be certain
-                QHash<quint32, PendingGlyph>::iterator pendingGlyphIt = m_pendingReadyGlyphs.find(*it);
-                if (pendingGlyphIt != m_pendingReadyGlyphs.end()) {
-                    m_sharedGraphicsCache->dereferenceBuffer(pendingGlyphIt.value().buffer);
-                    pendingGlyphIt = m_pendingReadyGlyphs.erase(pendingGlyphIt);
-                    rerequestGlyph = true;
-                }
-
-                void *bufferId = m_bufferForGlyph.value(*it, 0);
-                if (bufferId != 0) {
-                    m_sharedGraphicsCache->dereferenceBuffer(bufferId);
-                    m_bufferForGlyph.remove(*it);
-                    rerequestGlyph = true;
-                }
-
-                if (rerequestGlyph)
-                    filteredPendingInvalidatedGlyphs.append(*it);
-
-                ++it;
-            }
-
-            // If this cache is still using the glyphs, reset the texture held by them, and mark them
-            // to be rendered again since they are still needed.
-            if (!filteredPendingInvalidatedGlyphs.isEmpty()) {
-                setGlyphsTexture(filteredPendingInvalidatedGlyphs, Texture());
-                markGlyphsToRender(filteredPendingInvalidatedGlyphs);
-            }
-        }
-
-        {
-            QList<GlyphPosition> glyphPositions;
-            glyphPositions.reserve(m_pendingReadyGlyphs.count());
-
-            QHash<void *, TextureContent> textureContentForBuffer;
-            {
-                QHash<quint32, PendingGlyph>::iterator it = m_pendingReadyGlyphs.begin();
-                while (it != m_pendingReadyGlyphs.end()) {
-                    void *currentGlyphBuffer = m_bufferForGlyph.value(it.key(), 0);
-                    if (currentGlyphBuffer != 0) {
-                        if (!m_sharedGraphicsCache->dereferenceBuffer(currentGlyphBuffer)) {
-                            Q_ASSERT(!textureContentForBuffer.contains(currentGlyphBuffer));
-                        }
-                    }
-
-                    PendingGlyph &pendingGlyph  = it.value();
-
-                    // We don't ref or deref the buffer here, since it was already referenced when
-                    // added to the pending ready glyphs
-                    m_bufferForGlyph[it.key()] = pendingGlyph.buffer;
-
-                    textureContentForBuffer[pendingGlyph.buffer].size = pendingGlyph.bufferSize;
-                    textureContentForBuffer[pendingGlyph.buffer].glyphs.append(it.key());
-
-                    GlyphPosition glyphPosition;
-                    glyphPosition.glyph = it.key();
-                    glyphPosition.position = pendingGlyph.position;
-
-                    glyphPositions.append(glyphPosition);
-
-                    ++it;
-                }
-            }
-
-            setGlyphsPosition(glyphPositions);
-
-            {
-                QHash<void *, TextureContent>::const_iterator it = textureContentForBuffer.constBegin();
-                while (it != textureContentForBuffer.constEnd()) {
-                    Texture texture;
-                    texture.textureId = m_sharedGraphicsCache->textureIdForBuffer(it.key());
-                    texture.size = m_sharedGraphicsCache->sizeOfBuffer(it.key());
-
-                    setGlyphsTexture(it.value().glyphs, texture);
-
-                    ++it;
-                }
-            }
-        }
-
-        m_pendingMissingGlyphs.clear();
-        m_pendingInvalidatedGlyphs.clear();
-        m_pendingReadyGlyphs.clear();
-    }
-}
-
-void QSGSharedDistanceFieldGlyphCache::reportItemsAvailable(const QByteArray &cacheId,
-                                                            void *bufferId,
-                                                            const QVector<quint32> &itemIds,
-                                                            const QVector<QPoint> &positions)
-{
-    bool requestedItemsInList = false;
-    {
-        QMutexLocker locker(&m_pendingGlyphsMutex);
-        if (m_cacheId != cacheId)
-            return;
-
-#if defined(QSGSHAREDDISTANCEFIELDGLYPHCACHE_DEBUG)
-            qDebug("QSGSharedDistanceFieldGlyphCache::reportItemsAvailable() called for %s (%d glyphs)",
-                   cacheId.constData(), itemIds.size());
-#endif
-
-        for (int i=0; i<itemIds.size(); ++i) {
-            if (m_requestedGlyphsThatHaveNotBeenReturned.contains(itemIds.at(i))) {
-                requestedItemsInList = true;
-                break;
-            }
-        }
-    }
-
-    if (requestedItemsInList)
-        reportItemsUpdated(cacheId, bufferId,itemIds, positions);
-}
-
-void QSGSharedDistanceFieldGlyphCache::reportItemsUpdated(const QByteArray &cacheId,
-                                                          void *bufferId,
-                                                          const QVector<quint32> &itemIds,
-                                                          const QVector<QPoint> &positions)
-{
-    {
-        QMutexLocker locker(&m_pendingGlyphsMutex);
-        if (m_cacheId != cacheId)
-            return;
-
-        Q_ASSERT(itemIds.size() == positions.size());
-
-#if defined(QSGSHAREDDISTANCEFIELDGLYPHCACHE_DEBUG)
-        qDebug("QSGSharedDistanceFieldGlyphCache::reportItemsUpdated() called for %s (%d glyphs)",
-               cacheId.constData(), itemIds.size());
-#endif
-
-        for (int i=0; i<itemIds.size(); ++i) {
-            if (m_requestedGlyphs.contains(itemIds.at(i))) {
-                PendingGlyph &pendingGlyph = m_pendingReadyGlyphs[itemIds.at(i)];
-                void *oldBuffer = pendingGlyph.buffer;
-
-                pendingGlyph.buffer = bufferId;
-                pendingGlyph.position = positions.at(i);
-
-                m_sharedGraphicsCache->referenceBuffer(bufferId);
-                if (oldBuffer != 0)
-                    m_sharedGraphicsCache->dereferenceBuffer(oldBuffer);
-
-                m_requestedGlyphsThatHaveNotBeenReturned.remove(itemIds.at(i));
-            }
-        }
-    }
-
-    m_pendingGlyphsCondition.wakeAll();
-    emit glyphsPending();
-}
-
-void QSGSharedDistanceFieldGlyphCache::reportItemsInvalidated(const QByteArray &cacheId,
-                                                              const QVector<quint32> &itemIds)
-{
-    {
-        QMutexLocker locker(&m_pendingGlyphsMutex);
-        if (m_cacheId != cacheId)
-            return;
-
-        for (int i=0; i<itemIds.size(); ++i) {
-            if (m_requestedGlyphs.contains(itemIds.at(i)))
-                m_pendingInvalidatedGlyphs.insert(itemIds.at(i));
-        }
-    }
-
-    emit glyphsPending();
-}
-
-
-void QSGSharedDistanceFieldGlyphCache::reportItemsMissing(const QByteArray &cacheId,
-                                                          const QVector<quint32> &itemIds)
-{
-    {
-        QMutexLocker locker(&m_pendingGlyphsMutex);
-        if (m_cacheId != cacheId)
-            return;
-
-#if defined(QSGSHAREDDISTANCEFIELDGLYPHCACHE_DEBUG)
-        qDebug("QSGSharedDistanceFieldGlyphCache::reportItemsMissing() called for %s (%d glyphs)",
-               cacheId.constData(), itemIds.size());
-#endif
-
-        for (int i=0; i<itemIds.size(); ++i) {
-            if (m_requestedGlyphsThatHaveNotBeenReturned.remove(itemIds.at(i)))
-                m_pendingMissingGlyphs.insert(itemIds.at(i));
-        }
-    }
-
-    m_pendingGlyphsCondition.wakeAll();
-    emit glyphsPending();
-}
-
-void QSGSharedDistanceFieldGlyphCache::sceneGraphUpdateStarted()
-{
-    m_isInSceneGraphUpdate = true;
-    m_hasPostedEvents = false;
-}
-
-void QSGSharedDistanceFieldGlyphCache::sceneGraphUpdateDone()
-{
-    m_isInSceneGraphUpdate = false;
-
-    if (m_hasPostedEvents) {
-        QSGMainThreadInvoker *invoker = QSGMainThreadInvoker::instance();
-        QCoreApplication::postEvent(invoker, new QSGEndRequestBatchEvent(m_sharedGraphicsCache));
-        m_hasPostedEvents = false;
-    }
-}
-
-QT_END_NAMESPACE
diff --git a/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h b/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h
deleted file mode 100644
index aee77c49c6..0000000000
--- a/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQuick module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://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 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QSGSHAREDDISTANCEFIELDGLYPHCACHE_H
-#define QSGSHAREDDISTANCEFIELDGLYPHCACHE_H
-
-#include <QtCore/qwaitcondition.h>
-#include <private/qsgadaptationlayer_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QPlatformSharedGraphicsCache;
-class QSGSharedDistanceFieldGlyphCache : public QObject, public QSGDistanceFieldGlyphCache
-{
-    Q_OBJECT
-public:
-    explicit QSGSharedDistanceFieldGlyphCache(const QByteArray &cacheId,
-                                              QPlatformSharedGraphicsCache *sharedGraphicsCache,
-                                              QSGDistanceFieldGlyphCacheManager *man,
-                                              QOpenGLContext *c,
-                                              const QRawFont &font);
-    ~QSGSharedDistanceFieldGlyphCache();
-
-    void registerOwnerElement(QQuickItem *ownerElement);
-    void unregisterOwnerElement(QQuickItem *ownerElement);
-    void processPendingGlyphs();
-
-    void requestGlyphs(const QSet<glyph_t> &glyphs);
-    void referenceGlyphs(const QSet<glyph_t> &glyphs);
-    void storeGlyphs(const QList<QDistanceField> &glyphs);
-    void releaseGlyphs(const QSet<glyph_t> &glyphs);
-
-Q_SIGNALS:
-    void glyphsPending();
-
-private Q_SLOTS:
-    void reportItemsMissing(const QByteArray &cacheId, const QVector<quint32> &itemIds);
-    void reportItemsAvailable(const QByteArray &cacheId,
-                              void *bufferId,
-                              const QVector<quint32> &itemIds,
-                              const QVector<QPoint> &positions);
-    void reportItemsUpdated(const QByteArray &cacheId,
-                            void *bufferId,
-                            const QVector<quint32> &itemIds,
-                            const QVector<QPoint> &positions);
-    void reportItemsInvalidated(const QByteArray &cacheId, const QVector<quint32> &itemIds);
-
-    void sceneGraphUpdateStarted();
-    void sceneGraphUpdateDone();
-
-private:
-    void waitForGlyphs();
-    void saveTexture(GLuint textureId, int width, int height);
-
-    QSet<quint32> m_requestedGlyphsThatHaveNotBeenReturned;
-    QSet<quint32> m_requestedGlyphs;
-    QWaitCondition m_pendingGlyphsCondition;
-    QByteArray m_cacheId;
-    QPlatformSharedGraphicsCache *m_sharedGraphicsCache;
-    QMutex m_pendingGlyphsMutex;
-
-    QSet<glyph_t> m_pendingInvalidatedGlyphs;
-    QSet<glyph_t> m_pendingMissingGlyphs;
-
-    struct PendingGlyph
-    {
-        PendingGlyph() : buffer(0) {}
-
-        void *buffer;
-        QSize bufferSize;
-        QPoint position;
-    };
-
-    struct Owner
-    {
-        Owner() : ref(0) {}
-        Owner(const Owner &o) : item(o.item), ref(o.ref) {}
-        Owner &operator =(const Owner &o) { item = o.item; ref = o.ref; return *this; }
-
-        QPointer<QQuickItem> item;
-        int ref;
-    };
-
-    QHash<quint32, PendingGlyph> m_pendingReadyGlyphs;
-    QHash<glyph_t, void *> m_bufferForGlyph;
-    QHash<QQuickItem *, Owner> m_registeredOwners;
-
-    bool m_isInSceneGraphUpdate;
-    bool m_hasPostedEvents;
-};
-
-QT_END_NAMESPACE
-
-#endif // QSGSHAREDDISTANCEFIELDGLYPHCACHE_H
diff --git a/src/quick/scenegraph/scenegraph.pri b/src/quick/scenegraph/scenegraph.pri
index 480ac5e569..84cc2ba135 100644
--- a/src/quick/scenegraph/scenegraph.pri
+++ b/src/quick/scenegraph/scenegraph.pri
@@ -79,7 +79,6 @@ HEADERS += \
     $$PWD/qsgdefaultglyphnode_p_p.h \
     $$PWD/qsgdefaultimagenode_p.h \
     $$PWD/qsgdefaultrectanglenode_p.h \
-    $$PWD/qsgshareddistancefieldglyphcache_p.h \
     $$PWD/qsgrenderloop_p.h \
     $$PWD/qsgthreadedrenderloop_p.h \
     $$PWD/qsgwindowsrenderloop_p.h \
@@ -96,7 +95,6 @@ SOURCES += \
     $$PWD/qsgdistancefieldglyphnode_p.cpp \
     $$PWD/qsgdefaultimagenode.cpp \
     $$PWD/qsgdefaultrectanglenode.cpp \
-    $$PWD/qsgshareddistancefieldglyphcache.cpp \
     $$PWD/qsgrenderloop.cpp \
     $$PWD/qsgthreadedrenderloop.cpp \
     $$PWD/qsgwindowsrenderloop.cpp \