Fix QSGImageNode with QSGLayer in software mode

This worked in OpenGL but not in software mode as the combination is
not recognized.

Change-Id: Ic44d1506d7cb2281f268325207a03ea1254b43a0
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

1 files changed, 11 insertions, 1 deletions

diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes.cpp
index 1463681fa3..471624d3f8 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qsgsoftwarepublicnodes_p.h"
+#include "qsgsoftwarelayer_p.h"
 #include "qsgsoftwarepixmaptexture_p.h"
 #include "qsgsoftwareinternalimagenode_p.h"
 
@@ -104,6 +105,9 @@ void QSGSoftwareImageNode::paint(QPainter *painter)
     } else if (QSGSoftwarePixmapTexture *pt = qobject_cast<QSGSoftwarePixmapTexture *>(m_texture)) {
         const QPixmap &pm = pt->pixmap();
         painter->drawPixmap(m_rect, pm, m_sourceRect);
+    } else if (QSGSoftwareLayer *pt = qobject_cast<QSGSoftwareLayer *>(m_texture)) {
+        const QPixmap &pm = pt->pixmap();
+        painter->drawPixmap(m_rect, pm, m_sourceRect);
     } else if (QSGPlainTexture *pt = qobject_cast<QSGPlainTexture *>(m_texture)) {
         const QImage &im = pt->image();
         painter->drawImage(m_rect, im, m_sourceRect);
@@ -115,7 +119,6 @@ void QSGSoftwareImageNode::updateCachedMirroredPixmap()
     if (m_transformMode == NoTransform) {
         m_cachedPixmap = QPixmap();
     } else {
-
         if (QSGSoftwarePixmapTexture *pt = qobject_cast<QSGSoftwarePixmapTexture *>(m_texture)) {
             QTransform mirrorTransform;
             if (m_transformMode.testFlag(MirrorVertically))
@@ -123,6 +126,13 @@ void QSGSoftwareImageNode::updateCachedMirroredPixmap()
             if (m_transformMode.testFlag(MirrorHorizontally))
                 mirrorTransform = mirrorTransform.scale(-1, 1);
             m_cachedPixmap = pt->pixmap().transformed(mirrorTransform);
+        } else if (QSGSoftwareLayer *pt = qobject_cast<QSGSoftwareLayer *>(m_texture)) {
+            QTransform mirrorTransform;
+            if (m_transformMode.testFlag(MirrorVertically))
+                mirrorTransform = mirrorTransform.scale(1, -1);
+            if (m_transformMode.testFlag(MirrorHorizontally))
+                mirrorTransform = mirrorTransform.scale(-1, 1);
+            m_cachedPixmap = pt->pixmap().transformed(mirrorTransform);
         } else if (QSGPlainTexture *pt = qobject_cast<QSGPlainTexture *>(m_texture)) {
             m_cachedPixmap = QPixmap::fromImage(pt->image().mirrored(m_transformMode.testFlag(MirrorHorizontally), m_transformMode.testFlag(MirrorVertically)));
         } else {