summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
* | Enable multisampling on Symbian if hw supports itJani Hautakangas2011-05-111-9/+21
* | Introduce platform extension to QGraphicsSystemJani Hautakangas2011-05-102-4/+19
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-021-0/+11
|\
| * Fix trailing whitespacesJani Hautakangas2011-05-021-1/+1
| * Fix for native child widget performance issue.Jani Hautakangas2011-05-021-0/+11
* | Fix missing glyphs for large fonts with QStaticText/GL/FreetypeEskil Abrahamsen Blomfeldt2011-04-291-1/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-261-32/+16
|\
| * Fix for GL graphcics system orientation whichJani Hautakangas2011-04-261-32/+16
| * Merge commit 'refs/merge-requests/2584' of gitorious.org:qt/qt into merge-req...Sami Merila2011-03-291-2/+25
| |\
* | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-04-061-13/+0
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-053-3/+72
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-295-23/+51
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Doc: Removed duplicate documentation.David Boddie2011-03-251-13/+0
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-312-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Don't include qwindowsurface_gl_p.h on QT_OPENGL_ES_1.Samuel Rødal2011-03-292-2/+2
| | |/ / | |/| |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-283-3/+72
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Native image handle provider support in QGLPixmapDataLaszlo Agocs2011-03-243-3/+72
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-225-23/+51
|\ \ \ | |/ / | | / | |/ |/|
| * Change Symbian to use destroyed swap behaviour in GLJani Hautakangas2011-03-225-23/+51
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-213-141/+126
|\ \ | |/
| * Change the pooled QGLPixmapData to be backed by QVolatileImage.Laszlo Agocs2011-03-213-141/+126
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-171-2/+25
|\ \ | |/ |/|
| * Changes to driver workarounds.Robin Burchell2011-03-171-2/+25
* | Hot fix for compilation without QGL_USE_TEXTURE_POOLJani Hautakangas2011-03-151-0/+2
* | Initial implementation of GLES2.0 resource poolingJani Hautakangas2011-03-1512-17/+1467
* | Don't use EGL surfaces for translucency with 32MB GPU chip.Jani Hautakangas2011-03-101-0/+12
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-264-70/+266
|\ \ | |/ |/|
| * Fix extern usage in qpixmapdata_gl.cppJani Hautakangas2011-02-251-1/+1
| * Fix for loading QPixmaps from file in GL graphics systemJani Hautakangas2011-02-251-22/+22
| * Fix code style in qgl_symbian.cppJani Hautakangas2011-02-251-4/+4
| * QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system.Jani Hautakangas2011-02-252-0/+119
| * Use the 'convertInPlace' versions of QImage in QGLPixmapData load.Jani Hautakangas2011-02-252-34/+83
| * Recreate GL surface when native window is resized on SymbianJani Hautakangas2011-02-251-13/+41
* | Fixed tst_qpixmap::toImageDeepCopy autotest for GL graphicssystem.Samuel Rødal2011-02-091-0/+6
* | Fixed missing text when using static text items in GL 2 engine.Samuel Rødal2011-02-023-5/+14
|/
* Fix static build on Windows with MinGW.Mark Brand2011-01-176-12/+12
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-1072-73/+73
|\
| * Update copyright year to 2011.Jason McDonald2011-01-1072-73/+73
* | 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
* | Restored old flushing behavior in -graphicssystem opengl on desktop.Samuel Rødal2011-01-071-3/+4
* | Support for swap modes in QGLWindowSurface.Michael Dominic K2011-01-042-1/+15
* | Add work around for bug when painting w/glTexSubImage into large textureEskil Abrahamsen Blomfeldt2010-12-164-1/+8
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-151-4/+7
|\
| * Don't delete FBO when resetting glyph cacheEskil Abrahamsen Blomfeldt2010-12-141-4/+7