summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-121-2/+4
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-04-121-1/+3
| |\
| | * Allow y-interted pixmaps for brushes in GL2 paint engineTom Cooksey2010-04-091-1/+3
| * | Fix antialiasing with transformed text in OpenGL2 paint engineEskil Abrahamsen Blomfeldt2010-04-121-1/+1
| |/
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-121-1/+1
|\ \ | |/ |/|
| * Fixed caching of QPainter patterns in the GL 2 engine.Trond Kjernåsen2010-04-071-1/+1
* | Compile Qt in C++0x mode.Thiago Macieira2010-03-201-4/+4
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-161-12/+12
|\ \
| * | Optimize drawPixmapFragments for the GL2 paint engine.Michael Brasser2010-03-151-12/+12
* | | Implement a special case, simplified vertex shader for complex geometryEskil Abrahamsen Blomfeldt2010-03-161-1/+12
|/ /
* | Added clipping to the dashed stroke processor in the GL2 engine.Kim Motoyoshi Kalland2010-03-101-3/+7
* | Compile with Qt3Support in a ScratchBox environment.Trond Kjernåsen2010-03-101-1/+1
* | Renamed QPainter::Fragment/Hint -> QPainter::PixmapFragment/HintTrond Kjernåsen2010-03-091-3/+4
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-061-0/+1
|\ \ | |/
| * Fixed an exit crash that could occur in the GL 2 engine under X11.Trond Kjernåsen2010-03-041-0/+1
* | Remove comment in drawStaticTextItem() in GL engineEskil Abrahamsen Blomfeldt2010-02-241-1/+0
* | Made the qDrawPixmaps() API public (with modifications).Trond Kjernåsen2010-02-231-23/+27
* | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-201-25/+175
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-191-1/+3
| |\ \
| | * | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-161-1/+3
| * | | Add experimental VBO support for drawCachedGlyphs()'s index arrayEskil Abrahamsen Blomfeldt2010-02-181-0/+29
| * | | Optimization for text drawing on OpenGLEskil Abrahamsen Blomfeldt2010-02-181-1/+5
| * | | Fix alpha check for OpenGL/ES in GL2 paint engineRhys Weatherley2010-02-151-0/+4
| * | | Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7Eskil Abrahamsen Blomfeldt2010-02-151-32/+154
| |\ \ \ | | |/ /
| * | | Make QStaticText public API againEskil Abrahamsen Blomfeldt2010-02-101-1/+1
| * | | Use glDrawElements and triangle strips to draw glyphs in GL engineEskil Abrahamsen Blomfeldt2010-02-091-4/+19
| * | | Remove VBO caching and glDrawElements path in QStaticTextEskil Abrahamsen Blomfeldt2010-02-081-124/+43
| * | | Clean up VBOs cached in QStaticText when context is deletedEskil Abrahamsen Blomfeldt2010-02-051-18/+36
| * | | Add explanatory comment to QGL2PaintEngineExPrivate::drawCachedGlyphsEskil Abrahamsen Blomfeldt2010-02-051-0/+3
| * | | Recreate cached vertex arrays for QStaticText when drawn to new contextEskil Abrahamsen Blomfeldt2010-02-051-3/+11
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into qstat...Eskil Abrahamsen Blomfeldt2010-02-041-0/+3
| |\ \ \
| * | | | Small optimization for QStaticText when used with index arraysEskil Abrahamsen Blomfeldt2010-02-041-4/+13
| * | | | Fix broken text drawing in OpenGL engine when text items are too longEskil Abrahamsen Blomfeldt2010-02-021-3/+3
| * | | | Add experimental support for using drawElements to draw cached textEskil Abrahamsen Blomfeldt2010-02-021-3/+34
| * | | | Merge branch '4.6' into qstatictext-4.6Eskil Abrahamsen Blomfeldt2010-02-011-19/+9
| |\ \ \ \
| * | | | | Fix transformed painting of QStaticText in GL2 paint engineEskil Abrahamsen Blomfeldt2010-02-011-7/+20
| * | | | | Make QStaticText private APIEskil Abrahamsen Blomfeldt2010-02-011-1/+1
| * | | | | Remove reference to _ARB macrosEskil Abrahamsen Blomfeldt2010-02-011-9/+9
| * | | | | Improve performance of QStaticText on OpenGL by caching data on GPUEskil Abrahamsen Blomfeldt2010-01-291-10/+82
| * | | | | CompileEskil Abrahamsen Blomfeldt2010-01-151-18/+3
| * | | | | CompileEskil Abrahamsen Blomfeldt2010-01-141-1/+16
| * | | | | Implement drawStaticTextItem() in OpenGL paint enginesEskil Abrahamsen Blomfeldt2010-01-141-15/+40
| * | | | | Support transformations in drawStaticText() and optimize for spaceEskil Abrahamsen Blomfeldt2010-01-141-1/+1
| * | | | | Optimize QStaticText for spaceEskil Abrahamsen Blomfeldt2010-01-141-1/+1
* | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-201-1/+3
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Fix building in a namespace on WindowsAndy Shaw2010-02-191-1/+3
* | | | | | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-171-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Moved 'hasAlpha' property from GL2 engine to GL paint device.Kim Motoyoshi Kalland2010-02-121-22/+1
| * | | | Compile fix for OpenGL ES.Kim Motoyoshi Kalland2010-02-121-1/+5
| * | | | Turned off subpixel AA text on surface with alpha in GL2 engine.Kim Motoyoshi Kalland2010-02-121-7/+24
| | |_|/ | |/| |