summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* 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-191-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-181-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 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
| * | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-117-7/+7
| |\ \ \ \
| | * | | | Update copyright year to 2011.Rohan McGovern2011-03-117-7/+7
| | |/ / /
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-0/+12
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Don't use EGL surfaces for translucency with 32MB GPU chip.Jani Hautakangas2011-03-101-0/+12
* | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-032-5/+1
|\| | |
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-012-5/+1
| |\| |
| | * | 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
* | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-0114-84/+301
|\| | |
| * | | OpenGL Framebuffer FormatGerhard Roethlin2011-02-241-1/+1
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-111-0/+6
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-0/+6
| | |\| |
| | | * | Fixed tst_qpixmap::toImageDeepCopy autotest for GL graphicssystem.Samuel Rødal2011-02-091-0/+6
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-02-114-65/+259
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix for loading QPixmaps from file in GL graphics systemJani Hautakangas2011-02-091-22/+22
| | * | | Fix code style in qgl_symbian.cppJani Hautakangas2011-02-091-4/+4
| | * | | QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system.Jani Hautakangas2011-02-092-0/+119
| | * | | Use the 'convertInPlace' versions of QImage in QGLPixmapData load.Jani Hautakangas2011-02-082-34/+83
| | * | | Recreate GL surface when native window is resized on SymbianJani Hautakangas2011-02-081-9/+35
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-051-2/+2
| |\ \ \ \
| | * | | | Fix warning about deprecated conversions of string literals to char *hjk2011-02-041-2/+2
| * | | | | 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 'integration'Yoann Lopes2011-02-021-0/+7
| |\ \ \ | | |_|/ | |/| |
| | * | Fixes compilation when using FreeType on Symbian.Yoann Lopes2011-01-311-0/+7
| * | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-01-278-69/+124
| |\ \ \
| * \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-256-12/+12
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Fix static build on Windows with MinGW.Mark Brand2011-01-176-12/+12
* | | | 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
| |_|/ |/| |
* | | Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-2674-90/+110
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 00:53:00 +0000