| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-08-26 | 1 | -2/+8 |
|\ |
|
| * | Don't define highp/mediump/lowp if desktop GL has them | Rhys Weatherley | 2010-08-13 | 1 | -2/+8 |
|
|
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-08-11 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | setUniformValue(QSize) was setting (w,w) not (w,h) | Rhys Weatherley | 2010-08-03 | 1 | -1/+1 |
|
|
* | | Normalize integers when calling glVertexAttribPointer() | Rhys Weatherley | 2010-06-24 | 1 | -2/+2 |
|
|
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-04-09 | 1 | -6/+13 |
|\ \
| |/ |
|
| * | Allow attributes to be bound after a QGLShaderProgram is linked. | Rhys Weatherley | 2010-03-31 | 1 | -6/+13 |
|
|
* | | Compile Qt in C++0x mode. | Thiago Macieira | 2010-03-20 | 1 | -9/+11 |
|
|
* | | doc: Fixed some qdoc errors. | Martin Smith | 2010-02-16 | 1 | -6/+5 |
|
|
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-12 | 1 | -1/+1 |
|\ \ |
|
| * | | Fixed Mac OS X compile time error by using GLint for temp. | Martin Smith | 2010-02-11 | 1 | -1/+1 |
|
|
* | | | Added \since 4.7 tags | Gunnar Sletta | 2010-02-10 | 1 | -0/+14 |
|/ / |
|
* | | Added geometry shaders to changes-4.7.0 file + a small doc update about it | Gunnar Sletta | 2010-02-10 | 1 | -0/+2 |
|
|
* | | Merge branch 'geometry-shaders-to-integrate' | Gunnar Sletta | 2010-02-08 | 1 | -4/+156 |
|\ \ |
|
| * | | Another round of Geometry shader review. | Gunnar Sletta | 2010-02-08 | 1 | -13/+5 |
|
|
| * | | Fix Geometry shaders based on review | Gunnar Sletta | 2010-02-04 | 1 | -9/+15 |
|
|
| * | | Geometry Shader support in QGLShaderProgram | Gunnar Sletta | 2010-02-01 | 1 | -0/+153 |
|
|
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-05 | 1 | -14/+16 |
|\ \ \ |
|
| * | | | doc: Fixed some qdoc warnings. | Martin Smith | 2010-02-05 | 1 | -14/+16 |
|
|
* | | | | Add QMacCompatGLenum overrides for new QGLShaderProgram functions | Rhys Weatherley | 2010-02-05 | 1 | -0/+28 |
|/ / / |
|
* | | | Improvements to the QGLShaderProgram API | Rhys Weatherley | 2010-02-04 | 1 | -0/+183 |
|
|
* | | | Remove obsolete OpenGL/ES CommonLite (fixed-point) support | Rhys Weatherley | 2010-02-04 | 1 | -2/+2 |
| |/
|/| |
|
* | | Better support for user-generated binary shaders | Rhys Weatherley | 2010-01-27 | 1 | -3/+35 |
|/ |
|
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-01-07 | 1 | -1/+1 |
|\ |
|
| * | Update copyright year to 2010 | Jason McDonald | 2010-01-06 | 1 | -1/+1 |
|
|
* | | Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram" | Tom Cooksey | 2010-01-06 | 1 | -67/+0 |
|/ |
|
* | Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram | Tom Cooksey | 2009-12-22 | 1 | -0/+67 |
|
|
* | Modify QGLShader and QGLShaderProgram in response to API review | Rhys Weatherley | 2009-11-05 | 1 | -131/+167 |
|
|
* | Add QMacGLCompatTypes to QGLShaderProgram API | Tom Cooksey | 2009-11-04 | 1 | -0/+50 |
|
|
* | Remove partial shader support from QGLShader/QGLShaderProgram | Rhys Weatherley | 2009-11-01 | 1 | -177/+5 |
|
|
* | Remove shader/program binary support for now | Rhys Weatherley | 2009-10-28 | 1 | -213/+0 |
|
|
* | Suppress warnings under OpenGL/ES 2.0 in QGLShaderProgram | Rhys Weatherley | 2009-10-26 | 1 | -0/+55 |
|
|
* | Fix OpenGL/ES 2.0 bug in previous QGLShaderProgram check-in | Rhys Weatherley | 2009-10-26 | 1 | -1/+1 |
|
|
* | Use QObjectPrivate within QGLShaderPrivate and QGLShaderProgramPrivate | Rhys Weatherley | 2009-10-26 | 1 | -43/+132 |
|
|
* | Optimize concatenation of partial shaders | Rhys Weatherley | 2009-10-26 | 1 | -30/+93 |
|
|
* | Issue a warning if bindAttributeLocation() is used after shaders linked | Rhys Weatherley | 2009-10-25 | 1 | -3/+8 |
|
|
* | QGLContext::areSharing() to check for GL share relationships | Rhys Weatherley | 2009-10-01 | 1 | -4/+4 |
|
|
* | qdoc: Shift snippets in QGLShaderProgram out into doc/src/snippets | Rhys Weatherley | 2009-09-15 | 1 | -49/+3 |
|
|
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Rhys Weatherley | 2009-09-09 | 1 | -4/+4 |
|\ |
|
| * | Update license headers again. | Jason McDonald | 2009-09-09 | 1 | -4/+4 |
|
|
* | | Clean up shader programs properly | Rhys Weatherley | 2009-09-09 | 1 | -190/+117 |
|/ |
|
* | Modify QMatrix4x4 and QQuaternion to use qreal internally | Rhys Weatherley | 2009-09-04 | 1 | -105/+92 |
|
|
* | Add #define's for highp/mediump after #version/#extension headers | Rhys Weatherley | 2009-09-01 | 1 | -1/+20 |
|
|
* | OpenGL/ES 2.0 compilation problem since QGLContextGroup changes | Rhys Weatherley | 2009-08-31 | 1 | -0/+12 |
|
|
* | Added context pointer to QGLContextGroupResources. | Kim Motoyoshi Kalland | 2009-08-31 | 1 | -20/+20 |
|
|
* | doc: Fixed several qdoc errors. | Martin Smith | 2009-08-31 | 1 | -1/+1 |
|
|
* | Fixed crash when sharing OpenGL contexts in the GL2 paint engine. | Kim Motoyoshi Kalland | 2009-08-31 | 1 | -46/+151 |
|
|
* | Update tech preview license header for files that are new in 4.6. | Jason McDonald | 2009-08-31 | 1 | -13/+13 |
|
|
* | Remove QGLShader from its QGLShaderProgram when it is destroyed | Rhys Weatherley | 2009-08-31 | 1 | -4/+20 |
|
|
* | Define highp to mediump on OpenGL/ES systems that don't have highp | Rhys Weatherley | 2009-08-27 | 1 | -0/+15 |
|
|