summaryrefslogtreecommitdiffstats
path: root/src/plugins/gfxdrivers
Commit message (Collapse)AuthorAgeFilesLines
* Merge license header changes from 4.5Volker Hilsheimer2009-06-1639-80/+80
|\
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1639-78/+78
| | | | | | | | Reviewed-by: Trust Me
| * Get rid of warningsAnders Bakken2009-06-141-2/+2
| | | | | | | | Reviewed-by: TrustMe
* | ControlPointRect is no longer a QRealRectAnders Bakken2009-06-141-1/+1
| | | | | | | | | | | | | | | | s/y2/bottom()/ Compile. Reviewed-by: TrustMe
* | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-125-7/+48
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| * Make DirectFB compile with 0.9.22Anders Bakken2009-06-092-3/+8
| | | | | | | | | | | | | | Some options were added for 0.9.23. This change adds some ifdefs so DFB 0.9.22 compiles Reviewed-by: TrustMe
| * Make the directfb plugin compile against 0.9Anders Bakken2009-06-085-4/+40
| | | | | | | | | | | | | | | | | | | | Not sure to what extent it actually works but atleast it compiles now. - A couple of image formats doesn't exist in 0.9 - IDirectFBSurface::ReleaseSource doesn't exist in 0.9 - IDirectFBWindow::SetBounds doesn't exist in 0.9 Reviewed-by: Donald <qt-info@nokia.com>
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-081-3/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
| * Make sure to retain alpha information in copyAnders Bakken2009-06-041-3/+4
| | | | | | | | | | | | We need to set alpha to the right value when copying pixmaps. Reviewed-by: Donald <qt-info@nokia.com>
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-025-194/+81
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tests/auto/selftests/expected_skip.txt tests/auto/selftests/tst_selftests.cpp
| * Improve readability of QDFBWindowSurface::scrollAnders Bakken2009-06-011-21/+18
| | | | | | | | | | | | The batch-blits buys us nothing and this is much more readable. Reviewed-by: TrustMe
| * Don't support porter duff |= source overAnders Bakken2009-05-291-96/+24
| | | | | | | | | | | | | | | | DirectFB and Qt treats these things rather differently so the mapping just doesn't work very well. Only use DirectFB for SourceOver stuff (which is the default mode anyway) Reviewed-by: Donald <qt-info@nokia.com>
| * Remove all force raster on RGB32 stuffAnders Bakken2009-05-284-75/+32
| | | | | | | | | | | | | | | | | | Previously we allowed RGB32 but forced fallbacks for all drawing operations. It turns out blitting operations doesn't work right either so we'll rather just disallow this format altogether. See also 36ae58e7a6a888d3ae7bd162d59daada550bbfb1 Reviewed-by: Donald <qt-info@nokia.com>
| * Warn when trying to use an unsupported formatAnders Bakken2009-05-281-5/+10
| | | | | | | | | | | | | | Due to incompatibilities between RGB32 in DirectFB and Qt we can't use RGB32. Reviewed-by: Donald <qt-info@nokia.com>
* | improved string operations all over the placeThierry Bastian2009-05-282-4/+4
| | | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | Merge branch '4.5'Thiago Macieira2009-05-221-1/+1
|\ \ | |/
| * Removed warningAnders Bakken2009-05-211-1/+1
| | | | | | | | | | | | Explicitly cast to integer. Reviewed-by: Shane McLaughlin <Shane.McLaughlin@trolltech.com>
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-133-6/+10
|\ \ | |/
| * Fixed wrong function name in warningAnders Bakken2009-05-121-3/+3
| | | | | | | | Reviewed-by: Donald <qt-info@nokia.com>
| * initialize all DFBSurfaceDescriptions to 0Anders Bakken2009-05-111-1/+6
| | | | | | | | | | | | Since this is C there are no constructors. Reviewed-by: Donald <qt-info@nokia.com>
| * Remove unused variableAnders Bakken2009-05-111-1/+0
| | | | | | | | Reviewed-by: TrustMe
| * Fix a type in warningAnders Bakken2009-05-111-1/+1
| | | | | | | | | | | | QDirecttFBPixmapData => QDirectFBPixmapData Reviewed-by: TrustMe
* | Merge branch '4.5'Thiago Macieira2009-05-071-10/+2
|\ \ | |/ | | | | | | | | Conflicts: src/gui/painting/qbackingstore.cpp src/gui/painting/qwindowsurface_raster.cpp
| * Whitespace fixAnders Bakken2009-05-071-1/+1
| | | | | | | | Reviewed-by: TrustMe
| * Use proper ways to create "window" surfaceAnders Bakken2009-05-061-9/+1
| | | | | | | | Reviewed-by: TrustMe
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-0615-703/+750
|\ \ | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| * Improved debug output for directfb:debugAnders Bakken2009-05-061-6/+10
| | | | | | | | | | | | Include info on the primary surface pixelformat. Reviewed-by: TrustMe
| * Pass the scale parameter as an int.Anders Bakken2009-05-061-1/+1
| | | | | | | | | | | | We're just printout out the integer value anyway. Reviewed-by: TrustMe
| * Make Scale publicAnders Bakken2009-05-061-1/+3
| | | | | | | | | | Needed for fallback warnings Reviewed-by: TrustMe
| * Cleaned up codeAnders Bakken2009-05-051-24/+20
| | | | | | | | | | | | | | | | | | Put all variables in the same area for QDirectFBPaintEnginePrivate. Make QDirectFBPaintEngine a friend. Also, do away with setClipDirty and replace it with d->clipDirty = true; Reviewed-by: TrustMe
| * Cleaned up codeAnders Bakken2009-05-051-439/+443
| | | | | | | | | | | | | | Move private functions to the bottom of the file to be more in line with how most qt cpp files are structured. Reviewed-by: TrustMe
| * Refactored image cachingAnders Bakken2009-05-057-141/+147
| | | | | | | | | | | | | | | | | | | | | | Make image caching a lot cleaner and more sensible. By default we do not cache images since creating a preallocated surface is quick and we don't really want to waste memory. In the case where the driver does not support preallocated surfaces you can enable image caching to speed up drawImage. Reviewed-by: TrustMe
| * Make sure image caching works with Qt3SupportAnders Bakken2009-05-051-0/+1
| | | | | | | | | | | | | | | | | | Store whether qt was built with qt3support enabled in .qmake.cache. We need this info to decide if QT3_SUPPORT should be defined when we include qimage_p.h. Otherwise we get data corruption issues since the size of struct in Qt is larger than the one we include in libqdirectfb. Reviewed-by: Donald <qt-info@nokia.com>
| * Cleaned up code a littleAnders Bakken2009-05-051-41/+28
| | | | | | | | | | | | Made SurfaceCache entirely inline for better readability. Reviewed-by: TrustMe
| * Don't call prepare more than necessaryAnders Bakken2009-05-053-22/+37
| | | | | | | | | | | | | | | | | | | | | | Store the memory address of our last QRasterBuffer::prepare() call to make sure we reprepare if someone has unlocked and locked the device behind our back. Also optimize QDirectFBDevice::memory() since it might get called a fair bit. Reviewed-by: Donald <qt-info@nokia.com>
| * DirectFB can't handle "mirrored" scalesAnders Bakken2009-05-051-14/+23
| | | | | | | | | | | | | | | | Fall back to raster engine when using a transform with m11 < 0 || m22 < 0. Task-number: 252921 Reviewed-by: Donald <qt-info@nokia.com>
| * Improved debug outputAnders Bakken2009-05-051-30/+30
| | | | | | | | | | | | | | Format the debug info on blitting, drawing and acceleration capabilities better. Reviewed-by: TrustMe
| * Add QMAKE_INCDIR_POWERVR to specify the location of pvr2d.h & wsegl.hTom Cooksey2009-05-054-4/+11
| | | | | | | | | | | | | | | | Allow setting of a QMAKE_INCDIR_POWERVR in the mkspec to specify where the pvr2d.h & wsegl.h files are located. Set to src/3rdparty/powervr to use the headers distributed with Qt (for SGX-based SoCs). Reviewed-by: Trustme
| * Add headers required for building PowerVR driverTom Cooksey2009-05-051-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PowerVR driver on Qt for Embedded Linux needs to use Imagination Techologies' proprietary pvr2d & wsegl APIs. These are the headers for those APIs, allowing the powervr driver to be built. Ideally, these headers would be provided as part of the SDK supplied by chipset vendors. For now, we include these headers to let people get going with the driver. Licence headers were approved by legal for inclusion into Qt, after some negotiation with ImgTec (who have also approved their inclusion into Qt). The headers have also passed a scan by Talko, provided the licence headers aren't touched. Reviewed-by: Paul
| * Rename QDirectFBSurface to QDirectFBWindowSurfaceAnders Bakken2009-05-045-34/+34
| | | | | | | | | | | | | | This helps avoid confusion between IDirectFBSurface and QDirectFBSurface. Reviewed-by: Donald <qt-info@nokia.com>
| * Lock for read only when possibleAnders Bakken2009-05-049-25/+40
| | | | | | | | | | | | | | | | | | | | From benchmarking I've established that surface->Lock(DSLF_READ) is faster than surface->Lock(DSLF_WRITE) which is faster than surface->Lock(DSLF_READ|DSLF_WRITE). This patch will make us Lock for read only, when possible. Reviewed-by: Donald <qt-info@nokia.com>
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-045-68/+171
|\ \ | |/ | | | | | | Conflicts: src/gui/itemviews/qabstractitemview.cpp
| * Implemented an option to tune flippingAnders Bakken2009-05-044-3/+11
| | | | | | | | | | | | | | | | export QWS_DISPLAY=directfb:boundingrectflip to enable calling Flip on the bounding rect of the dirtied area rather than each dirty rectangle. This could be faster if you update many small rectangles. Reviewed-by: TrustMe
| * Beautified codeAnders Bakken2009-05-022-17/+17
| | | | | | | | | | | | Qt's coding style => Object *ptr, not Object* ptr Reviewed-by: TrustMe
| * Improve debug output (in debug mode only)Anders Bakken2009-05-011-2/+83
| | | | | | | | | | | | | | Print out detailed information about acceleration mask, blitting flags and drawing flags when passing debug. Reviewed-by: Donald <qt-info@nokia.com>
| * Extended surface capabilitiesAnders Bakken2009-05-012-6/+31
| | | | | | | | | | | | | | Clean up code and make it possible to set more DFBSurfaceCapabilities on the primary surface. Also allow users to force systemonly for the surfaces.
| * Cleaned up surface creation codeAnders Bakken2009-05-014-34/+28
| | | | | | | | | | | | | | | | Since I am taking a copy of the description anyway it makes sense to just pass this light-weight object in as a copy rather than a const pointer. Reviewed-by: Donald <qt-info@nokia.com>
| * Improved readability of the flip codeAnders Bakken2009-05-011-7/+2
| | | | | | | | Reviewed-by: Donald <qt-info@nokia.com>
| * Fixed possible crash in QDirectFBPaintEngine::clipAnders Bakken2009-05-011-1/+1
| | | | | | | | | | | | | | d->clip() might return 0 at this point so make sure we check before accessing it. Reviewed-by: TrustMe
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-297-183/+224
|\ \ | |/