Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make QtOpenGL compile on OpenGL ES 1.1 again | Tom Cooksey | 2009-05-14 | 1 | -18/+23 |
| | |||||
* | Enabled compilation of both GL and GL2 paint engine. | Samuel Rødal | 2009-05-13 | 1 | -16/+13 |
| | | | | | | | Compile both GL and GL2 paint engine on desktop, and choose between them at run-time based on GL version flags. Reviewed-by: Tom | ||||
* | Big GL Extension Cleanup | Tom Cooksey | 2009-05-06 | 1 | -1/+2 |
| | | | | | | | | | 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 | ||||
* | Fix OpenGL ES 2.0 breakages | Tom Cooksey | 2009-05-05 | 1 | -2/+2 |
| | | | | | Enable GL graphics system on ES 2.0 builds - it wont work, but now QGLDrawable is being used it's just easier to build the graphics system. | ||||
* | Merge branch 'master' into gl2engine-new-shaders | Samuel Rødal | 2009-04-22 | 1 | -0/+4 |
|\ | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro | ||||
| * | Merge branch 'qt/main' | Gunnar Sletta | 2009-04-17 | 1 | -2/+4 |
| |\ | | | | | | | | | | | | | Conflicts: src/opengl/opengl.pro | ||||
| | * | BT: OpenGL ES 2.0 now compiles properly for Windows CE | Thomas Hartmann | 2009-04-15 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | glpixmapfilter should not be compiled for OpenGL ES 2.0 on nay platform Reviewed-by: Tom Cooksey | ||||
* | | | Clean up existing & implement missing GLSL for new shader manager | Tom Cooksey | 2009-04-16 | 1 | -1/+1 |
| | | | |||||
* | | | Re-write the shader manager & completely break everything ;-) | Tom Cooksey | 2009-04-16 | 1 | -5/+4 |
| | | | |||||
* | | | Import shader implementation from before the history cut. | Rhys Weatherley | 2009-04-03 | 1 | -2/+4 |
|/ / | |||||
* | | Merge branch 'gl2text' of ..\qt-main | Kim Motoyoshi Kalland | 2009-04-01 | 1 | -6/+6 |
|/ | |||||
* | Long live Qt! | Lars Knoll | 2009-03-23 | 1 | -0/+135 |