diff options
| author | Michael Dominic K <mdk@codethink.co.uk> | 2010-11-11 07:25:10 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2010-11-11 07:25:10 (GMT) |
| commit | 4e7eb76cb231fc5a8b0deb67a87c45f6760e44bb (patch) | |
| tree | a36105d057ae7e53b9ba94a89002e716197209e3 /tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp | |
| parent | 8d6c8e95f47e6be3f8db85adc2412d55a6915ac4 (diff) | |
| download | Qt-4e7eb76cb231fc5a8b0deb67a87c45f6760e44bb.zip Qt-4e7eb76cb231fc5a8b0deb67a87c45f6760e44bb.tar.gz Qt-4e7eb76cb231fc5a8b0deb67a87c45f6760e44bb.tar.bz2 | |
Helper-side support for QMeeGoFenceSync.
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp')
| -rw-r--r-- | tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp b/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp index d43efe2..9700581f 100644 --- a/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp +++ b/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp @@ -41,6 +41,7 @@ #include "qmeegolivepixmap.h" #include "qmeegolivepixmap_p.h" +#include "qmeegofencesync_p.h" #include "qmeegoruntime.h" /* QMeeGoLivePixmapPrivate */ @@ -102,10 +103,12 @@ QMeeGoLivePixmap::~QMeeGoLivePixmap() { } -QImage* QMeeGoLivePixmap::lock() +QImage* QMeeGoLivePixmap::lock(QMeeGoFenceSync *fenceSync) { - return QMeeGoRuntime::lockLiveTexture(this); - + if (fenceSync) + return QMeeGoRuntime::lockLiveTexture(this, fenceSync->d_func()->syncObject); + else + return QMeeGoRuntime::lockLiveTexture(this, NULL); } void QMeeGoLivePixmap::release(QImage *img) |