Don't clobber the m_damaged state during rendering.

If the QWaylandSurfaceNode had m_damage during preprocess()
(which it could get if the GUI thread got a surfaceDamaged)
it would call into the item, update its texture and clear its
m_damaged state. This resulted in that the next time we
advanced the buffer queue, the item would not have m_damaged
set and as a result, the texture would not be updated.

Also, the call from preprocess() to updateTexture, though protected by
a mutex in preprocess(), touched a number of variables on the GUI
thread which were not being protected there, such as m_damaged and
smooth().

The QWaylandSurfaceNode was doing this primarily to deal with direct
rendering which has been removed pending a better solution, so we
replace its use with the built-in QSGSimpleTextureNode.

Change-Id: Ifccb6b1149980b4796a182fa8525446a00bbe57f
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/src/compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri
index 06d895540..87d28003c 100644
--- a/src/compositor/compositor_api/compositor_api.pri
+++ b/src/compositor/compositor_api/compositor_api.pri
@@ -18,12 +18,10 @@ QT += core-private
 
 qtHaveModule(quick) {
     SOURCES += \
-        compositor_api/qwaylandsurfaceitem.cpp \
-        compositor_api/qwaylandsurfacenode.cpp
+        compositor_api/qwaylandsurfaceitem.cpp
 
     HEADERS += \
-        compositor_api/qwaylandsurfaceitem.h \
-        compositor_api/qwaylandsurfacenode_p.h
+        compositor_api/qwaylandsurfaceitem.h
 
     DEFINES += QT_COMPOSITOR_QUICK