summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-034-35/+33
|\
| * Fixed a failure in tst_qgl.Trond Kjernåsen2010-02-021-1/+0
| * Fixed compilation of the GL2 engine for OpenGL ES 2.Kim Motoyoshi Kalland2010-02-021-0/+2
| * Fixed missing textures in the boxes demo.Kim Motoyoshi Kalland2010-02-021-0/+1
| * Fixed garbled 3D Qt logo in the overpainting example.Kim Motoyoshi Kalland2010-02-011-0/+3
| * Fix GL texture leaks when pixmaps are deletedTom Cooksey2010-01-293-35/+28
* | Fix missing namespace.ck2010-02-011-0/+4
|/
* Better support for user-generated binary shadersRhys Weatherley2010-01-271-3/+35
* Added a warning to QGLWidget::renderText().Trond Kjernåsen2010-01-271-2/+20
* Updated docs regarding QGLWidget::renderText() limitations.Trond Kjernåsen2010-01-251-0/+7
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-221-0/+3
|\
| * Fix rendering with simple shader in GL2 engineTom Cooksey2010-01-221-0/+3
* | Fix y-inverted pixmaps properly.Gunnar Sletta2010-01-221-9/+5
|/
* Purely cosmetic (formatting) changes to GL2 engine's GLSLTom Cooksey2010-01-211-333/+357
* Use an attribute value for the PMV matrix rather than a uniformTom Cooksey2010-01-215-31/+42
* Remove unnecessary depth uniform from GL2 engine's GLSLTom Cooksey2010-01-211-6/+0
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-201-1/+5
|\
| * Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers.Trond Kjernåsen2010-01-201-1/+5
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-192-2/+2
|\ \ | |/ |/|
| * Fix copyright year.Jason McDonald2010-01-192-2/+2
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-191-6/+45
|\ \
| * | Fix X11/EGL builds using OpenGL ES 1.1Tom Cooksey2010-01-191-6/+45
| |/
* | Fixed y-inverted pixmaps on N900.Gunnar Sletta2010-01-191-4/+8
|/
* Fix QGLWidget::renderPixmap() on Windows.Trond Kjernaasen2010-01-141-6/+6
* Rework how Qt handles GL extensions.Trond Kjernåsen2010-01-1315-428/+469
* Fixed tst_qgl multipleFBOInterleavedRendering.Samuel Rødal2010-01-131-1/+1
* Merge remote branch 'qt/4.6' into oslo-staging-2/4.6Paul Olav Tvete2010-01-1266-71/+83
|\
| * Fix broken QGLWidget::renderPixmap on Mac/CarbonMorten Johan Sørvig2010-01-081-4/+16
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-083-69/+70
| |\
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-0766-67/+67
| |\ \
| | * | Update copyright year to 2010Jason McDonald2010-01-0666-67/+67
* | | | Fixed bug where QGLPixmapData::toImage() returned too dark image.Kim Motoyoshi Kalland2010-01-121-1/+1
* | | | Fixed justify aligned text drawing with the GL1 engine.Kim Motoyoshi Kalland2010-01-111-1/+2
* | | | Fixed subpixel antialiased text drawing with the GL2 engine.Kim Motoyoshi Kalland2010-01-111-3/+15
* | | | Track the glVertexAttribPointer and only update it if it's changedTom Cooksey2010-01-113-34/+61
| |_|/ |/| |
* | | Reset the GL stencil mask, op and function in resetGLState().Trond Kjernåsen2010-01-071-0/+3
* | | Fixed indentation and typo.Trond Kjernåsen2010-01-071-67/+67
* | | Remove unnecessary call to QWidget::setAttribute().Trond Kjernåsen2010-01-071-2/+0
|/ /
* | Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram"Tom Cooksey2010-01-063-73/+3
* | Improved initial startup time for a QGLWidget ontop of EGL/X11.Trond Kjernåsen2010-01-061-5/+111
* | Removed temporary QGLWidget created during QGLWidget/X11 initialization.Trond Kjernåsen2010-01-051-2/+67
* | fix compilation in GL2 paint engine for WindowsGunnar Sletta2010-01-051-0/+1
* | Move QGLTextureGlyphCache into it's own fileTom Cooksey2010-01-055-240/+350
* | Remove QGLShareRegister and transfer its functionality to QGLContextGroupRhys Weatherley2010-01-049-41/+39
* | Introduce new "snapToPixelGrid" flag to GL2 engine for drawTextTom Cooksey2010-01-042-5/+44
* | Also delete blitShader & simpleShader in ~QGLEngineSharedShadersTom Cooksey2009-12-301-0/+10
* | fix a memory leak in QGLEngineSharedShadersjianliang792009-12-302-0/+8
* | Fixed QGLWidget::renderText().Trond Kjernaasen2009-12-303-109/+13
* | Remove superfluous enable/disable vertex arrtib arraysTom Cooksey2009-12-301-34/+0
* | Track which vertex attrib arrays are enabled in QGLContextPrivateTom Cooksey2009-12-306-5/+79
|/