Invalidate the EGL surface of QMeeGoLivePixmapData when switching to Raster

QMeeGoLivePixmap fails to lock the EGL surface and texture after switch
to raster graphics system. The EGL surface is invalid after eglTerminate
call in switch. But QMeeGoLivePixmapData doesn't know about the switch.

Marking EGL surfaces and texture invalid after switch makes live pixmap
automatically recreate the surface when next time requiring live
pixmap.

Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>

Merge-request: 2571
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

7 files changed, 48 insertions, 1 deletions

diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
index 6b8d2b368d..13eab7f88f 100644
--- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
@@ -335,3 +335,8 @@ void qt_meego_destroy_fence_sync(void* fs)
 {
     return QMeeGoGraphicsSystem::destroyFenceSync(fs);
 }
+
+void qt_meego_invalidate_live_surfaces(void)
+{
+    return QMeeGoLivePixmapData::invalidateSurfaces();
+}
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.h b/src/plugins/graphicssystems/meego/qmeegographicssystem.h
index 323ce1fcb9..27a4e7a8c6 100644
--- a/src/plugins/graphicssystems/meego/qmeegographicssystem.h
+++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.h
@@ -103,6 +103,7 @@ extern "C" {
     Q_DECL_EXPORT Qt::HANDLE qt_meego_live_texture_get_handle(QPixmap *pixmap);
     Q_DECL_EXPORT void* qt_meego_create_fence_sync(void);
     Q_DECL_EXPORT void qt_meego_destroy_fence_sync(void* fs);
+    Q_DECL_EXPORT void qt_meego_invalidate_live_surfaces(void);
 }
 
 #endif 
diff --git a/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp b/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp
index e4f1900566..2a2a0989e4 100644
--- a/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp
@@ -49,6 +49,8 @@
 #include <private/qpixmap_x11_p.h>
 #include <stdio.h>
 
+static QMeeGoLivePixmapDataList all_live_pixmaps;
+
 static EGLint lock_attribs[] = {
     EGL_MAP_PRESERVE_PIXELS_KHR, EGL_TRUE,
     EGL_LOCK_USAGE_HINT_KHR, EGL_READ_SURFACE_BIT_KHR | EGL_WRITE_SURFACE_BIT_KHR,
@@ -118,21 +120,29 @@ QMeeGoLivePixmapData::QMeeGoLivePixmapData(int w, int h, QImage::Format format)
     backingX11Pixmap = new QPixmap(pmd);
 
     initializeThroughEGLImage();
+
+    pos = all_live_pixmaps.insert(all_live_pixmaps.begin(), this);
 }
 
 QMeeGoLivePixmapData::QMeeGoLivePixmapData(Qt::HANDLE h) : QGLPixmapData(QPixmapData::PixmapType)
 {
     backingX11Pixmap = new QPixmap(QPixmap::fromX11Pixmap(h));
     initializeThroughEGLImage();
+
+    pos = all_live_pixmaps.insert(all_live_pixmaps.begin(), this);
 }
 
 QMeeGoLivePixmapData::~QMeeGoLivePixmapData()
 {
     delete backingX11Pixmap;
+    all_live_pixmaps.erase(pos);
 }
 
 void QMeeGoLivePixmapData::initializeThroughEGLImage()
 {
+    if (texture()->id != 0)
+        return;
+
     QGLShareContextScope ctx(qt_gl_share_widget()->context());
     QMeeGoExtensions::ensureInitialized();
 
@@ -245,6 +255,8 @@ bool QMeeGoLivePixmapData::scroll(int dx, int dy, const QRect &rect)
 
 EGLSurface QMeeGoLivePixmapData::getSurfaceForBackingPixmap()
 {
+    initializeThroughEGLImage();
+
     // This code is a crative remix of the stuff that can be found in the
     // Qt's TFP implementation in /src/opengl/qgl_x11egl.cpp ::bindiTextureFromNativePixmap
     QX11PixmapData *pixmapData = static_cast<QX11PixmapData*>(backingX11Pixmap->data_ptr().data());
@@ -290,3 +302,12 @@ void QMeeGoLivePixmapData::destroySurfaceForPixmapData(QPixmapData* pmd)
         pixmapData->gl_surface = 0;
     }
 }
+
+void QMeeGoLivePixmapData::invalidateSurfaces()
+{
+    foreach (QMeeGoLivePixmapData *data, all_live_pixmaps) {
+        QX11PixmapData *pixmapData = static_cast<QX11PixmapData*>(data->backingX11Pixmap->data_ptr().data());
+        *data->texture() = QGLTexture();
+        pixmapData->gl_surface = 0;
+    }
+}
diff --git a/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h b/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h
index 484028e61d..616b33cc95 100644
--- a/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h
+++ b/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h
@@ -42,9 +42,13 @@
 #ifndef MLIVEPIXMAPDATA_H
 #define MLIVEPIXMAPDATA_H
 
+#include <QLinkedList>
 #include <private/qpixmapdata_gl_p.h>
 #include "qmeegoextensions.h"
 
+class QMeeGoLivePixmapData;
+typedef QLinkedList<QMeeGoLivePixmapData *> QMeeGoLivePixmapDataList;
+
 class QMeeGoLivePixmapData : public QGLPixmapData
 {
 public:
@@ -66,6 +70,9 @@ public:
 
     QPixmap *backingX11Pixmap;
     QImage lockedImage;
+    QMeeGoLivePixmapDataList::Iterator pos;
+
+    static void invalidateSurfaces();
 };
 
 #endif
diff --git a/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.cpp b/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.cpp
index e1c0460f61..ac3299506e 100644
--- a/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.cpp
+++ b/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.cpp
@@ -111,6 +111,8 @@ void QMeeGoGraphicsSystemHelper::switchToRaster()
         QApplication *app = static_cast<QApplication *>(QCoreApplication::instance());
         app->setGraphicsSystem(QLatin1String("raster"));
 
+	QMeeGoRuntime::invalidateLiveSurfaces();
+
         QMeeGoSwitchEvent didSwitchEvent(QLatin1String("raster"), QMeeGoSwitchEvent::DidSwitch);
         foreach (QWidget *widget, QApplication::topLevelWidgets())
             QCoreApplication::sendEvent(widget, &didSwitchEvent);
diff --git a/tools/qmeegographicssystemhelper/qmeegoruntime.cpp b/tools/qmeegographicssystemhelper/qmeegoruntime.cpp
index c32b654f1d..7c81d517fc 100644
--- a/tools/qmeegographicssystemhelper/qmeegoruntime.cpp
+++ b/tools/qmeegographicssystemhelper/qmeegoruntime.cpp
@@ -65,6 +65,7 @@ typedef bool (*QMeeGoLiveTextureReleaseFunc) (QPixmap*, QImage *i);
 typedef Qt::HANDLE (*QMeeGoLiveTextureGetHandleFunc) (QPixmap*);
 typedef void* (*QMeeGoCreateFenceSyncFunc) (void);
 typedef void (*QMeeGoDestroyFenceSyncFunc) (void *fs);
+typedef void (*QMeeGoInvalidateLiveSurfacesFunc) (void);
 
 static QMeeGoImageToEglSharedImageFunc qt_meego_image_to_egl_shared_image = NULL;
 static QMeeGoPixmapDataFromEglSharedImageFunc qt_meego_pixmapdata_from_egl_shared_image = NULL;
@@ -81,6 +82,7 @@ static QMeeGoLiveTextureReleaseFunc qt_meego_live_texture_release = NULL;
 static QMeeGoLiveTextureGetHandleFunc qt_meego_live_texture_get_handle = NULL;
 static QMeeGoCreateFenceSyncFunc qt_meego_create_fence_sync = NULL;
 static QMeeGoDestroyFenceSyncFunc qt_meego_destroy_fence_sync = NULL;
+static QMeeGoInvalidateLiveSurfacesFunc qt_meego_invalidate_live_surfaces = NULL;
 
 void QMeeGoRuntime::initialize()
 {
@@ -109,13 +111,14 @@ void QMeeGoRuntime::initialize()
         qt_meego_live_texture_get_handle = (QMeeGoLiveTextureGetHandleFunc) library.resolve("qt_meego_live_texture_get_handle");
         qt_meego_create_fence_sync = (QMeeGoCreateFenceSyncFunc) library.resolve("qt_meego_create_fence_sync");
         qt_meego_destroy_fence_sync = (QMeeGoDestroyFenceSyncFunc) library.resolve("qt_meego_destroy_fence_sync");
+        qt_meego_invalidate_live_surfaces = (QMeeGoInvalidateLiveSurfacesFunc) library.resolve("qt_meego_invalidate_live_surfaces");
 
         if (qt_meego_image_to_egl_shared_image && qt_meego_pixmapdata_from_egl_shared_image && 
             qt_meego_pixmapdata_with_gl_texture && qt_meego_destroy_egl_shared_image && qt_meego_update_egl_shared_image_pixmap && 
             qt_meego_set_surface_fixed_size && qt_meego_set_surface_scaling && qt_meego_set_translucent && 
             qt_meego_pixmapdata_with_new_live_texture && qt_meego_pixmapdata_from_live_texture_handle &&
             qt_meego_live_texture_lock && qt_meego_live_texture_release && qt_meego_live_texture_get_handle &&
-            qt_meego_create_fence_sync && qt_meego_destroy_fence_sync)
+            qt_meego_create_fence_sync && qt_meego_destroy_fence_sync && qt_meego_invalidate_live_surfaces)
         {
             qDebug("Successfully resolved MeeGo graphics system: %s %s\n", qPrintable(libraryPrivate->fileName), qPrintable(libraryPrivate->fullVersion));
         } else {
@@ -232,3 +235,10 @@ void QMeeGoRuntime::destroyFenceSync(void *fs)
     Q_ASSERT(qt_meego_destroy_fence_sync);
     qt_meego_destroy_fence_sync(fs);
 }
+
+void QMeeGoRuntime::invalidateLiveSurfaces()
+{
+    ENSURE_INITIALIZED;
+    Q_ASSERT(qt_meego_invalidate_live_surfaces);
+    qt_meego_invalidate_live_surfaces();
+}
diff --git a/tools/qmeegographicssystemhelper/qmeegoruntime.h b/tools/qmeegographicssystemhelper/qmeegoruntime.h
index bdc4eefa5a..b91efae838 100644
--- a/tools/qmeegographicssystemhelper/qmeegoruntime.h
+++ b/tools/qmeegographicssystemhelper/qmeegoruntime.h
@@ -62,6 +62,7 @@ public:
     static Qt::HANDLE getLiveTextureHandle(QPixmap *pixmap);
     static void* createFenceSync();
     static void destroyFenceSync(void *fs);
+    static void invalidateLiveSurfaces();
 
 private:
     static bool initialized;