Merge lp:~vanvugt/unity/fix-1036528 into lp:unity
Proposed by
Daniel van Vugt
Status: | Merged |
---|---|
Approved by: | Daniel van Vugt |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2566 |
Proposed branch: | lp:~vanvugt/unity/fix-1036528 |
Merge into: | lp:unity |
Diff against target: |
40 lines (+6/-8) 1 file modified
plugins/unityshell/src/unityshell.cpp (+6/-8) |
To merge this branch: | bzr merge lp:~vanvugt/unity/fix-1036528 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sam Spilsbury (community) | Approve | ||
Unity Team | Pending | ||
Review via email: mp+119677@code.launchpad.net |
This proposal supersedes a proposal from 2012-08-14.
Commit message
Fixed: Benchmark window was being rendered shrunken, misplaced and frequently
invisible if unity was built with USE_MODERN_
This was caused by some rather important code being #ifdef'd out incorrectly.
Description of the change
Fixed: Benchmark window was being rendered shrunken, misplaced and frequently
invisible if unity was built with USE_MODERN_
This was caused by some rather important code being #ifdef'd out incorrectly.
To post a comment you must log in.
+#ifndef USE_GLES COMPIZ_ GL buffer) (GL_FRAMEBUFFER _EXT, _active_fbo);
18 #ifndef USE_MODERN_
19 (*GL::bindFrame
20 +#endif
Hmm, are we not binding a default fbo in gles builds of nux ?