Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Removed warnings / debug output in the GL 2 engine / pixmap filter code. | Samuel Rødal | 2009-08-25 | 3 | -4/+1 | |
* | | Fix obsolete license headers. | Jason McDonald | 2009-08-21 | 2 | -6/+6 | |
* | | Fix obsolete license headers. | Jason McDonald | 2009-08-21 | 2 | -5/+5 | |
* | | compile fix with namespaces in QGLCustomShaderStagePrivate | hjk | 2009-08-21 | 1 | -0/+4 | |
* | | Fix drawTiledPixmap for texture_from_pixmap on X11/EGL | Tom Cooksey | 2009-08-21 | 2 | -0/+5 | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60 | axis | 2009-08-21 | 13 | -115/+1211 | |
|\ \ | ||||||
| * \ | Merge commit 'qt/master' into kinetic-graphicseffect | Bjørn Erik Nilsen | 2009-08-21 | 3 | -43/+10 | |
| |\ \ | ||||||
| * | | | Add "QObject *parent = 0" to QGraphicsShaderEffect constructor. | Bjørn Erik Nilsen | 2009-08-20 | 2 | -3/+3 | |
| * | | | Merge commit 'qt/master' into kinetic-graphicseffect | Bjørn Erik Nilsen | 2009-08-19 | 7 | -23/+42 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge commit 'qt/master' into kinetic-graphicseffect | Bjørn Erik Nilsen | 2009-08-17 | 55 | -61/+81 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge commit 'qt/master' into kinetic-graphicseffect | Bjørn Erik Nilsen | 2009-08-07 | 10 | -115/+473 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | QGraphicsShaderEffect doesn't need to be a metatype any more | Rhys Weatherley | 2009-07-29 | 1 | -2/+0 | |
| * | | | | | | Merge branch 'kinetic-graphicseffect' of git@scm.dev.nokia.troll.no:qt/kineti... | Bjørn Erik Nilsen | 2009-07-29 | 3 | -7/+7 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Fixed various valgrind-reported issues in GL 2 engine. | Samuel Rødal | 2009-07-29 | 3 | -7/+7 | |
| * | | | | | | | Conflicts after merge commit 07c2b17276057a8b47c3be57ab7c2cf66dac0edd | Bjørn Erik Nilsen | 2009-07-29 | 2 | -22/+16 | |
| |/ / / / / / | ||||||
| * | | | | | | Improve GL filter performance by caching custom shader programs. | Samuel Rødal | 2009-07-28 | 2 | -10/+19 | |
| * | | | | | | Merge commit 'qt-graphics-team/pixmapfilters-redux' into kinetic-graphicseffect | Samuel Rødal | 2009-07-28 | 10 | -77/+453 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Further optimized the GL blur filter by caching the QGLShader. | Samuel Rødal | 2009-07-02 | 2 | -4/+9 | |
| | * | | | | | | Fixed GL blur filter to handle painter translates and larger FBO sizes. | Samuel Rødal | 2009-07-02 | 1 | -1/+17 | |
| | * | | | | | | Made GL blur filter use the new FBO pool for improved performance. | Samuel Rødal | 2009-07-02 | 1 | -12/+16 | |
| | * | | | | | | Refactored the GL QPixmap backend to use an FBO pool class. | Samuel Rødal | 2009-07-02 | 2 | -41/+106 | |
| | * | | | | | | Added caching of custom shader programs as well in GL 2 shader manager. | Samuel Rødal | 2009-07-01 | 2 | -15/+32 | |
| | * | | | | | | Added QPixmapBlurFilter with GL implementation. | Samuel Rødal | 2009-06-30 | 1 | -1/+255 | |
| | * | | | | | | Added missing createPixmapFilter() implementation in GL 2 engine. | Samuel Rødal | 2009-06-30 | 2 | -0/+10 | |
| | * | | | | | | Added drawTexture function to GL 2 paint engine. | Samuel Rødal | 2009-06-30 | 2 | -1/+17 | |
| | * | | | | | | Added custom shader hook to the GL 2 paint engine. | Samuel Rødal | 2009-06-30 | 5 | -24/+107 | |
| * | | | | | | | Update QGraphicsShaderEffect to match new API | Rhys Weatherley | 2009-07-24 | 2 | -32/+37 | |
| * | | | | | | | Reset shader stage variables when the custom shader is explicitly removed. | Rhys Weatherley | 2009-07-24 | 1 | -0/+2 | |
| * | | | | | | | Implement QGraphicsShaderEffect for custom shader-based effects | Rhys Weatherley | 2009-07-24 | 3 | -0/+413 | |
| * | | | | | | | Make it easier to change custom shaders. | Rhys Weatherley | 2009-07-24 | 4 | -0/+26 | |
| * | | | | | | | Make ordinary shaders work again after custom shader changes. | Rhys Weatherley | 2009-07-24 | 1 | -7/+7 | |
| * | | | | | | | Actually add the files... :-) | Tom Cooksey | 2009-07-23 | 2 | -0/+196 | |
| * | | | | | | | Initial stab at a custom shader stage API | Tom Cooksey | 2009-07-23 | 5 | -56/+133 | |
* | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Jason Barron | 2009-08-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | compile. | Harald Fernengel | 2009-08-21 | 1 | -1/+1 | |
* | | | | | | | | | Merge commit 'qt/master' | Jason Barron | 2009-08-21 | 2 | -43/+9 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | ||||||
| * | | | | | | | Fix QGLWidget::showFullScreen() on X11/EGL | Tom Cooksey | 2009-08-21 | 1 | -2/+5 | |
| * | | | | | | | Removed PBO texture upload from QGLContextPrivate::bindTexture(). | Samuel Rødal | 2009-08-21 | 2 | -41/+4 | |
* | | | | | | | | Merge commit 'qt/master' | Jason Barron | 2009-08-20 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Fixed an assert in debug mode when drawing text with the | Trond Kjernåsen | 2009-08-20 | 1 | -0/+1 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge commit 'qt/master' | Jason Barron | 2009-08-18 | 8 | -25/+54 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Restructure the documentation, both on a file and on a content level. | Volker Hilsheimer | 2009-08-17 | 5 | -9/+11 | |
| * | | | | | | Removed unused member variable from QGLFramebufferObjectPrivate. | Kim Motoyoshi Kalland | 2009-08-17 | 1 | -2/+0 | |
| * | | | | | | Fixed text rendering on GL ES 2 implementations. | Trond Kjernåsen | 2009-08-17 | 2 | -12/+31 | |
| | |_|_|/ / | |/| | | | | ||||||
| * | | | | | Use LIBS_PRIVATE on Mac and X11. | Thiago Macieira | 2009-08-17 | 1 | -2/+12 | |
* | | | | | | Merge commit 'qt/master' | Jason Barron | 2009-08-13 | 54 | -59/+69 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Update contact URL in license headers. | Jason McDonald | 2009-08-12 | 54 | -54/+54 | |
| * | | | | | Fixed uploading of glyphs to the glyph cache in the GL2 engine. | Kim Motoyoshi Kalland | 2009-08-11 | 1 | -5/+15 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATE | Harald Fernengel | 2009-08-06 | 8 | -9/+9 | |
* | | | | | Merge commit 'qt/master-stable' | Jason Barron | 2009-08-06 | 1 | -2/+3 | |
|\ \ \ \ \ | |/ / / / |