Merge lp://qastaging/~linaro-graphics-wg/glmark2/canvas-fbo into lp://qastaging/glmark2/2011.11
Proposed by
Alexandros Frantzis
| Status: | Merged |
|---|---|
| Merged at revision: | 202 |
| Proposed branch: | lp://qastaging/~linaro-graphics-wg/glmark2/canvas-fbo |
| Merge into: | lp://qastaging/glmark2/2011.11 |
| Diff against target: |
724 lines (+393/-35) 14 files modified
doc/glmark2.1.in (+5/-3) src/canvas-x11-egl.cpp (+15/-12) src/canvas-x11-egl.h (+1/-0) src/canvas-x11-glx.cpp (+13/-0) src/canvas-x11-glx.h (+1/-0) src/canvas-x11.cpp (+210/-7) src/canvas-x11.h (+35/-1) src/canvas.h (+17/-1) src/gl-headers.cpp (+20/-0) src/gl-headers.h (+25/-1) src/main.cpp (+2/-0) src/options.cpp (+35/-6) src/options.h (+10/-1) src/scene-desktop.cpp (+4/-3) |
| To merge this branch: | bzr merge lp://qastaging/~linaro-graphics-wg/glmark2/canvas-fbo |
| Related bugs: | |
| Related blueprints: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jesse Barker | Approve | ||
|
Review via email:
|
|||
Description of the change
Add support for rendering to an off-screen surface.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good. I think this will really give us some additional flexibility moving forward.