From: Samuel Rødal <samuel.rodal@nokia.com>
Date: Thu, 12 May 2011 08:49:10 +0000 (+0200)
Subject: Fixed missing texture updates.
X-Git-Tag: qt-v5.0.0-alpha1~279
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=430591673d9d8adebd9039f78bc60b819c0c6135;p=profile%2Fivi%2Fqtwayland.git

Fixed missing texture updates.

Make sure we get a new texture id, so that
QSGSimpleTextureNode::setTexture() doesn't return early.
---

diff --git a/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp b/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp
index 772fb31..9281831 100644
--- a/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp
+++ b/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp
@@ -51,8 +51,7 @@
 
 void WaylandSurfaceItem::surfaceDamaged(const QRect &)
 {
-    if (m_texture)
-        delete m_texture;
+    QSGTexture *oldTexture = m_texture;
 
     if (m_surface->type() == WaylandSurface::Texture) {
         m_texture = canvas()->sceneGraphEngine()->createTextureFromId(m_surface->texture(),
@@ -61,6 +60,8 @@ void WaylandSurfaceItem::surfaceDamaged(const QRect &)
         m_texture = canvas()->sceneGraphEngine()->createTextureFromImage(m_surface->image());
     }
 
+    delete oldTexture;
+
     emit textureChanged();
 }