diff options
author | Ian Walters <ian.walters@nokia.com> | 2009-05-12 00:18:56 (GMT) |
---|---|---|
committer | Ian Walters <ian.walters@nokia.com> | 2009-05-12 00:18:56 (GMT) |
commit | a7d54ce95b9cb1cd923ea202fc7b561792003d0d (patch) | |
tree | ca33410ab469c0f10040260e1d133ba835c1017f /src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h | |
parent | ee533dd0818c3bf7c940cd2d543adb1c6807dd1c (diff) | |
parent | 4af513212d9ca9ed88e18bddaabd90006aca8541 (diff) | |
download | Qt-a7d54ce95b9cb1cd923ea202fc7b561792003d0d.zip Qt-a7d54ce95b9cb1cd923ea202fc7b561792003d0d.tar.gz Qt-a7d54ce95b9cb1cd923ea202fc7b561792003d0d.tar.bz2 |
Merge branch 'master' into contiguouscache
Diffstat (limited to 'src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h')
-rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h index a11064b..13f0a8f 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h @@ -58,7 +58,7 @@ public: IDirectFBSurface *directFBSurface() const; - void lockDirectFB(); + void lockDirectFB(uint flags); void unlockDirectFB(); inline bool forceRasterPrimitives() const { return forceRaster; } @@ -69,6 +69,7 @@ public: int bytesPerLine() const; QSize size() const; int metric(QPaintDevice::PaintDeviceMetric metric) const; + uint lockFlags() const { return lock; } protected: // Shouldn't create QDirectFBPaintDevice by itself but only sub-class it: QDirectFBPaintDevice(QDirectFBScreen *scr = QDirectFBScreen::instance()) @@ -76,7 +77,10 @@ protected: dfbSurface(0), lockedImage(0), screen(scr), - forceRaster(false) {} + forceRaster(false), + lock(0), + mem(0) + {} inline int dotsPerMeterX() const { @@ -92,6 +96,8 @@ protected: QDirectFBScreen *screen; int bpl; bool forceRaster; + uint lock; + uchar *mem; private: Q_DISABLE_COPY(QDirectFBPaintDevice) }; |