summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2010-01-1367-110/+162
|\
| * 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-1266-71/+83
| |\
| | * Fix broken QGLWidget::renderPixmap on Mac/CarbonMorten Johan Sørvig2010-01-081-4/+16
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-083-69/+70
| | |\
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-0766-67/+67
| | |\ \
| | | * | Update copyright year to 2010Jason McDonald2010-01-0666-67/+67
| * | | | Fixed bug where QGLPixmapData::toImage() returned too dark image.Kim Motoyoshi Kalland2010-01-121-1/+1
| * | | | Fixed justify aligned text drawing with the GL1 engine.Kim Motoyoshi Kalland2010-01-111-1/+2
| * | | | 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-0818-507/+719
|\ \ \ \ | |/ / /
| * | | Reset the GL stencil mask, op and function in resetGLState().Trond Kjernåsen2010-01-071-0/+3
| * | | Fixed indentation and typo.Trond Kjernåsen2010-01-071-67/+67
| * | | Remove unnecessary call to QWidget::setAttribute().Trond Kjernåsen2010-01-071-2/+0
| |/ /
| * | Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram"Tom Cooksey2010-01-063-73/+3
| * | Improved initial startup time for a QGLWidget ontop of EGL/X11.Trond Kjernåsen2010-01-061-5/+111
| * | Removed temporary QGLWidget created during QGLWidget/X11 initialization.Trond Kjernåsen2010-01-051-2/+67
| * | fix compilation in GL2 paint engine for WindowsGunnar Sletta2010-01-051-0/+1
| * | Move QGLTextureGlyphCache into it's own fileTom Cooksey2010-01-055-240/+350
| * | Remove QGLShareRegister and transfer its functionality to QGLContextGroupRhys Weatherley2010-01-049-41/+39
| * | 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-303-109/+13
| * | Remove superfluous enable/disable vertex arrtib arraysTom Cooksey2009-12-301-34/+0
| * | Track which vertex attrib arrays are enabled in QGLContextPrivateTom Cooksey2009-12-306-5/+79
| |/
* | 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-055-172/+195
|\ \ | |/
| * 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
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2009-12-272-5/+11
| |\
| | * Fix text rendering on GL2 paint engineTom Cooksey2009-12-232-5/+11
| * | Merge branch '4.5' into 4.6-stagingThiago Macieira2009-12-261-3/+11
| |\ \ | | |/ | |/|
| | * Fix memory leak of QGLGlyphCoord objects in the OpenGL1 paint engineRhys Weatherley2009-12-201-3/+11
* | | Fixed QGLFormat::operator== to handle new fields.Kim Motoyoshi Kalland2010-01-041-3/+13
* | | Added support for OpenGL up to version 3.2 on Windows.Kim Motoyoshi Kalland2009-12-304-25/+275
* | | Format qOpenGLVersionFlagsFromString() according to Qt coding style.Kim Motoyoshi Kalland2009-12-301-22/+16
* | | Merge branch '4.6'Thiago Macieira2009-12-2616-822/+573
|\ \ \ | |/ /
| * | 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
| * | Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgramTom Cooksey2009-12-222-0/+71
| * | Prevent access to non-existent memory in triagulating strokerRhys Weatherley2009-12-181-2/+8
| * | Align GL_RGB lines on a 4-byte boundary when uploading pixmap texturesRhys Weatherley2009-12-181-13/+2
| * | GL2Engine: Don't mark brush as dirty if it hasn't changedTom Cooksey2009-12-173-34/+41
| * | Update FBO docs to describe how QPainter changes the GL stateRhys Weatherley2009-12-171-0/+6