Compiz

Merge ~smspillaz/compiz:blur-fbo-rebind into compiz:master

  1. Git
  2. lp:~smspillaz/compiz
  3. blur-fbo-rebind
  4. Merge into master
Proposed by Sam Spilsbury
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: b7446e95b5d559ee7e6135b0b0374ae0f74d15bd
Merged at revision: 8381b9941c8fc2f541e4c4135a24e2bcbb5e022f
Proposed branch: ~smspillaz/compiz:blur-fbo-rebind
Merge into: compiz:master
Diff against target: 23 lines (+3/-2)
1 file modified
plugins/blur/src/blur.cpp (+3/-2)
Reviewer Review Type Date Requested Status
Compiz Maintainers Pending
Review via email: mp+412182@code.launchpad.net

Commit message

blur: Use GLFramebufferObject::rebind with the returned framebuffer.

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
1diff --git a/plugins/blur/src/blur.cpp b/plugins/blur/src/blur.cpp
2index 00b8efa..f8cd706 100644
3--- a/plugins/blur/src/blur.cpp
4+++ b/plugins/blur/src/blur.cpp
5@@ -1122,7 +1122,7 @@ BlurScreen::fboPrologue ()
6 void
7 BlurScreen::fboEpilogue ()
8 {
9- oldDrawFramebuffer->bind ();
10+ fbo->rebind (oldDrawFramebuffer);
11
12 fbo->tex ()->enable (GLTexture::Good);
13 //GL::generateMipmap (fbo->tex ()->target ());
14@@ -1465,7 +1465,8 @@ BlurWindow::updateDstTexture (const GLMatrix &transform,
15 /* We have to bind it in order to get a status */
16 GLFramebufferObject *old = bScreen->fbo->bind();
17 bool status = bScreen->fbo->checkStatus ();
18- old->bind();
19+
20+ bScreen->fbo->rebind (old);
21
22 if (!status)
23 compLogMessage ("blur", CompLogLevelError,

Subscribers

People subscribed via source and target branches