Include the textureid/glyph cache in the material sorting

Change-Id: Ic9740081e9e0e53801bbda64f6b147ab74102663
Reviewed-on: http://codereview.qt-project.org/5887
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>

diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.cpp b/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.cpp
index 72c53a2..1e8b668 100644 (file)
--- a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.cpp
+++ b/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.cpp
@@ -225,6 +225,8 @@ int QSGDistanceFieldTextMaterial::compare(const QSGMaterial *o) const
 {
     Q_ASSERT(o && type() == o->type());
     const QSGDistanceFieldTextMaterial *other = static_cast<const QSGDistanceFieldTextMaterial *>(o);
 {
     Q_ASSERT(o && type() == o->type());
     const QSGDistanceFieldTextMaterial *other = static_cast<const QSGDistanceFieldTextMaterial *>(o);

+    if (m_glyph_cache != other->m_glyph_cache)
+        return m_glyph_cache - other->m_glyph_cache;

     if (m_glyph_cache->fontScale() != other->m_glyph_cache->fontScale()) {
         qreal s1 = m_glyph_cache->fontScale();
         qreal s2 = other->m_glyph_cache->fontScale();
     if (m_glyph_cache->fontScale() != other->m_glyph_cache->fontScale()) {
         qreal s1 = m_glyph_cache->fontScale();
         qreal s2 = other->m_glyph_cache->fontScale();