summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* 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 '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-034-35/+33
| | |\
| | | * Fixed a failure in tst_qgl.Trond Kjernåsen2010-02-021-1/+0
| | | * Fixed compilation of the GL2 engine for OpenGL ES 2.Kim Motoyoshi Kalland2010-02-021-0/+2
| | | * Fixed missing textures in the boxes demo.Kim Motoyoshi Kalland2010-02-021-0/+1
| | | * Fixed garbled 3D Qt logo in the overpainting example.Kim Motoyoshi Kalland2010-02-011-0/+3
| | | * Fix GL texture leaks when pixmaps are deletedTom Cooksey2010-01-293-35/+28
| | * | Fix missing namespace.ck2010-02-011-0/+4
| | |/
* | | 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
generated by cgit v0.12 at 2025-03-03 05:37:02 (GMT)