summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex
Commit message (Expand)AuthorAgeFilesLines
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-315-65/+65
* Fixed inverted pixmaps when using OpenGL graphics effects.Samuel Rødal2009-08-311-1/+3
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-316-78/+78
|\
| * Update tech preview license header.Jason McDonald2009-08-3111-143/+143
| * Update license headers.Jason McDonald2009-08-1111-11/+11
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-08-282-18/+75
|\ \
| * | Fixed QGLWidget::renderText() when using the GL 2 paint engine.Trond Kjernåsen2009-08-282-18/+75
* | | Attempting to make EGL compile again and fix some potentialGunnar Sletta2009-08-281-1/+3
|/ /
* | Fixed path filling in the GL2 paint engine.Kim Motoyoshi Kalland2009-08-271-1/+1
* | Don't flip texture coords in texture brushes in accordance with new bindTextureGunnar Sletta2009-08-271-1/+0
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-08-274-39/+55
|\ \
| * | Made GL 2 engine reset various GL state to their defaults in end().Samuel Rødal2009-08-262-3/+10
| * | Made brush textures in GL2 engine use correct filtering.Samuel Rødal2009-08-261-8/+10
| * | Improved GLSL precision specifiers in GL 2 engine.Samuel Rødal2009-08-261-24/+24
| * | Improved QPainter API for allowing native painting in GL / VG.Samuel Rødal2009-08-262-2/+10
| * | Added missing precision specifiers to custom shader effect.Samuel Rødal2009-08-262-2/+2
* | | New variant of QGLContext::bindTexture that does not require mipmap generationGunnar Sletta2009-08-271-8/+9
|/ /
* | Fixed clipping bug in GL 2 paint engine (visible in arthur demos).Samuel Rødal2009-08-261-1/+1
* | Removed warnings / debug output in the GL 2 engine / pixmap filter code.Samuel Rødal2009-08-252-2/+1
* | 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