summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-06-222-26/+9
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-06-101-2/+5
| |\
| | * Fixing OpenGL module build error on SolarisMartin Pejcoch2011-06-101-2/+5
| * | Simplify texture pooling logic in GL graphics system.Jani Hautakangas2011-06-091-24/+4
| |/
| * Update licenseheader text in source filesJyri Tahtela2011-05-1317-289/+289
| * Fix missing glyphs for large fonts with QStaticText/GL/FreetypeEskil Abrahamsen Blomfeldt2011-04-291-1/+1
* | Adding debug output for not supported gl featuresIan2011-06-201-0/+33
* | Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-0619-323/+323
|\ \
| * | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1319-323/+323
* | | Refactor glyph pretransform checkJiang Jiang2011-06-031-0/+1
* | | Fall back to using paths for large fonts in drawStaticText()Eskil Abrahamsen Blomfeldt2011-05-181-11/+22
|/ /
* | Support gamma correction of text on GLEskil Abrahamsen Blomfeldt2011-05-031-2/+29
* | Added support for six-parameter radial gradients.Samuel Rødal2011-04-134-5/+25
* | Made extension resolving work with Core profile.Samuel Rødal2011-04-051-18/+25
* | opengl2: Make maximum cached glyph size configurableSami Kyöstilä2011-03-311-1/+6
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-283-2/+24
|\ \
| * | Reset GL glyph cache when texture limit is reachedEskil Abrahamsen Blomfeldt2011-03-233-2/+24
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-241-4/+0
|\ \ \ | |/ / |/| / | |/
| * Change Symbian to use destroyed swap behaviour in GLJani Hautakangas2011-03-221-4/+0
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-03-211-2/+13
|\ \
| * | Optimized glyph uploads in GL texture cache.Samuel Rødal2011-03-211-2/+13
* | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-173-8/+28
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-161-4/+24
| |\ \ \ | | |/ / | |/| / | | |/
| | * Initial implementation of GLES2.0 resource poolingJani Hautakangas2011-03-151-4/+24
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-141-2/+2
| |\ \
| | * | Fix static text item positioning GL2 paint engineJiang Jiang2011-03-111-2/+2
| * | | Update copyright year to 2011.Rohan McGovern2011-03-102-2/+2
| |/ /
* | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-013-6/+16
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-033-4/+14
| |\ \ | | |/
| | * Fixed missing text when using static text items in GL 2 engine.Samuel Rødal2011-02-023-5/+14
| * | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-01-271-3/+18
| |\ \
| * \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Fix static build on Windows with MinGW.Mark Brand2011-01-171-2/+2
* | | | Export QGLEngineSharedShadersJørgen Lind2011-02-091-1/+1
* | | | Precision specifiers are not allowed for shader variablesKristian Høgsberg2011-01-271-14/+14
| |_|/ |/| |
* | | Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-2617-29/+29
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1717-21/+17
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-1017-17/+17
| | |\
| | | * Update copyright year to 2011.Jason McDonald2011-01-1017-17/+17
| | * | Merge branch 'graphics-team-text-4.7' into 4.7Eskil Abrahamsen Blomfeldt2011-01-101-4/+0
| | |\ \ | | | |/ | | |/|
| | | * Fix regression in text rendering in OpenGL2 engineEskil Abrahamsen Blomfeldt2011-01-051-4/+0
| * | | Merge branch 'qt-graphics-team-text-master'Eskil Abrahamsen Blomfeldt2011-01-101-8/+12
| |\ \ \
| | * | | Optimize texture glyph cacheEskil Abrahamsen Blomfeldt2010-12-211-8/+12
* | | | | Make it possible to vertically mirror gl paintingJørgen Lind2011-01-261-3/+18
|/ / / /
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-213-136/+713
|\ \ \ \
| * | | | Add inter-process binary shader cache for MeeGoHarald Fernengel2010-12-213-136/+713
| |/ / /
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-203-5/+52
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Add work around for bug when painting w/glTexSubImage into large textureEskil Abrahamsen Blomfeldt2010-12-161-1/+4
| |/
| * Don't delete FBO when resetting glyph cacheEskil Abrahamsen Blomfeldt2010-12-141-4/+7
| * Fixed GL 2 engine rendering of images / pixmaps above max texture size.Samuel Rødal2010-12-132-5/+49