summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-071-1/+19
|\
| * Do not let QGLContext get out of sync when doing mixed VG-GL renderingLaszlo Agocs2011-10-061-2/+19
* | wtf? .pro.user files? congrats to overriding the hook!Oswald Buddenhagen2011-09-131-83/+0
* | Fix QGLGlyphCache for Open GL ES (1).Eike Ziller2011-08-241-15/+20
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-031-18/+30
|\ \
| * | Fix gamma corrected source color in GLJiang Jiang2011-07-291-18/+30
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-015-28/+151
|\ \ \ | |/ /
| * | Fixed holes in border image drawing by introducing new API.Samuel Rødal2011-07-262-15/+123
| * | Properly resolve and use glMapBuffer / glUnmapBuffer on GLES2.Samuel Rødal2011-07-263-13/+28
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-221-0/+4
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-211-0/+4
| |\
| | * Fix compilation on Symbian platforms without SgImage supportJani Hautakangas2011-07-211-0/+4
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-201-12/+8
|\ \ \ | |/ /
| * | Don't use GL_REPEAT for NPOT textures in GLES2.Samuel Rødal2011-07-181-1/+12
| |/
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-07-081-0/+6
|\ \
| * \ Merge remote branch 'upstream/4.8'Jerome Pasion2011-07-085-476/+345
| |\ \
| * | | Doc: Updated documentation with \since 4.8 declarations.David Boddie2011-06-301-0/+6
* | | | Merge remote branch 'mainline/4.8' into stagingJiang Jiang2011-07-085-476/+345
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-07-045-476/+345
| |\ \ \ | | |/ / | |/| / | | |/
| | * Introduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engineJani Hautakangas2011-06-305-471/+336
* | | Don't issue GL calls when the geometry is emptyEskil Abrahamsen Blomfeldt2011-07-051-0/+2
|/ /
* | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-241-3/+1
|\ \
| * \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-241-3/+1
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-06-201-2/+5
| | |\
| | * | Proper naming for raster pixmap and paintengine on Symbian.Laszlo Agocs2011-06-161-2/+1
| | * | Handle QVolatileImage-backed pixmaps optimally in drawPixmap().Laszlo Agocs2011-06-161-1/+0
* | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-06-2419-327/+327
|\ \ \ \ | |/ / /
| * | | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-06-2212-291/+226
| |\ \ \ | | | |/ | | |/|
| | * | 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
| | * | Add missing freeTexture() from fix for QTBUG-19180Jani Hautakangas2011-06-092-0/+28
| | * | Simplify texture pooling logic in GL graphics system.Jani Hautakangas2011-06-0911-291/+191
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-211-0/+33
| |\ \ \
| | * | | Adding debug output for not supported gl featuresIan2011-06-201-0/+33
| * | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-177-19/+47
| |\ \ \ \
| | * | | | Silence the "array out of bounds" warning in GCC 4.6.Thiago Macieira2011-06-141-0/+7
| | |/ / /
| | * | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-081-3/+1
| | |\ \ \
| | | * \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-311-3/+1
| | | |\ \ \ | | | | |/ /
| | | | * | Fix for BCM2727 chip detection on SymbianJani Hautakangas2011-05-301-3/+1
| | | | |/
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-1775-1292/+1292
| | | | |\
| | | | | * Update licenseheader text in source filesJyri Tahtela2011-05-1375-1292/+1292
| | * | | | Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-0682-1425/+1466
| | |\ \ \ \ | | | |/ / /
| | * | | | Refactor glyph pretransform checkJiang Jiang2011-06-032-0/+2
| | * | | | Symbian build failure for Armv5Sami Merila2011-05-311-2/+2
| | * | | | Full translucent background support in xcb and xlib backend.Samuel Rødal2011-05-192-5/+15
| | * | | | Fall back to using paths for large fonts in drawStaticText()Eskil Abrahamsen Blomfeldt2011-05-181-11/+22
| * | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-2482-1446/+1543
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Doc: Fixed qdoc warnings.David Boddie2011-05-121-0/+6
| * | | | | Doc: Fixed qdoc warnings.David Boddie2011-05-114-8/+11
| * | | | | Doc: Clarified and tidied up OpenGL overlay color documentation.David Boddie2011-05-041-9/+4