summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglshaderprogram.cpp
Commit message (Expand)AuthorAgeFilesLines
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291-24/+24
* Update contact information in license headers.Sergio Ahumada2012-08-011-2/+2
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
* Fix warning about deprecated conversions of string literals to char *hjk2011-02-041-2/+2
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
* | print out which GLSL shader that failed compilation for better debuggingGunnar Sletta2010-11-281-2/+19
|/
* Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-121-8/+2
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-261-2/+8
|\
| * Don't define highp/mediump/lowp if desktop GL has themRhys Weatherley2010-08-131-2/+8
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-111-1/+1
|\ \ | |/
| * setUniformValue(QSize) was setting (w,w) not (w,h)Rhys Weatherley2010-08-031-1/+1
* | Normalize integers when calling glVertexAttribPointer()Rhys Weatherley2010-06-241-2/+2
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-091-6/+13
|\ \ | |/
| * Allow attributes to be bound after a QGLShaderProgram is linked.Rhys Weatherley2010-03-311-6/+13
* | Compile Qt in C++0x mode.Thiago Macieira2010-03-201-9/+11
* | doc: Fixed some qdoc errors.Martin Smith2010-02-161-6/+5
* | 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
* | | 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 'geometry-shaders-to-integrate'Gunnar Sletta2010-02-081-4/+156
|\ \
| * | Another round of Geometry shader review.Gunnar Sletta2010-02-081-13/+5
| * | Fix Geometry shaders based on reviewGunnar Sletta2010-02-041-9/+15
| * | Geometry Shader support in QGLShaderProgramGunnar Sletta2010-02-011-0/+153
* | | 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
* | | | Add QMacCompatGLenum overrides for new QGLShaderProgram functionsRhys Weatherley2010-02-051-0/+28
|/ / /
* | | Improvements to the QGLShaderProgram APIRhys Weatherley2010-02-041-0/+183
* | | Remove obsolete OpenGL/ES CommonLite (fixed-point) supportRhys Weatherley2010-02-041-2/+2
| |/ |/|
* | Better support for user-generated binary shadersRhys Weatherley2010-01-271-3/+35
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-071-1/+1
|\
| * Update copyright year to 2010Jason McDonald2010-01-061-1/+1
* | Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram"Tom Cooksey2010-01-061-67/+0
|/
* Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgramTom Cooksey2009-12-221-0/+67
* Modify QGLShader and QGLShaderProgram in response to API reviewRhys Weatherley2009-11-051-131/+167
* Add QMacGLCompatTypes to QGLShaderProgram APITom Cooksey2009-11-041-0/+50
* Remove partial shader support from QGLShader/QGLShaderProgramRhys Weatherley2009-11-011-177/+5
* Remove shader/program binary support for nowRhys Weatherley2009-10-281-213/+0
* Suppress warnings under OpenGL/ES 2.0 in QGLShaderProgramRhys Weatherley2009-10-261-0/+55
* Fix OpenGL/ES 2.0 bug in previous QGLShaderProgram check-inRhys Weatherley2009-10-261-1/+1
* Use QObjectPrivate within QGLShaderPrivate and QGLShaderProgramPrivateRhys Weatherley2009-10-261-43/+132
* Optimize concatenation of partial shadersRhys Weatherley2009-10-261-30/+93
* Issue a warning if bindAttributeLocation() is used after shaders linkedRhys Weatherley2009-10-251-3/+8
* QGLContext::areSharing() to check for GL share relationshipsRhys Weatherley2009-10-011-4/+4
* qdoc: Shift snippets in QGLShaderProgram out into doc/src/snippetsRhys Weatherley2009-09-151-49/+3
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-091-4/+4
|\
| * Update license headers again.Jason McDonald2009-09-091-4/+4
* | Clean up shader programs properlyRhys Weatherley2009-09-091-190/+117
|/