diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-10-08 06:14:43 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-10-08 06:14:43 (GMT) |
commit | 3f0eb0416205600b97a0504006d7fbb09a10e035 (patch) | |
tree | 21fec3832a755c44d40c9ad1261b749747be7fe0 /tools/qmeegographicssystemhelper/qmeegoruntime.h | |
parent | 11536f150887266b6a6f5cf00b22f9d1fcc1aaeb (diff) | |
parent | 1ebf63580152cba99c54e0241633145b6d7927e3 (diff) | |
download | Qt-3f0eb0416205600b97a0504006d7fbb09a10e035.zip Qt-3f0eb0416205600b97a0504006d7fbb09a10e035.tar.gz Qt-3f0eb0416205600b97a0504006d7fbb09a10e035.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tools/qmeegographicssystemhelper/qmeegoruntime.h')
-rw-r--r-- | tools/qmeegographicssystemhelper/qmeegoruntime.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/qmeegographicssystemhelper/qmeegoruntime.h b/tools/qmeegographicssystemhelper/qmeegoruntime.h index 82fdb52..048b9be 100644 --- a/tools/qmeegographicssystemhelper/qmeegoruntime.h +++ b/tools/qmeegographicssystemhelper/qmeegoruntime.h @@ -48,13 +48,20 @@ public: static void initialize(); static Qt::HANDLE imageToEGLSharedImage(const QImage &image); - static QPixmap pixmapFromEGLSharedImage(Qt::HANDLE handle, const QImage &softImage); - static QPixmap pixmapWithGLTexture(int w, int h); + static QPixmapData* pixmapDataFromEGLSharedImage(Qt::HANDLE handle, const QImage &softImage); + static QPixmapData* pixmapDataFromEGLImage(Qt::HANDLE handle); + static QPixmapData* pixmapDataWithGLTexture(int w, int h); static bool destroyEGLSharedImage(Qt::HANDLE handle); static void updateEGLSharedImagePixmap(QPixmap *p); static void setSurfaceFixedSize(int w, int h); static void setSurfaceScaling(int x, int y, int w, int h); static void setTranslucent(bool translucent); + static Qt::HANDLE createLiveTexture(int w, int h, QImage::Format format); + static bool lockLiveTexture(Qt::HANDLE h); + static bool unlockLiveTexture(Qt::HANDLE h); + static void destroyLiveTexture(Qt::HANDLE h); + static void queryLiveTexture(Qt::HANDLE h, void **data, int *pitch); + static Qt::HANDLE liveTextureToEGLImage(Qt::HANDLE); private: static bool initialized; |