summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/ |/|
| * Better support for user-generated binary shadersRhys Weatherley2010-01-271-3/+35
| * Added a warning to QGLWidget::renderText().Trond Kjernåsen2010-01-271-2/+20
| * Updated docs regarding QGLWidget::renderText() limitations.Trond Kjernåsen2010-01-251-0/+7
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-221-0/+3
| |\
| | * Fix rendering with simple shader in GL2 engineTom Cooksey2010-01-221-0/+3
| * | Fix y-inverted pixmaps properly.Gunnar Sletta2010-01-221-9/+5
| |/
| * 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-215-13/+60
|\ \ | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-201-1/+5
| |\
| | * Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers.Trond Kjernåsen2010-01-201-1/+5
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-192-2/+2
| |\ \ | | |/ | |/|
| | * Fix copyright year.Jason McDonald2010-01-192-2/+2
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-191-6/+45
| |\ \
| | * | Fix X11/EGL builds using OpenGL ES 1.1Tom Cooksey2010-01-191-6/+45
| | |/
| * | Fixed y-inverted pixmaps on N900.Gunnar Sletta2010-01-191-4/+8
| |/
* | 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
|\ \ | |/
| * Fix QGLWidget::renderPixmap() on Windows.Trond Kjernaasen2010-01-141-6/+6
| * Rework how Qt handles GL extensions.Trond Kjernåsen2010-01-1315-428/+469
* | 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
| | |_|/ | |/| |
generated by cgit v0.12 at 2024-11-15 11:39:14 (GMT)