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

[Sam Spilsbury]

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

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

[Daniel van Vugt (vanvugt)]

Tested and verified in https://code.launchpad.net/~smspillaz/unity/unity.6.0.fix_1036521/+merge/125109

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

[Neil J. Patel (njpatel)]

Will resubmit with a remerge of trunk with API fixes.

[Neil J. Patel (njpatel)]

Manually merged in with fixes. Yay automerge hell.

=== modified file 'launcher/CairoBaseWindow.cpp'
--- launcher/CairoBaseWindow.cpp	2012-05-07 22:28:17 +0000
+++ launcher/CairoBaseWindow.cpp	2012-09-19 06:28:21 +0000
@@ -19,6 +19,7 @@
 
 
 #include <Nux/Nux.h>
+#include <Nux/WindowCompositor.h>
 
 #include "unity-shared/CairoTexture.h"
 #include "CairoBaseWindow.h"
@@ -58,7 +59,7 @@
   if (_use_blurred_background && _compute_blur_bkg)
   {
     auto current_fbo = nux::GetGraphicsDisplay()->GetGpuDevice()->GetCurrentFrameBufferObject();
-    nux::GetGraphicsDisplay()->GetGpuDevice()->DeactivateFrameBuffer();
+    nux::GetWindowCompositor ().RestoreMainFramebuffer();
 
     gfxContext.SetViewport(0, 0, gfxContext.GetWindowWidth(), gfxContext.GetWindowHeight());
     gfxContext.SetScissor(0, 0, gfxContext.GetWindowWidth(), gfxContext.GetWindowHeight());