summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Bakken <anders.bakken@nokia.com>2009-07-17 10:17:06 (GMT)
committerAnders Bakken <anders.bakken@nokia.com>2009-07-17 10:19:47 (GMT)
commitc90de88fca469c58cdfc29039d1597cc0c8cd9b2 (patch)
tree148eaea734e20e2ed6b8fe99b8ff2ccd2339418e
parentbb5692384aef0b87362966609b8fd58c0974e4b5 (diff)
downloadQt-c90de88fca469c58cdfc29039d1597cc0c8cd9b2.zip
Qt-c90de88fca469c58cdfc29039d1597cc0c8cd9b2.tar.gz
Qt-c90de88fca469c58cdfc29039d1597cc0c8cd9b2.tar.bz2
Don't create dfbsurface in video mem if systemonly
If DSCAPS_SYSTEMONLY is specified we shouldn't try to create the surface in video memory. Reviewed-by: TrustMe
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
index ecead0b..0928643 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
@@ -226,7 +226,9 @@ IDirectFBSurface *QDirectFBScreen::createDFBSurface(DFBSurfaceDescription desc,
return 0;
}
- if (d_ptr->directFBFlags & VideoOnly && !(desc.flags & DSDESC_PREALLOCATED)) {
+ if (d_ptr->directFBFlags & VideoOnly
+ && !(desc.flags & DSDESC_PREALLOCATED)
+ && (!(desc.flags & DSDESC_CAPS) || !(desc.caps & DSCAPS_SYSTEMONLY))) {
// Add the video only capability. This means the surface will be created in video ram
if (!(desc.flags & DSDESC_CAPS)) {
desc.caps = DSCAPS_VIDEOONLY;