Merge lp:~smspillaz/unity/unity.fix_1036521 into lp:unity

Proposed by Sam Spilsbury on 2012-09-19
Status: Merged
Merge reported by: Neil J. Patel
Merged at revision: not available
Proposed branch: lp:~smspillaz/unity/unity.fix_1036521
Merge into: lp:unity
Diff against target: 20 lines (+2/-1)
1 file modified
launcher/CairoBaseWindow.cpp (+2/-1)
To merge this branch: bzr merge lp:~smspillaz/unity/unity.fix_1036521
Reviewer Review Type Date Requested Status
Daniel van Vugt 2012-09-19 Approve on 2012-09-19
Review via email: mp+125104@code.launchpad.net

Commit message

Don't call GraphicsContext::DeactivateFramebuffer which will immediately restore the backbuffer. Instead call WindowCompositor::RestoreMainFramebuffer to bind either the backbuffer or reference framebuffer for reading as that is the one we're drawing to as is the most-up-to-date

Description of the change

Don't call GraphicsContext::DeactivateFramebuffer which will immediately restore the backbuffer. Instead call WindowCompositor::RestoreMainFramebuffer to bind either the backbuffer or reference framebuffer for reading as that is the one we're drawing to as is the most-up-to-date

No test suite here, the real tested code needs to go in: https://code.launchpad.net/~smspillaz/nux/nux.fix_1036521/+merge/125103

To post a comment you must log in.
Unity Merger (unity-merger) wrote :

No commit message specified.

Neil J. Patel (njpatel) wrote :

Will resubmit with a remerge of trunk with API fixes.

Neil J. Patel (njpatel) wrote :

Manually merged in with fixes. Yay automerge hell.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/CairoBaseWindow.cpp'
2--- launcher/CairoBaseWindow.cpp 2012-05-07 22:28:17 +0000
3+++ launcher/CairoBaseWindow.cpp 2012-09-19 06:28:21 +0000
4@@ -19,6 +19,7 @@
5
6
7 #include <Nux/Nux.h>
8+#include <Nux/WindowCompositor.h>
9
10 #include "unity-shared/CairoTexture.h"
11 #include "CairoBaseWindow.h"
12@@ -58,7 +59,7 @@
13 if (_use_blurred_background && _compute_blur_bkg)
14 {
15 auto current_fbo = nux::GetGraphicsDisplay()->GetGpuDevice()->GetCurrentFrameBufferObject();
16- nux::GetGraphicsDisplay()->GetGpuDevice()->DeactivateFrameBuffer();
17+ nux::GetWindowCompositor ().RestoreMainFramebuffer();
18
19 gfxContext.SetViewport(0, 0, gfxContext.GetWindowWidth(), gfxContext.GetWindowHeight());
20 gfxContext.SetScissor(0, 0, gfxContext.GetWindowWidth(), gfxContext.GetWindowHeight());