summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-2113-115/+1211
|\
| * Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-213-43/+10
| |\
| * | Add "QObject *parent = 0" to QGraphicsShaderEffect constructor.Bjørn Erik Nilsen2009-08-202-3/+3
| * | Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-197-23/+42
| |\ \
| * \ \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-1755-61/+81
| |\ \ \
| * \ \ \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-0710-115/+473
| |\ \ \ \
| * | | | | QGraphicsShaderEffect doesn't need to be a metatype any moreRhys Weatherley2009-07-291-2/+0
| * | | | | Merge branch 'kinetic-graphicseffect' of git@scm.dev.nokia.troll.no:qt/kineti...Bjørn Erik Nilsen2009-07-293-7/+7
| |\ \ \ \ \
| | * | | | | Fixed various valgrind-reported issues in GL 2 engine.Samuel Rødal2009-07-293-7/+7
| * | | | | | Conflicts after merge commit 07c2b17276057a8b47c3be57ab7c2cf66dac0eddBjørn Erik Nilsen2009-07-292-22/+16
| |/ / / / /
| * | | | | 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-2810-77/+453
| |\ \ \ \ \
| | * | | | | Further optimized the GL blur filter by caching the QGLShader.Samuel Rødal2009-07-022-4/+9
| | * | | | | Fixed GL blur filter to handle painter translates and larger FBO sizes.Samuel Rødal2009-07-021-1/+17
| | * | | | | Made GL blur filter use the new FBO pool for improved performance.Samuel Rødal2009-07-021-12/+16
| | * | | | | Refactored the GL QPixmap backend to use an FBO pool class.Samuel Rødal2009-07-022-41/+106
| | * | | | | Added caching of custom shader programs as well in GL 2 shader manager.Samuel Rødal2009-07-012-15/+32
| | * | | | | Added QPixmapBlurFilter with GL implementation.Samuel Rødal2009-06-301-1/+255
| | * | | | | 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
| * | | | | | Update QGraphicsShaderEffect to match new APIRhys Weatherley2009-07-242-32/+37
| * | | | | | Reset shader stage variables when the custom shader is explicitly removed.Rhys Weatherley2009-07-241-0/+2
| * | | | | | Implement QGraphicsShaderEffect for custom shader-based effectsRhys Weatherley2009-07-243-0/+413
| * | | | | | 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-235-56/+133
* | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | compile.Harald Fernengel2009-08-211-1/+1
* | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-212-43/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix QGLWidget::showFullScreen() on X11/EGLTom Cooksey2009-08-211-2/+5
| * | | | | | Removed PBO texture upload from QGLContextPrivate::bindTexture().Samuel Rødal2009-08-212-41/+4
* | | | | | | 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-188-25/+54
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Restructure the documentation, both on a file and on a content level.Volker Hilsheimer2009-08-175-9/+11
| * | | | | Removed unused member variable from QGLFramebufferObjectPrivate.Kim Motoyoshi Kalland2009-08-171-2/+0
| * | | | | Fixed text rendering on GL ES 2 implementations.Trond Kjernåsen2009-08-172-12/+31
| | |_|_|/ | |/| | |
| * | | | Use LIBS_PRIVATE on Mac and X11.Thiago Macieira2009-08-171-2/+12
* | | | | Merge commit 'qt/master'Jason Barron2009-08-1354-59/+69
|\ \ \ \ \ | |/ / / /
| * | | | Update contact URL in license headers.Jason McDonald2009-08-1254-54/+54
| * | | | 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-068-9/+9
* | | | Merge commit 'qt/master-stable'Jason Barron2009-08-061-2/+3
|\ \ \ \ | |/ / /
| * | | fix warnings on mingw (gcc4.4)Thierry Bastian2009-08-041-2/+3
* | | | Merge commit 'origin/master'Jason Barron2009-08-048-9/+9
|\ \ \ \
| * | | | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-038-9/+9
* | | | | Merge commit 'qt/master-stable'Jason Barron2009-08-049-121/+448
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix build on X11/EGL without XRenderTom Cooksey2009-08-031-2/+4
generated by cgit v0.12 at 2025-08-30 19:16:44 (GMT)