Merge branch 'wip/scenegraphng' into dev

Say hello to Shape.

Change-Id: I1093feee4acc375e62bae1d351db0a7969a536d0

7 files changed, 45 insertions, 20 deletions

diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenode.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenode.cpp
index 307615a216..cecc6c21ca 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenode.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenode.cpp
@@ -277,18 +277,21 @@ QRegion QSGSoftwareRenderableNode::renderNode(QPainter *painter, bool forceOpaqu
             QMatrix4x4 m = m_transform;
             rd->m_matrix = &m;
             rd->m_opacity = m_opacity;
-            RenderNodeState rs;
-            rs.cr = m_clipRegion;
 
-            const QRect br = m_handle.renderNode->flags().testFlag(QSGRenderNode::BoundedRectRendering)
-                ? m_boundingRectMax :
-                QRect(0, 0, painter->device()->width(), painter->device()->height());
+            // all the clip region below is in world coordinates, taking m_transform into account already
+            QRegion cr = m_dirtyRegion;
+            if (m_clipRegion.rectCount() > 1)
+                cr &= m_clipRegion;
 
             painter->save();
-            painter->setClipRegion(br, Qt::ReplaceClip);
+            RenderNodeState rs;
+            rs.cr = cr;
             m_handle.renderNode->render(&rs);
             painter->restore();
 
+            const QRect br = m_handle.renderNode->flags().testFlag(QSGRenderNode::BoundedRectRendering)
+                ? m_boundingRectMax // already mapped to world
+                : QRect(0, 0, painter->device()->width(), painter->device()->height());
             m_previousDirtyRegion = QRegion(br);
             m_isDirty = false;
             m_dirtyRegion = QRegion();
@@ -299,7 +302,7 @@ QRegion QSGSoftwareRenderableNode::renderNode(QPainter *painter, bool forceOpaqu
     painter->save();
     painter->setOpacity(m_opacity);
 
-    // Set clipRegion to m_dirtyRegion (in world coordinates)
+    // Set clipRegion to m_dirtyRegion (in world coordinates, so must be done before the setTransform below)
     // as m_dirtyRegion already accounts for clipRegion
     painter->setClipRegion(m_dirtyRegion, Qt::ReplaceClip);
     if (m_clipRegion.rectCount() > 1)
diff --git a/src/quick/scenegraph/coreapi/qsgrendernode.cpp b/src/quick/scenegraph/coreapi/qsgrendernode.cpp
index 1bc0210b72..a8954848d6 100644
--- a/src/quick/scenegraph/coreapi/qsgrendernode.cpp
+++ b/src/quick/scenegraph/coreapi/qsgrendernode.cpp
@@ -267,6 +267,10 @@ QSGRenderNode::RenderingFlags QSGRenderNode::flags() const
     For rendernodes covering the entire area of a corresponding QQuickItem the
     return value will be (0, 0, item->width(), item->height()).
 
+    \note Nodes are also free to render outside the boundaries specified by the
+    item's width and height, since the scenegraph nodes are not bounded by the
+    QQuickItem geometry, as long as this is reported correctly from this function.
+
     \sa flags()
 */
 QRectF QSGRenderNode::rect() const
@@ -359,7 +363,10 @@ QSGRenderNode::RenderState::~RenderState()
     of the render state is not in use. However, the clip region that can be set
     on the QPainter still has to be communicated since reconstructing this
     manually in render() is not reasonable. It can therefore be queried via
-    this function.
+    this function. The region is in world coordinates and can be passed
+    to QPainter::setClipRegion() with Qt::ReplaceClip. This must be done before
+    calling QPainter::setTransform() since the clip region is already mapped to
+    the transform provided in QSGRenderNode::matrix().
  */
 
 /*!
diff --git a/src/quick/scenegraph/qsgdefaultrendercontext.cpp b/src/quick/scenegraph/qsgdefaultrendercontext.cpp
index bffffc36ad..29600ef0ca 100644
--- a/src/quick/scenegraph/qsgdefaultrendercontext.cpp
+++ b/src/quick/scenegraph/qsgdefaultrendercontext.cpp
@@ -259,7 +259,7 @@ void QSGDefaultRenderContext::compileShader(QSGMaterialShader *shader, QSGMateri
     if (vertexCode || fragmentCode) {
         Q_ASSERT_X((material->flags() & QSGMaterial::CustomCompileStep) == 0,
                    "QSGRenderContext::compile()",
-                   "materials with custom compile step cannot have custom vertex/fragment code");
+                   "materials with custom compile step cannot have modified vertex or fragment code");
         QOpenGLShaderProgram *p = shader->program();
         p->addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, vertexCode ? vertexCode : shader->vertexShader());
         p->addCacheableShaderFromSourceCode(QOpenGLShader::Fragment, fragmentCode ? fragmentCode : shader->fragmentShader());
diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp
index 1c19876a76..4f11d95e70 100644
--- a/src/quick/scenegraph/util/qsgtexture.cpp
+++ b/src/quick/scenegraph/util/qsgtexture.cpp
@@ -256,13 +256,15 @@ static void qt_debug_remove_texture(QSGTexture* texture)
 
     Specifies how the texture should treat texture coordinates.
 
-    \note Texture wrapping needs to be handled explicitly for atlas textures.
-
-    \value Repeat Only the factional part of the texture coordiante is
+    \value Repeat Only the fractional part of the texture coordinate is
     used, causing values above 1 and below 0 to repeat.
 
     \value ClampToEdge Values above 1 are clamped to 1 and values
     below 0 are clamped to 0.
+
+    \value MirroredRepeat When the texture coordinate is even, only the
+    fractional part is used. When odd, the texture coordinate is set to
+    \c{1 - fractional part}. This value has been introduced in Qt 5.10.
  */
 
 /*!
@@ -607,7 +609,9 @@ void QSGTexture::updateBindOptions(bool force)
 
     if (force || d->wrapChanged) {
 #ifndef QT_NO_DEBUG
-        if (d->horizontalWrap == Repeat || d->verticalWrap == Repeat) {
+        if (d->horizontalWrap == Repeat || d->verticalWrap == Repeat
+            || d->horizontalWrap == MirroredRepeat || d->verticalWrap == MirroredRepeat)
+        {
             bool npotSupported = QOpenGLFunctions(QOpenGLContext::currentContext()).hasOpenGLFeature(QOpenGLFunctions::NPOTTextures);
             QSize size = textureSize();
             bool isNpot = !isPowerOfTwo(size.width()) || !isPowerOfTwo(size.height());
@@ -615,8 +619,18 @@ void QSGTexture::updateBindOptions(bool force)
                 qWarning("Scene Graph: This system does not support the REPEAT wrap mode for non-power-of-two textures.");
         }
 #endif
-        funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, d->horizontalWrap == Repeat ? GL_REPEAT : GL_CLAMP_TO_EDGE);
-        funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, d->verticalWrap == Repeat ? GL_REPEAT : GL_CLAMP_TO_EDGE);
+        GLenum wrapS = GL_CLAMP_TO_EDGE;
+        if (d->horizontalWrap == Repeat)
+            wrapS = GL_REPEAT;
+        else if (d->horizontalWrap == MirroredRepeat)
+            wrapS = GL_MIRRORED_REPEAT;
+        GLenum wrapT = GL_CLAMP_TO_EDGE;
+        if (d->verticalWrap == Repeat)
+            wrapT = GL_REPEAT;
+        else if (d->verticalWrap == MirroredRepeat)
+            wrapT = GL_MIRRORED_REPEAT;
+        funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrapS);
+        funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrapT);
         d->wrapChanged = false;
     }
 #else
diff --git a/src/quick/scenegraph/util/qsgtexture.h b/src/quick/scenegraph/util/qsgtexture.h
index 035acc02b1..032129434e 100644
--- a/src/quick/scenegraph/util/qsgtexture.h
+++ b/src/quick/scenegraph/util/qsgtexture.h
@@ -58,7 +58,8 @@ public:
 
     enum WrapMode {
         Repeat,
-        ClampToEdge
+        ClampToEdge,
+        MirroredRepeat
     };
 
     enum Filtering {
diff --git a/src/quick/scenegraph/util/qsgtexture_p.h b/src/quick/scenegraph/util/qsgtexture_p.h
index 36f9b802ba..52dc6db2d0 100644
--- a/src/quick/scenegraph/util/qsgtexture_p.h
+++ b/src/quick/scenegraph/util/qsgtexture_p.h
@@ -71,8 +71,8 @@ public:
     uint filteringChanged : 1;
     uint anisotropyChanged : 1;
 
-    uint horizontalWrap : 1;
-    uint verticalWrap : 1;
+    uint horizontalWrap : 2;
+    uint verticalWrap : 2;
     uint mipmapMode : 2;
     uint filterMode : 2;
     uint anisotropyLevel: 3;
diff --git a/src/quick/scenegraph/util/qsgtexturematerial.cpp b/src/quick/scenegraph/util/qsgtexturematerial.cpp
index c536445e82..fbc8f27a63 100644
--- a/src/quick/scenegraph/util/qsgtexturematerial.cpp
+++ b/src/quick/scenegraph/util/qsgtexturematerial.cpp
@@ -280,7 +280,7 @@ void QSGOpaqueTextureMaterial::setTexture(QSGTexture *texture)
 
      Returns this material's horizontal wrap mode.
 
-     The default horizontal wrap mode is \c QSGTexutre::ClampToEdge.
+     The default horizontal wrap mode is \c QSGTexture::ClampToEdge.
   */
 
 
@@ -301,7 +301,7 @@ void QSGOpaqueTextureMaterial::setTexture(QSGTexture *texture)
 
      Returns this material's vertical wrap mode.
 
-     The default vertical wrap mode is \c QSGTexutre::ClampToEdge.
+     The default vertical wrap mode is \c QSGTexture::ClampToEdge.
   */