summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-stagingaavit2011-04-121-1/+9
|\
| * Update XCreateWindow in qgl_X11egl.cppJuanZhao2011-04-121-1/+9
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-13/+0
|\ \ | |/ |/|
| * 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
* | | | | Put all the declarations of qt_defaultDpi{,X,Y}() in one placeJiang Jiang2011-04-054-12/+4
* | | | | Made extension resolving work with Core profile.Samuel Rødal2011-04-054-50/+100
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-035-5/+74
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-315-5/+74
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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
* | | | | QGLContext on EGL gets an additional QEglProperties static field applied to e...Michael Dominic K2011-04-013-1/+12
* | | | | opengl2: Make maximum cached glyph size configurableSami Kyöstilä2011-03-311-1/+6
* | | | | Fixed bad merges in GL windowsurface and get rid of redundant variable.Samuel Rødal2011-03-291-2/+9
* | | | | Added WindowSurfaceFeature enum to QWindowSurface.Samuel Rødal2011-03-292-9/+8
* | | | | Added preserved contents property to QWindowSurface.Samuel Rødal2011-03-292-26/+18
|/ / / /
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-285-2/+40
|\ \ \ \
| * | | | Reset GL glyph cache when texture limit is reachedEskil Abrahamsen Blomfeldt2011-03-235-2/+40
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-245-21/+44
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-233-141/+126
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-223-141/+126
| |\ \ \ \ | | |/ / /
| | * | | 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 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-03-231-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Handle removal of setter for partialUpdateSupportEckhart Koppen2011-03-221-1/+1
| |/ / /
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-03-213-2/+19
|\ \ \ \ | |/ / / |/| | |
| * | | Optimized glyph uploads in GL texture cache.Samuel Rødal2011-03-213-2/+19
* | | | Merge remote branch 'qt/master' into staging-masterSamuel Rødal2011-03-2116-38/+1514
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-191-2/+25
| |\ \ \
| | * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-181-2/+25
| | |\ \ \ | | | |/ /
| | | * | 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
| * | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-1719-26/+1489
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-1612-17/+1468
| | |\ \ \ | | | |/ /
| | | * | 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
| * | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-032-5/+1
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-0114-84/+301
| |\ \ \ \ \
| * | | | | | Remove warning msg in Lighthouse QGLWidget codeJørgen Lind2011-02-091-1/+0
| * | | | | | Export QGLEngineSharedShadersJørgen Lind2011-02-091-1/+1
| * | | | | | Dont include EGL header when compiling with QT_NO_EGLJørgen Lind2011-02-091-1/+1
| * | | | | | Lighthouse: QGLWidgetPropogate the resizeEvent down to the WidgetJørgen Lind2011-02-071-1/+2
| * | | | | | Lighthouse: Fix if context isSharing setup for QGLContextJørgen Lind2011-02-071-0/+2
| * | | | | | Precision specifiers are not allowed for shader variablesKristian Høgsberg2011-01-271-14/+14