summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex
Commit message (Expand)AuthorAgeFilesLines
* Fix obsolete license headers.Jason McDonald2009-08-212-5/+5
* compile fix with namespaces in QGLCustomShaderStagePrivatehjk2009-08-211-0/+4
* Fix drawTiledPixmap for texture_from_pixmap on X11/EGLTom Cooksey2009-08-211-0/+1
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-217-68/+413
|\
| * Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-211-0/+1
| |\
| * \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-192-12/+31
| |\ \
| * \ \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-179-14/+24
| |\ \ \
| * \ \ \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-072-17/+80
| |\ \ \ \
| * | | | | Fixed various valgrind-reported issues in GL 2 engine.Samuel Rødal2009-07-292-3/+2
| * | | | | Improve GL filter performance by caching custom shader programs.Samuel Rødal2009-07-282-10/+19
| * | | | | Merge commit 'qt-graphics-team/pixmapfilters-redux' into kinetic-graphicseffectSamuel Rødal2009-07-287-34/+72
| |\ \ \ \ \
| | * | | | | Further optimized the GL blur filter by caching the QGLShader.Samuel Rødal2009-07-021-1/+0
| | * | | | | Added caching of custom shader programs as well in GL 2 shader manager.Samuel Rødal2009-07-012-15/+32
| | * | | | | Added missing createPixmapFilter() implementation in GL 2 engine.Samuel Rødal2009-06-302-0/+10
| | * | | | | Added drawTexture function to GL 2 paint engine.Samuel Rødal2009-06-302-1/+17
| | * | | | | Added custom shader hook to the GL 2 paint engine.Samuel Rødal2009-06-305-24/+107
| * | | | | | Reset shader stage variables when the custom shader is explicitly removed.Rhys Weatherley2009-07-241-0/+2
| * | | | | | Make it easier to change custom shaders.Rhys Weatherley2009-07-244-0/+26
| * | | | | | Make ordinary shaders work again after custom shader changes.Rhys Weatherley2009-07-241-7/+7
| * | | | | | Actually add the files... :-)Tom Cooksey2009-07-232-0/+196
| * | | | | | Initial stab at a custom shader stage APITom Cooksey2009-07-234-54/+129
* | | | | | | Merge commit 'qt/master'Jason Barron2009-08-201-0/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fixed an assert in debug mode when drawing text with theTrond Kjernåsen2009-08-201-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge commit 'qt/master'Jason Barron2009-08-182-12/+31
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fixed text rendering on GL ES 2 implementations.Trond Kjernåsen2009-08-172-12/+31
| | |_|_|/ | |/| | |
* | | | | Merge commit 'qt/master'Jason Barron2009-08-139-14/+24
|\ \ \ \ \ | |/ / / /
| * | | | Update contact URL in license headers.Jason McDonald2009-08-129-9/+9
| * | | | Fixed uploading of glyphs to the glyph cache in the GL2 engine.Kim Motoyoshi Kalland2009-08-111-5/+15
| | |_|/ | |/| |
* | | | Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-061-1/+1
* | | | Merge commit 'origin/master'Jason Barron2009-08-041-1/+1
|\ \ \ \
| * | | | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-031-1/+1
* | | | | Merge commit 'qt/master-stable'Jason Barron2009-08-042-17/+80
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Optimized single-rect clip case in OpenGL 2 paint engine.Samuel Rødal2009-07-292-17/+80
| | |/ / | |/| |
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-276-138/+197
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Use texture_from_pixmap on X11 & avoid copiesTom Cooksey2009-07-221-4/+18
| * | Fixed opacity bug in the GL2 paint engine.Kim Motoyoshi Kalland2009-07-211-0/+1
| * | Fixed gradient bug in the GL2 paint engine.Kim Motoyoshi Kalland2009-07-211-3/+3
| * | Fixed crash in the GL2 engine's texture glyph cache.Kim Motoyoshi Kalland2009-07-211-4/+12
| * | Used QGLContextResource for the gradient cache in the GL2 paint engine.Kim Motoyoshi Kalland2009-07-213-30/+31
| * | Fixed GL2 engine shader manager to work with more than one context.Kim Motoyoshi Kalland2009-07-213-9/+27
| * | Fixed text rendering with the GL2 paint engine.Kim Motoyoshi Kalland2009-07-161-2/+5
| * | Moved uniform enum to QGLEngineShaderManager.Kim Motoyoshi Kalland2009-07-034-83/+69
| * | Made QPainter / OpenGL intermixing in hellogl_es2 work properly again.Samuel Rødal2009-07-011-0/+5
| * | Fixed cleanup of glyph cache textures in the GL 2 engine.Trond Kjernåsen2009-07-011-3/+26
| |/
* | Compile the OpenGL2 paint engine after the QScopedPointer changesJason Barron2009-07-091-3/+3
|/
* Fixed some regressions in the OpenGL pixmap backend.Samuel Rødal2009-06-291-3/+5
* Fixed missing restoration of state after a sync in the GL 2 engine.Samuel Rødal2009-06-252-2/+12
* Fixed buggy clipping when using projective transforms in GL 2 engine.Samuel Rødal2009-06-251-14/+4
* Reduced number of state changes/uniform location queries in GL2 engine.Samuel Rødal2009-06-244-49/+168
* Use QTransform more efficiently.Bjørn Erik Nilsen2009-06-181-2/+1