From: Gunnar Sletta <gunnar.sletta@nokia.com>
Date: Fri, 15 Apr 2011 14:15:56 +0000 (+0200)
Subject: Make compositor work with scenegraph items again
X-Git-Tag: qt-v5.0.0-alpha1~306
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=81c5d1317d450b9e882e9d5cf112077e7a3fe5ba;p=profile%2Fivi%2Fqtwayland.git

Make compositor work with scenegraph items again
---

diff --git a/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp b/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp
index a3239f5..74602ff 100644
--- a/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp
+++ b/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp
@@ -47,6 +47,7 @@
 #include <QKeyEvent>
 
 #include <qsgsimpletexturenode.h>
+#include <qsgsimplerectnode.h>
 
 void WaylandSurfaceItem::surfaceDamaged(const QRect &)
 {
@@ -55,8 +56,7 @@ void WaylandSurfaceItem::surfaceDamaged(const QRect &)
 
     if (m_surface->type() == WaylandSurface::Texture) {
         m_texture = canvas()->sceneGraphEngine()->createTextureFromId(m_surface->texture(),
-                                                                      m_surface->geometry().size(),
-                                                                      QSGEngine::TextureOwnsGLTexture);
+                                                                      m_surface->geometry().size());
     } else {
         m_texture = canvas()->sceneGraphEngine()->createTextureFromImage(m_surface->image());
     }
@@ -183,10 +183,8 @@ QSGNode *WaylandSurfaceItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDa
         node->setTexture(m_texture);
     }
 
-    node->setRect(QRectF(0, 0, width(), height()));
-    node->setFiltering(QSGItemPrivate::get(this)->smooth
-                       ? QSGTexture::Linear
-                       : QSGTexture::Nearest);
+    node->setRect(QRectF(0, height(), width(), -height()));
+    node->setFiltering(smooth() ? QSGTexture::Linear : QSGTexture::Nearest);
 
     return node;
 }