diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-10-01 06:54:02 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-10-01 08:19:24 (GMT) |
| commit | 9c0b1db38f7ad8b6b0d51410033854be72146e74 (patch) | |
| tree | 0764e740dfa48c0df4093474e5b4f49f52183686 /src/gui/image | |
| parent | 790583dc16a89ed77954c096aae52bf9f91aec09 (diff) | |
| download | Qt-9c0b1db38f7ad8b6b0d51410033854be72146e74.zip Qt-9c0b1db38f7ad8b6b0d51410033854be72146e74.tar.gz Qt-9c0b1db38f7ad8b6b0d51410033854be72146e74.tar.bz2 | |
Split EGL config selection & surface creation into seperate functions
This is needed to implement render-to-pixmap on x11/EGL, which will also
need to create an EGL surface for pixmaps.
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qpixmap_x11_p.h | 2 | ||||
| -rw-r--r-- | src/gui/image/qpixmapdata_p.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/image/qpixmap_x11_p.h b/src/gui/image/qpixmap_x11_p.h index ed8678d..e34e690 100644 --- a/src/gui/image/qpixmap_x11_p.h +++ b/src/gui/image/qpixmap_x11_p.h @@ -100,6 +100,8 @@ private: friend class QX11WindowSurface; friend class QRasterWindowSurface; friend class QGLContextPrivate; // Needs to access xinfo, gl_surface & flags + friend class QEglContext; // Needs gl_surface + friend bool qt_createEGLSurfaceForPixmap(QPixmapData*, bool); // Needs gl_surface void release(); diff --git a/src/gui/image/qpixmapdata_p.h b/src/gui/image/qpixmapdata_p.h index 3e85236..c26fba3 100644 --- a/src/gui/image/qpixmapdata_p.h +++ b/src/gui/image/qpixmapdata_p.h @@ -134,6 +134,7 @@ private: friend class QS60PixmapData; friend class QGLTextureCache; //Needs to check the reference count friend class QExplicitlySharedDataPointer<QPixmapData>; + friend bool qt_createEGLSurfaceForPixmap(QPixmapData*, bool); // Needs to set is_cached QAtomicInt ref; int detach_no; |