summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-184-10/+9
|\
| * Fix copyright year.Jason McDonald2010-02-162-2/+2
| * doc: Fixed some qdoc errors.Martin Smith2010-02-162-7/+6
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-131-1/+1
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-121-1/+1
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-121-1/+1
| | | |\
| | | | * Fixed Mac OS X compile time error by using GLint for temp.Martin Smith2010-02-111-1/+1
* | | | | Fix warnings on gccEskil Abrahamsen Blomfeldt2010-02-181-2/+2
* | | | | Add experimental VBO support for drawCachedGlyphs()'s index arrayEskil Abrahamsen Blomfeldt2010-02-182-1/+32
* | | | | Optimization for text drawing on OpenGLEskil Abrahamsen Blomfeldt2010-02-182-2/+8
* | | | | Some threading improvements to the GL moduleGunnar Sletta2010-02-173-18/+56
* | | | | Fix alpha check for OpenGL/ES in GL2 paint engineRhys Weatherley2010-02-151-0/+4
* | | | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-152-2/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-136-14/+274
| |\ \ \ \ | | |/ / /
| * | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-125-5/+17
| |\ \ \ \
| | * | | | Fixed usage of QGLPixelBuffer with share widgets on other X11 screens.Trond Kjernåsen2010-02-101-1/+5
| | * | | | Fixed drawing QPixmaps on QGLWidgets on different X11 screens.Trond Kjernåsen2010-02-101-1/+8
* | | | | | Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7Eskil Abrahamsen Blomfeldt2010-02-1525-448/+4823
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Turned off subpixel AA text on surface with alpha in GL2 engine.Kim Motoyoshi Kalland2010-02-112-7/+25
| * | | | | Changed a couple of GL defines from decimal to hex.Kim Motoyoshi Kalland2010-02-111-2/+2
| | |_|/ / | |/| | |
| * | | | Added \since 4.7 tagsGunnar Sletta2010-02-101-0/+14
| | |_|/ | |/| |
| * | | Added geometry shaders to changes-4.7.0 file + a small doc update about itGunnar Sletta2010-02-101-0/+2
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-02-104-35/+33
| |\ \ \ | | |/ /
| | * | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-094-35/+33
| | |\ \
| * | \ \ Merge branch 'geometry-shaders-to-integrate'Gunnar Sletta2010-02-084-5/+231
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Another round of Geometry shader review.Gunnar Sletta2010-02-082-21/+13
| | * | | Fix Geometry shaders based on reviewGunnar Sletta2010-02-042-10/+16
| | * | | Geometry Shader support in QGLShaderProgramGunnar Sletta2010-02-014-1/+228
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-051-14/+16
| |\ \ \ \
| | * | | | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-14/+16
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-052-0/+39
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add QMacCompatGLenum overrides for new QGLShaderProgram functionsRhys Weatherley2010-02-052-0/+39
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-041-6/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | doc: Fixed some qdoc warnings.Martin Smith2010-02-041-6/+8
| * | | | | Fixed wrong variable nameGabriel de Dietrich2010-02-041-1/+1
| * | | | | Improvements to the QGLShaderProgram APIRhys Weatherley2010-02-042-0/+196
| * | | | | Remove obsolete OpenGL/ES CommonLite (fixed-point) supportRhys Weatherley2010-02-0415-343/+156
| |/ / / /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-015-15/+621
| |\ \ \ \
| | * | | | Placate pedantic compiler warning modes on QGLBufferRhys Weatherley2010-02-012-15/+15
| | * | | | Add the QGLBuffer class to Qt 4.7 for VBO'sRhys Weatherley2010-02-015-15/+621
| | |/ / /
| * | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-018-358/+443
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Fixed compile of QTriangulator on Solaris.Kim Motoyoshi Kalland2010-01-261-5/+7
| * | | | Merge branch '4.6'Thiago Macieira2010-01-215-13/+60
| |\ \ \ \
| * | | | | Updated painter path caching in the GL2 engine after merge.Kim Motoyoshi Kalland2010-01-191-3/+2
| * | | | | Merge branch '4.6'Thiago Macieira2010-01-1815-434/+475
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-1367-110/+162
| |\ \ \ \ \ \
| * | | | | | | Add QT_{BEGIN,END}_NAMESPACE to qtextureglyphcache_gl.cpp.ck2010-01-111-0/+4
| * | | | | | | Merge branch '4.6'Thiago Macieira2010-01-0818-507/+719
| |\ \ \ \ \ \ \
| * | | | | | | | Fix compilation breakage caused by merge.Thiago Macieira2010-01-061-1/+1
| * | | | | | | | Change from std::pair to QPair.Thiago Macieira2010-01-061-8/+8