Remove OpenGL dependency from QSGTexture

The QSGTexture API is now clean, the OpenGL-specific functions are
removed.

Docs are to be updated in a separate patch.

QSGPlainTexture, and a number of texture related places have to follow
suit.

The OpenGL atlas texture implementation is now removed.

Task-number: QTBUG-84717
Task-number: QTBUG-84623
Change-Id: I1aab3b8b9145bb74ad39ef836ce540fc851292c5
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

1 files changed, 12 insertions, 28 deletions

diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
index e13b16c95b..8c66dc348f 100644
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
@@ -638,35 +638,19 @@ int QSGTextMaskMaterial::compare(const QSGMaterial *o) const
 
 bool QSGTextMaskMaterial::ensureUpToDate()
 {
-    if (m_rhi) {
-        QSGRhiTextureGlyphCache *gc = rhiGlyphCache();
-        QSize glyphCacheSize(gc->width(), gc->height());
-        if (glyphCacheSize != m_size) {
-            if (m_texture)
-                delete m_texture;
-            m_texture = new QSGPlainTexture;
-            m_texture->setTexture(gc->texture());
-            m_texture->setTextureSize(QSize(gc->width(), gc->height()));
-            m_texture->setOwnsTexture(false);
-            m_size = glyphCacheSize;
-            return true;
-        }
-        return false;
-
-    } else {
-        QSize glyphCacheSize(openglGlyphCache()->width(), openglGlyphCache()->height());
-        if (glyphCacheSize != m_size) {
-            if (m_texture)
-                delete m_texture;
-            m_texture = new QSGPlainTexture();
-            m_texture->setTextureId(openglGlyphCache()->texture());
-            m_texture->setTextureSize(QSize(openglGlyphCache()->width(), openglGlyphCache()->height()));
-            m_texture->setOwnsTexture(false);
-            m_size = glyphCacheSize;
-            return true;
-        }
-        return false;
+    QSGRhiTextureGlyphCache *gc = rhiGlyphCache();
+    QSize glyphCacheSize(gc->width(), gc->height());
+    if (glyphCacheSize != m_size) {
+        if (m_texture)
+            delete m_texture;
+        m_texture = new QSGPlainTexture;
+        m_texture->setTexture(gc->texture());
+        m_texture->setTextureSize(QSize(gc->width(), gc->height()));
+        m_texture->setOwnsTexture(false);
+        m_size = glyphCacheSize;
+        return true;
     }
+    return false;
 }