summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'shader-api' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team i...Michael Brasser2009-05-181-1/+1
|\
| * Mac OSX compile errors in shader usageRhys Weatherley2009-05-101-1/+1
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-05-071-2/+1
|\ \
| * \ Merge branch '4.5'Thiago Macieira2009-05-071-2/+1
| |\ \
| | * | Compiler warnings (Mac/Carbon)Bjoern Erik Nilsen2009-05-071-2/+1
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-05-061-3/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-061-3/+2
| |\ \ \ | | |/ /
| | * | Re-enabled antialiasing for large font sizes in OpenGL paint engine.Samuel Rødal2009-05-061-3/+2
* | | | Merge branch 'shader-api' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team i...Michael Brasser2009-05-062-72/+297
|\ \ \ \ | | |_|/ | |/| |
| * | | qdoc fixesRhys Weatherley2009-05-011-12/+12
| * | | Disable shaders on OpenGL/ES 1.1Rhys Weatherley2009-05-012-2/+2
| * | | Samplers should be set via the GLuint override, not the GLint override.Rhys Weatherley2009-05-012-7/+35
| * | | Make QGLShaderProgram::disable() static.Rhys Weatherley2009-05-012-2/+8
| * | | Rename QGLShader(Program)::errors() to log()Rhys Weatherley2009-05-012-39/+39
| * | | Add uniform setters for Qt data types to QGLShaderProgramTom Cooksey2009-05-012-0/+142
| * | | Merge branch 'shaderprograms' of git@scm.dev.nokia.troll.no:qt/rweathers-shad...Rhys Weatherley2009-05-018-206/+3420
| |\ \ \ | | |/ / | |/| |
| | * | Fix loading of partial shaders from files.Rhys Weatherley2009-03-271-3/+0
| | * | Bug in QGLShaderProgram::addShader() that stopped partial shaders working.Rhys Weatherley2009-03-271-3/+6
| | * | Import shader implementation from before the history cut.Rhys Weatherley2009-03-238-208/+3422
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-05-051-2/+10
|\ \ \ \ | |/ / /
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-291-2/+10
| |\ \ \ | | | |/ | | |/|
| | * | Get rid of an unnecessary image copy when grabbing a GL framebuffer.Trond Kjernåsen2009-04-291-2/+10
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-04-282-1/+5
|\ \ \ \ | |/ / /
| * | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-271-0/+4
| |\ \ \ | | |/ /
| | * | Fixes wrong QPaintEvent::region() in QGLWidget::paintEvent.Bjoern Erik Nilsen2009-04-271-0/+4
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-231-1/+1
| |\ \ \ | | |/ /
| | * | Compile fix for static builds on Windows for QtOpenGL apps.Denis Dzyubenko2009-04-221-1/+1
* | | | Make compileMichael Brasser2009-04-221-3/+1
* | | | Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-222-55/+114
|\ \ \ \ | |/ / /
| * | | Merge branch '4.5'Rhys Weatherley2009-04-211-2/+8
| |\ \ \ | | |/ /
| | * | Fix crash in OpenGL paint engine with hq antialiasing and TxProjectSamuel Rødal2009-04-211-2/+8
| | * | Reparenting QGLWidgets did sometimes caused warnings to be printed onTrond Kjernåsen2009-04-151-1/+1
| | * | BT: OpenGL ES 2.0 now compiles properly for Windows CEThomas Hartmann2009-04-151-4/+6
| | * | BT: Fix Cocoa bug w/OpenGL widgets in dock widgets would disappear.Norwegian Rock Cat2009-04-153-23/+10
| * | | Speed up texture uploads for hardware without n-pot-2 texture support.Trond Kjernåsen2009-04-201-53/+106
* | | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-228-206/+3373
|/ / /
* | | Reparenting QGLWidgets did sometimes caused warnings to be printed onTrond Kjernåsen2009-04-151-1/+1
* | | BT: OpenGL ES 2.0 now compiles properly for Windows CEThomas Hartmann2009-04-151-4/+6
* | | BT: Fix Cocoa bug w/OpenGL widgets in dock widgets would disappear.Norwegian Rock Cat2009-04-153-23/+10
* | | Merge commit 'origin/4.5'Olivier Goffart2009-04-152-6/+4
|\ \ \ | |/ /
| * | Fixes the composition demo for Mac/Cocoa in GL mode.Trond Kjernaasen2009-04-141-6/+0
| * | Update docs regarding sibling widgets ontop of QGLWidgets when Qt is builtTrond Kjernåsen2009-04-141-0/+4
| * | Make OpenGL/ES 1.1 CommonLite and OpenGL/ES 1.0 builds workRhys Weatherley2009-04-075-25/+37
* | | Rename qIsFuzzyNull to qFuzzyIsNullBjoern Erik Nilsen2009-04-081-4/+4
* | | Use qIsFuzzyNull rather than the more expensive qFuzzyCompareBjoern Erik Nilsen2009-04-081-5/+4
* | | Make OpenGL/ES 1.1 CommonLite and OpenGL/ES 1.0 builds workRhys Weatherley2009-04-075-25/+37
* | | Merge branch '4.5'Thiago Macieira2009-04-031-1/+1
|\ \ \ | |/ /
| * | BT: Compilation on WinCE.Trond Kjernåsen2009-04-031-1/+1
* | | Merge branch '4.5'Thiago Macieira2009-03-271-0/+3
|\ \ \ | |/ /
| * | Crash in OpenGL paint engine when brush style is Qt::NoBrush.Samuel Rødal2009-03-271-0/+3
| |/