summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-08-271-12/+25
|\
| * Made GL 2 engine reset various GL state to their defaults in end().Samuel Rødal2009-08-261-3/+9
| * Made brush textures in GL2 engine use correct filtering.Samuel Rødal2009-08-261-8/+10
| * Improved QPainter API for allowing native painting in GL / VG.Samuel Rødal2009-08-261-1/+7
* | 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
* 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-211-0/+29
|\
| * 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-191-9/+28
| |\ \
| * \ \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-171-6/+16
| |\ \ \
| * \ \ \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-071-17/+77
| |\ \ \ \
| * \ \ \ \ Merge commit 'qt-graphics-team/pixmapfilters-redux' into kinetic-graphicseffectSamuel Rødal2009-07-281-0/+23
| |\ \ \ \ \
| | * | | | | Added missing createPixmapFilter() implementation in GL 2 engine.Samuel Rødal2009-06-301-0/+8
| | * | | | | Added drawTexture function to GL 2 paint engine.Samuel Rødal2009-06-301-0/+15
| | * | | | | Added custom shader hook to the GL 2 paint engine.Samuel Rødal2009-06-301-5/+7
| * | | | | | Initial stab at a custom shader stage APITom Cooksey2009-07-231-0/+6
* | | | | | | 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-181-9/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fixed text rendering on GL ES 2 implementations.Trond Kjernåsen2009-08-171-9/+28
| | |_|_|/ | |/| | |
* | | | | Merge commit 'qt/master'Jason Barron2009-08-131-6/+16
|\ \ \ \ \ | |/ / / /
| * | | | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| * | | | Fixed uploading of glyphs to the glyph cache in the GL2 engine.Kim Motoyoshi Kalland2009-08-111-5/+15
| | |_|/ | |/| |
* | | | Merge commit 'qt/master-stable'Jason Barron2009-08-041-17/+77
|\ \ \ \ | |/ / /
| * | | Optimized single-rect clip case in OpenGL 2 paint engine.Samuel Rødal2009-07-291-17/+77
| |/ /
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-271-68/+95
|\ \ \ | |/ /
| * | 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-211-4/+1
| * | Fixed GL2 engine shader manager to work with more than one context.Kim Motoyoshi Kalland2009-07-211-9/+2
| * | Fixed text rendering with the GL2 paint engine.Kim Motoyoshi Kalland2009-07-161-2/+5
| * | Moved uniform enum to QGLEngineShaderManager.Kim Motoyoshi Kalland2009-07-031-39/+22
| * | 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-251-2/+10
* Reduced number of state changes/uniform location queries in GL2 engine.Samuel Rødal2009-06-241-38/+77
* Use QTransform more efficiently.Bjørn Erik Nilsen2009-06-181-2/+1
* Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
|\
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| * Fixed a crash in the GL 2 paintengine when drawing text.Trond Kjernåsen2009-05-291-0/+3
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+1278
* Enabled switching multisampling on/off in GL2 engine on desktop.Samuel Rødal2009-06-151-0/+14
* Fixed bitmap drawing in GL 2 engine when not using GL pixmap backend.Samuel Rødal2009-06-121-2/+4
* Fixed off-by-one color bug in GL 2 paint engine.Samuel Rødal2009-06-121-5/+5
* Fixed incorrect rendering of bitmap/pattern brushes in GL 2 engine.Samuel Rødal2009-06-121-5/+21