1 files changed, 22 insertions, 5 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index 818089082..a5d7e91ef 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -253,6 +253,16 @@ void QWaylandBufferMaterial::ensureTextures(int count)
         m_textures << nullptr;
     }
 }
+
+void QWaylandBufferMaterial::setBufferRef(QWaylandQuickItem *surfaceItem, const QWaylandBufferRef &ref)
+{
+    Q_UNUSED(surfaceItem);
+    m_bufferRef = ref;
+    for (int plane = 0; plane < bufferTypes[ref.bufferFormatEgl()].planeCount; plane++)
+        if (auto texture = ref.toOpenGLTexture(plane))
+            setTextureForPlane(plane, texture);
+    bind();
+}
 #endif // QT_CONFIG(opengl)
 
 QMutex *QWaylandQuickItemPrivate::mutex = nullptr;
@@ -1411,13 +1421,20 @@ QSGNode *QWaylandQuickItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDat
 
     if (d->newTexture) {
         d->newTexture = false;
-        for (int plane = 0; plane < bufferTypes[ref.bufferFormatEgl()].planeCount; plane++)
-            if (auto texture = ref.toOpenGLTexture(plane))
-                material->setTextureForPlane(plane, texture);
-        material->bind();
+        material->setBufferRef(this, ref);
     }
 
-    QSGGeometry::updateTexturedRectGeometry(geometry, rect, QRectF(0, 0, 1, 1));
+    const QSize surfaceSize = ref.size() / surface()->bufferScale();
+    const QRectF sourceGeometry = surface()->sourceGeometry();
+    const QRectF normalizedCoordinates =
+            sourceGeometry.isValid()
+            ? QRectF(sourceGeometry.x() / surfaceSize.width(),
+                     sourceGeometry.y() / surfaceSize.height(),
+                     sourceGeometry.width() / surfaceSize.width(),
+                     sourceGeometry.height() / surfaceSize.height())
+            : QRectF(0, 0, 1, 1);
+
+    QSGGeometry::updateTexturedRectGeometry(geometry, rect, normalizedCoordinates);
 
     node->setGeometry(geometry);
     node->setFlag(QSGNode::OwnsGeometry, true);