| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | | Mac OSX compile errors in shader usage | Rhys Weatherley | 2009-05-10 | 1 | -1/+1 |
|
|
* | | | | Merge branch 'gl2engine-new-shaders' into graphics-master | Tom Cooksey | 2009-05-06 | 12 | -406/+494 |
|\ \ \ \ |
|
| * | | | | Big GL Extension Cleanup | Tom Cooksey | 2009-05-06 | 8 | -252/+253 |
|
|
| * | | | | Fix OpenGL ES 2.0 breakages | Tom Cooksey | 2009-05-05 | 3 | -3/+14 |
|
|
| * | | | | Rename uses of QGLShaderProgram::errors() to log() | Rhys Weatherley | 2009-05-01 | 1 | -2/+2 |
|
|
| * | | | | Merge branch 'shader-api' into gl2engine-new-shaders | Rhys Weatherley | 2009-05-01 | 7 | -149/+225 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | qdoc fixes | Rhys Weatherley | 2009-05-01 | 1 | -12/+12 |
|
|
| | * | | | Disable shaders on OpenGL/ES 1.1 | Rhys Weatherley | 2009-05-01 | 2 | -2/+2 |
|
|
| | * | | | Samplers should be set via the GLuint override, not the GLint override. | Rhys Weatherley | 2009-05-01 | 2 | -7/+35 |
|
|
| | * | | | Make QGLShaderProgram::disable() static. | Rhys Weatherley | 2009-05-01 | 2 | -2/+8 |
|
|
| | * | | | Rename QGLShader(Program)::errors() to log() | Rhys Weatherley | 2009-05-01 | 2 | -39/+39 |
|
|
| | * | | | Add uniform setters for Qt data types to QGLShaderProgram | Tom Cooksey | 2009-05-01 | 2 | -0/+142 |
|
|
| | * | | | Merge branch 'shaderprograms' of git@scm.dev.nokia.troll.no:qt/rweathers-shad... | Rhys Weatherley | 2009-05-01 | 8 | -206/+3420 |
| | |\ \ \
| | | |/ /
| | |/| | |
|
| | | * | | Fix loading of partial shaders from files. | Rhys Weatherley | 2009-03-27 | 1 | -3/+0 |
|
|
| | | * | | Bug in QGLShaderProgram::addShader() that stopped partial shaders working. | Rhys Weatherley | 2009-03-27 | 1 | -3/+6 |
|
|
| | | * | | Import shader implementation from before the history cut. | Rhys Weatherley | 2009-03-23 | 8 | -208/+3422 |
|
|
| | * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-29 | 1 | -2/+10 |
| | |\ \ \
| | | | |/
| | | |/| |
|
| | | * | | Get rid of an unnecessary image copy when grabbing a GL framebuffer. | Trond Kjernåsen | 2009-04-29 | 1 | -2/+10 |
|
|
| | * | | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qt | Simon Hausmann | 2009-04-27 | 1 | -0/+4 |
| | |\ \ \
| | | |/ / |
|
| | | * | | Fixes wrong QPaintEvent::region() in QGLWidget::paintEvent. | Bjoern Erik Nilsen | 2009-04-27 | 1 | -0/+4 |
|
|
| | * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-23 | 1 | -1/+1 |
| | |\ \ \
| | | |/ / |
|
| | | * | | Compile fix for static builds on Windows for QtOpenGL apps. | Denis Dzyubenko | 2009-04-22 | 1 | -1/+1 |
|
|
| | * | | | Merge branch '4.5' | Rhys Weatherley | 2009-04-21 | 1 | -2/+8 |
| | |\ \ \
| | | |/ / |
|
| | | * | | Fix crash in OpenGL paint engine with hq antialiasing and TxProject | Samuel Rødal | 2009-04-21 | 1 | -2/+8 |
|
|
| | | * | | Reparenting QGLWidgets did sometimes caused warnings to be printed on | Trond Kjernåsen | 2009-04-15 | 1 | -1/+1 |
|
|
| | | * | | BT: OpenGL ES 2.0 now compiles properly for Windows CE | Thomas Hartmann | 2009-04-15 | 1 | -4/+6 |
|
|
| | | * | | BT: Fix Cocoa bug w/OpenGL widgets in dock widgets would disappear. | Norwegian Rock Cat | 2009-04-15 | 3 | -23/+10 |
|
|
| | * | | | Speed up texture uploads for hardware without n-pot-2 texture support. | Trond Kjernåsen | 2009-04-20 | 1 | -53/+106 |
|
|
* | | | | | compile... | Gunnar Sletta | 2009-04-24 | 1 | -2/+1 |
|
|
* | | | | | Remove old qglshader files from gl2paintengineex. | Samuel Rødal | 2009-04-23 | 2 | -878/+0 |
|/ / / / |
|
* | | | | Allow release builds again | Tom Cooksey | 2009-04-22 | 1 | -2/+0 |
|
|
* | | | | Make useCorrectShaderProg() return a bool again | Tom Cooksey | 2009-04-22 | 3 | -13/+10 |
|
|
* | | | | Make optimiseForBrushTransform take a QTransform reference | Tom Cooksey | 2009-04-22 | 2 | -2/+2 |
|
|
* | | | | Change fragment shaders to apply the mask as the final step | Tom Cooksey | 2009-04-22 | 1 | -2/+2 |
|
|
* | | | | Merge branch 'master' into gl2engine-new-shaders | Samuel Rødal | 2009-04-22 | 16 | -243/+536 |
|\ \ \ \ |
|
| * | | | | Prevent copy back from FBO when initializing render FBO from texture. | Samuel Rødal | 2009-04-20 | 3 | -5/+5 |
|
|
| * | | | | Smudgy text in GL2 paint engine when drawing on non-integer offsets. | Samuel Rødal | 2009-04-17 | 1 | -21/+39 |
|
|
| * | | | | Correctly handle using GL pixmaps that still have an active engine. | Samuel Rødal | 2009-04-17 | 5 | -20/+86 |
|
|
| * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team | Gunnar Sletta | 2009-04-17 | 9 | -151/+363 |
| |\ \ \ \ |
|
| | * | | | | Use FBOs as pixmap backend in GL graphics system. | Samuel Rødal | 2009-04-16 | 8 | -98/+311 |
|
|
| | * | | | | Make FBO the default instead of pixel buffers in GL window surface. | Samuel Rødal | 2009-04-16 | 1 | -28/+29 |
|
|
| | * | | | | Ensure we don't access the GL share widget when it's being destroyed. | Samuel Rødal | 2009-04-16 | 1 | -2/+3 |
|
|
| | * | | | | GL2: Avoid expensive updateDepthClip() every time setState() is called | Samuel Rødal | 2009-04-16 | 2 | -17/+14 |
|
|
| | * | | | | Fix off-by-one bugs in the framebuffer blits. | Samuel Rødal | 2009-04-16 | 1 | -6/+6 |
|
|
| * | | | | | Merge branch 'qt/main' | Gunnar Sletta | 2009-04-17 | 11 | -63/+61 |
| |\ \ \ \ \
| | |/ / / /
| |/| / / /
| | |/ / / |
|
| | * | | | Reparenting QGLWidgets did sometimes caused warnings to be printed on | Trond Kjernåsen | 2009-04-15 | 1 | -1/+1 |
|
|
| | * | | | BT: OpenGL ES 2.0 now compiles properly for Windows CE | Thomas Hartmann | 2009-04-15 | 1 | -4/+6 |
|
|
| | * | | | BT: Fix Cocoa bug w/OpenGL widgets in dock widgets would disappear. | Norwegian Rock Cat | 2009-04-15 | 3 | -23/+10 |
|
|
| | * | | | Merge commit 'origin/4.5' | Olivier Goffart | 2009-04-15 | 2 | -6/+4 |
| | |\ \ \
| | | |/ / |
|
| | | * | | Fixes the composition demo for Mac/Cocoa in GL mode. | Trond Kjernaasen | 2009-04-14 | 1 | -6/+0 |
|
|