D3D12: Text enablers

Enablers for native text rendering. Distance field support is postponed
for the time being.

The main feature here is the revised texture handling where it is now
possible to schedule the update of multiple sub-regions from a list of
QImages. BGRA is now used where appropriate, meaning for example that
RGB32 needs no QImage conversion anymore.

The skeletons of the glyph nodes, the basic text material and the glyph
cache are added as well.

Also fixes cleanup when closing the window by properly reimplementing
invalidate() in the rendercontext.

The default rectangle, image and glyph nodes are refactored a bit once
again: QSGBasicSomethingNode is now the common (albeit optional), abstract
class, living in its own file, whereas QSGDefaultSomethingNode is the
GL-specific one, like before. This prepares the future renaming for
QSGDefault -> QSGOpenGL.

Change-Id: I6dbb4ece10be39fd214bb64082d79607389e3e6e
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>

1 files changed, 4 insertions, 28 deletions

diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.h b/src/quick/scenegraph/qsgdefaultglyphnode_p.h
index 4efeaea373..0eb7a4e4bd 100644
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.h
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.h
@@ -52,39 +52,15 @@
 //
 
 #include <private/qsgadaptationlayer_p.h>
-#include <QtQuick/qsgnode.h>
+#include <private/qsgbasicglyphnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QGlyphs;
-class QSGTextMaskMaterial;
-class QSGDefaultGlyphNode: public QSGGlyphNode
+class QSGDefaultGlyphNode : public QSGBasicGlyphNode
 {
 public:
-    QSGDefaultGlyphNode();
-    virtual ~QSGDefaultGlyphNode();
-
-    virtual QPointF baseLine() const { return m_baseLine; }
-    virtual void setGlyphs(const QPointF &position, const QGlyphRun &glyphs);
-    virtual void setColor(const QColor &color);
-
-    virtual void setPreferredAntialiasingMode(AntialiasingMode) { }
-    virtual void setStyle(QQuickText::TextStyle);
-    virtual void setStyleColor(const QColor &);
-
-    virtual void update();
-
-protected:
-    QGlyphRun m_glyphs;
-    QPointF m_position;
-    QColor m_color;
-    QQuickText::TextStyle m_style;
-    QColor m_styleColor;
-
-    QPointF m_baseLine;
-    QSGTextMaskMaterial *m_material;
-
-    QSGGeometry m_geometry;
+    void setMaterialColor(const QColor &color) override;
+    void update() override;
 };
 
 QT_END_NAMESPACE