summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-015-344/+376
|\
| * Fix rendering with simple shader in GL2 engineTom Cooksey2010-01-221-0/+3
| * Purely cosmetic (formatting) changes to GL2 engine's GLSLTom Cooksey2010-01-211-333/+357
| * Use an attribute value for the PMV matrix rather than a uniformTom Cooksey2010-01-215-31/+42
| * Remove unnecessary depth uniform from GL2 engine's GLSLTom Cooksey2010-01-211-6/+0
* | Fixed compile of QTriangulator on Solaris.Kim Motoyoshi Kalland2010-01-261-5/+7
* | Merge branch '4.6'Thiago Macieira2010-01-212-2/+2
|\ \ | |/
| * Fix copyright year.Jason McDonald2010-01-192-2/+2
* | Updated painter path caching in the GL2 engine after merge.Kim Motoyoshi Kalland2010-01-191-3/+2
* | Merge branch '4.6'Thiago Macieira2010-01-1314-50/+89
|\ \ | |/
| * Fixed tst_qgl multipleFBOInterleavedRendering.Samuel Rødal2010-01-131-1/+1
| * Merge remote branch 'qt/4.6' into oslo-staging-2/4.6Paul Olav Tvete2010-01-1213-13/+13
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-081-0/+3
| | |\
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-0713-13/+13
| | |\ \
| | | * | Update copyright year to 2010Jason McDonald2010-01-0613-13/+13
| * | | | Fixed subpixel antialiased text drawing with the GL2 engine.Kim Motoyoshi Kalland2010-01-111-3/+15
| * | | | Track the glVertexAttribPointer and only update it if it's changedTom Cooksey2010-01-113-34/+61
| | |_|/ | |/| |
* | | | Add QT_{BEGIN,END}_NAMESPACE to qtextureglyphcache_gl.cpp.ck2010-01-111-0/+4
* | | | Merge branch '4.6'Thiago Macieira2010-01-086-370/+459
|\ \ \ \ | |/ / /
| * | | Reset the GL stencil mask, op and function in resetGLState().Trond Kjernåsen2010-01-071-0/+3
| |/ /
| * | Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram"Tom Cooksey2010-01-061-2/+3
| * | fix compilation in GL2 paint engine for WindowsGunnar Sletta2010-01-051-0/+1
| * | Move QGLTextureGlyphCache into it's own fileTom Cooksey2010-01-054-238/+346
| * | Remove QGLShareRegister and transfer its functionality to QGLContextGroupRhys Weatherley2010-01-041-6/+9
| * | Introduce new "snapToPixelGrid" flag to GL2 engine for drawTextTom Cooksey2010-01-042-5/+44
| * | Also delete blitShader & simpleShader in ~QGLEngineSharedShadersTom Cooksey2009-12-301-0/+10
| * | fix a memory leak in QGLEngineSharedShadersjianliang792009-12-302-0/+8
| * | Fixed QGLWidget::renderText().Trond Kjernaasen2009-12-302-90/+7
| * | Remove superfluous enable/disable vertex arrtib arraysTom Cooksey2009-12-301-34/+0
| * | Track which vertex attrib arrays are enabled in QGLContextPrivateTom Cooksey2009-12-303-5/+38
| |/
* | Fix compilation breakage caused by merge.Thiago Macieira2010-01-061-1/+1
* | Change from std::pair to QPair.Thiago Macieira2010-01-061-8/+8
* | GCC doesn't like comment lines ending in \Thiago Macieira2010-01-061-28/+28
* | Merge branch '4.6'Thiago Macieira2010-01-054-169/+184
|\ \ | |/
| * Remove pointless const's from functions (internal API)Tom Cooksey2009-12-292-4/+4
| * Lots of mostly cosmetic cleanups to GL2 paint engineTom Cooksey2009-12-284-138/+133
| * Move the 0.5 offset we add for aliased rendering to updateMatrix()Tom Cooksey2009-12-282-33/+47
| * Fix text rendering on GL2 paint engineTom Cooksey2009-12-232-5/+11
* | Merge branch '4.6'Thiago Macieira2009-12-266-181/+226
|\ \ | |/
| * Use 3x3 PMV matrices rather than 4x4 in the GL2 engineTom Cooksey2009-12-223-64/+62
| * Handle broken shaders better in the GL2 engine's shader managerTom Cooksey2009-12-221-77/+114
| * Prevent access to non-existent memory in triagulating strokerRhys Weatherley2009-12-181-2/+8
| * GL2Engine: Don't mark brush as dirty if it hasn't changedTom Cooksey2009-12-173-34/+41
| * Optimized blur / drop shadow effects for the GL 2 paint engine.Samuel Rødal2009-12-142-4/+1
* | Fixed memory leak in caching of concave paths in GL2 engine.Kim Motoyoshi Kalland2009-12-171-18/+21
* | Implemented caching of concave vector paths in the GL2 engine.Kim Motoyoshi Kalland2009-12-152-26/+130
* | Fixed integer overflow in QTriangulator.Kim Motoyoshi Kalland2009-12-151-6/+6
* | Fixed QGL2PEXVertexArray to interpolate within the range [0, 1].Kim Motoyoshi Kalland2009-12-151-1/+1
* | Merge commit 'origin/4.6'Olivier Goffart2009-12-151-62/+34
|\ \ | |/
| * Clean up the QFontEngine glyphcaching code to not crash and be more tidyGunnar Sletta2009-12-101-3/+2