| Commit message (Expand) | Author | Age | Files | Lines |
* | Added a warning to QGLWidget::renderText(). | Trond Kjernåsen | 2010-01-27 | 1 | -2/+20 |
|
|
* | Updated docs regarding QGLWidget::renderText() limitations. | Trond Kjernåsen | 2010-01-25 | 1 | -0/+7 |
|
|
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6 | Gunnar Sletta | 2010-01-22 | 1 | -0/+3 |
|\ |
|
| * | Fix rendering with simple shader in GL2 engine | Tom Cooksey | 2010-01-22 | 1 | -0/+3 |
|
|
* | | Fix y-inverted pixmaps properly. | Gunnar Sletta | 2010-01-22 | 1 | -9/+5 |
|/ |
|
* | Purely cosmetic (formatting) changes to GL2 engine's GLSL | Tom Cooksey | 2010-01-21 | 1 | -333/+357 |
|
|
* | Use an attribute value for the PMV matrix rather than a uniform | Tom Cooksey | 2010-01-21 | 5 | -31/+42 |
|
|
* | Remove unnecessary depth uniform from GL2 engine's GLSL | Tom Cooksey | 2010-01-21 | 1 | -6/+0 |
|
|
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-01-20 | 1 | -1/+5 |
|\ |
|
| * | Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers. | Trond Kjernåsen | 2010-01-20 | 1 | -1/+5 |
|
|
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-01-19 | 2 | -2/+2 |
|\ \
| |/
|/| |
|
| * | Fix copyright year. | Jason McDonald | 2010-01-19 | 2 | -2/+2 |
|
|
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6 | Gunnar Sletta | 2010-01-19 | 1 | -6/+45 |
|\ \ |
|
| * | | Fix X11/EGL builds using OpenGL ES 1.1 | Tom Cooksey | 2010-01-19 | 1 | -6/+45 |
| |/ |
|
* | | Fixed y-inverted pixmaps on N900. | Gunnar Sletta | 2010-01-19 | 1 | -4/+8 |
|/ |
|
* | Fix QGLWidget::renderPixmap() on Windows. | Trond Kjernaasen | 2010-01-14 | 1 | -6/+6 |
|
|
* | Rework how Qt handles GL extensions. | Trond Kjernåsen | 2010-01-13 | 15 | -428/+469 |
|
|
* | Fixed tst_qgl multipleFBOInterleavedRendering. | Samuel Rødal | 2010-01-13 | 1 | -1/+1 |
|
|
* | Merge remote branch 'qt/4.6' into oslo-staging-2/4.6 | Paul Olav Tvete | 2010-01-12 | 66 | -71/+83 |
|\ |
|
| * | Fix broken QGLWidget::renderPixmap on Mac/Carbon | Morten Johan Sørvig | 2010-01-08 | 1 | -4/+16 |
|
|
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2010-01-08 | 3 | -69/+70 |
| |\ |
|
| * \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-01-07 | 66 | -67/+67 |
| |\ \ |
|
| | * | | Update copyright year to 2010 | Jason McDonald | 2010-01-06 | 66 | -67/+67 |
|
|
* | | | | Fixed bug where QGLPixmapData::toImage() returned too dark image. | Kim Motoyoshi Kalland | 2010-01-12 | 1 | -1/+1 |
|
|
* | | | | Fixed justify aligned text drawing with the GL1 engine. | Kim Motoyoshi Kalland | 2010-01-11 | 1 | -1/+2 |
|
|
* | | | | Fixed subpixel antialiased text drawing with the GL2 engine. | Kim Motoyoshi Kalland | 2010-01-11 | 1 | -3/+15 |
|
|
* | | | | Track the glVertexAttribPointer and only update it if it's changed | Tom Cooksey | 2010-01-11 | 3 | -34/+61 |
| |_|/
|/| | |
|
* | | | Reset the GL stencil mask, op and function in resetGLState(). | Trond Kjernåsen | 2010-01-07 | 1 | -0/+3 |
|
|
* | | | Fixed indentation and typo. | Trond Kjernåsen | 2010-01-07 | 1 | -67/+67 |
|
|
* | | | Remove unnecessary call to QWidget::setAttribute(). | Trond Kjernåsen | 2010-01-07 | 1 | -2/+0 |
|/ / |
|
* | | Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram" | Tom Cooksey | 2010-01-06 | 3 | -73/+3 |
|
|
* | | Improved initial startup time for a QGLWidget ontop of EGL/X11. | Trond Kjernåsen | 2010-01-06 | 1 | -5/+111 |
|
|
* | | Removed temporary QGLWidget created during QGLWidget/X11 initialization. | Trond Kjernåsen | 2010-01-05 | 1 | -2/+67 |
|
|
* | | fix compilation in GL2 paint engine for Windows | Gunnar Sletta | 2010-01-05 | 1 | -0/+1 |
|
|
* | | Move QGLTextureGlyphCache into it's own file | Tom Cooksey | 2010-01-05 | 5 | -240/+350 |
|
|
* | | Remove QGLShareRegister and transfer its functionality to QGLContextGroup | Rhys Weatherley | 2010-01-04 | 9 | -41/+39 |
|
|
* | | Introduce new "snapToPixelGrid" flag to GL2 engine for drawText | Tom Cooksey | 2010-01-04 | 2 | -5/+44 |
|
|
* | | Also delete blitShader & simpleShader in ~QGLEngineSharedShaders | Tom Cooksey | 2009-12-30 | 1 | -0/+10 |
|
|
* | | fix a memory leak in QGLEngineSharedShaders | jianliang79 | 2009-12-30 | 2 | -0/+8 |
|
|
* | | Fixed QGLWidget::renderText(). | Trond Kjernaasen | 2009-12-30 | 3 | -109/+13 |
|
|
* | | Remove superfluous enable/disable vertex arrtib arrays | Tom Cooksey | 2009-12-30 | 1 | -34/+0 |
|
|
* | | Track which vertex attrib arrays are enabled in QGLContextPrivate | Tom Cooksey | 2009-12-30 | 6 | -5/+79 |
|/ |
|
* | Remove pointless const's from functions (internal API) | Tom Cooksey | 2009-12-29 | 2 | -4/+4 |
|
|
* | Lots of mostly cosmetic cleanups to GL2 paint engine | Tom Cooksey | 2009-12-28 | 4 | -138/+133 |
|
|
* | Move the 0.5 offset we add for aliased rendering to updateMatrix() | Tom Cooksey | 2009-12-28 | 2 | -33/+47 |
|
|
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2009-12-27 | 2 | -5/+11 |
|\ |
|
| * | Fix text rendering on GL2 paint engine | Tom Cooksey | 2009-12-23 | 2 | -5/+11 |
|
|
* | | Merge branch '4.5' into 4.6-staging | Thiago Macieira | 2009-12-26 | 1 | -3/+11 |
|\ \
| |/
|/| |
|
| * | Fix memory leak of QGLGlyphCoord objects in the OpenGL1 paint engine | Rhys Weatherley | 2009-12-20 | 1 | -3/+11 |
|
|
* | | Use 3x3 PMV matrices rather than 4x4 in the GL2 engine | Tom Cooksey | 2009-12-22 | 3 | -64/+62 |
|
|