Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge license header changes from 4.5 | Volker Hilsheimer | 2009-06-16 | 1 | -2/+2 |
|\ | |||||
| * | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 1 | -2/+2 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Resolved FBO extensions as well when resolving GL 2 extensions. | Samuel Rødal | 2009-06-09 | 1 | -0/+3 |
| | | | | | | | | | | The new GL 2 text drawing requries the FBO function pointers to be resolved. | ||||
* | | Big GL Extension Cleanup | Tom Cooksey | 2009-05-06 | 1 | -44/+81 |
| | | | | | | | | | | | | | | | | | | Clean up the extension naming and make things build on OpenGL ES 2.0 again. All the extensions which made it into OpenGL 2.0 spec have have the EXT postfix removed. This also eliminates defines on ES 2.0 as the code now refers to the in-spec names. Reviewed-by: sroedal | ||||
* | | Merge branch 'shader-api' into gl2engine-new-shaders | Rhys Weatherley | 2009-05-01 | 1 | -16/+0 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/opengl.pro src/opengl/qglextensions.cpp src/opengl/qglextensions_p.h src/opengl/qglshaderprogram.cpp src/opengl/qglshaderprogram.h | ||||
| * | | Import shader implementation from before the history cut. | Rhys Weatherley | 2009-03-23 | 1 | -26/+148 |
| |/ | |||||
| * | Long live Qt 4.5! | Lars Knoll | 2009-03-23 | 1 | -0/+185 |
| | |||||
* | Import shader implementation from before the history cut. | Rhys Weatherley | 2009-04-03 | 1 | -45/+169 |
| | |||||
* | Fixes: Add blitting and multisample API to QGLFramebufferObject. | Samuel Rødal | 2009-04-01 | 1 | -0/+3 |
| | | | | | | RevBy: Trond Details: Support GL_EXT_framebuffer_multisample and GL_EXT_framebuffer_blit in the QGLFramebufferObject API. | ||||
* | Merge branch 'gl2text' of ..\qt-main | Kim Motoyoshi Kalland | 2009-04-01 | 1 | -1/+20 |
| | |||||
* | Long live Qt! | Lars Knoll | 2009-03-23 | 1 | -0/+185 |