summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-136-14/+274
|\ \ \ \ | |/ / /
| * | | 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 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 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 '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Kim Motoyoshi Kalland2010-02-092-3/+3
| |\ \ \
| | * | | Fixed bug where GL widget was not fully updated on Vista.Kim Motoyoshi Kalland2010-02-042-3/+3
| * | | | Add a pixmap modification hook to blur pixmap filter cacheTom Cooksey2010-02-081-0/+1
* | | | | 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 '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
generated by cgit v0.12 at 2024-11-23 03:13:26 (GMT)