Merge lp://qastaging/~sil2100/compiz/revert_3427_0.9.8 into lp://qastaging/compiz/0.9.8
Status: | Merged |
---|---|
Approved by: | Timo Jyrinki |
Approved revision: | 3433 |
Merged at revision: | 3433 |
Proposed branch: | lp://qastaging/~sil2100/compiz/revert_3427_0.9.8 |
Merge into: | lp://qastaging/compiz/0.9.8 |
Diff against target: |
16 lines (+0/-6) 1 file modified
plugins/opengl/src/glxtfpbind/src/glx-tfp-bind.cpp (+0/-6) |
To merge this branch: | bzr merge lp://qastaging/~sil2100/compiz/revert_3427_0.9.8 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Timo Jyrinki | Approve | ||
Sam Spilsbury | Pending | ||
Francis Ginther | Pending | ||
Review via email: mp+150364@code.qastaging.launchpad.net |
This proposal supersedes a proposal from 2013-01-24.
Commit message
Revert revision 3427 - it causes regressions on VirtualBox
Description of the change
Re-submitting the same merge request. The real fix for the issues that has been commited in lp:compiz is a series of more risky changes, while we want to release a quick compiz update this week. Reverting this revision unblocks compiz for quantal VirtualBox.
So my proposition: for now, a revert, and then we can re-introduce the backported fix along with the right fix for the VB driver.
- Problem:
The current 0.9.8 snapshot branch causes crashes and hangups on VirtualBox. Francis bisected it to be caused by fix of LP: #1060327 .
- Fix:
Reverting revision 3427 (fix for LP: #1060327).
- Tests:
N/A
I would suggest updating virtual box instead. They told me they've fixed
the bug on their end.
Putting this fix in will likely regress the crash with llvmpipe.
On 25/01/2013 3:17 AM, "Łukasz Zemczak" <email address hidden>
wrote:
> Łukasz Zemczak has proposed merging lp:~sil2100/compiz/revert_3427_0.9.8 /code.launchpad .net/~sil2100/ compiz/ revert_ 3427_0. 9.8/+merge/ 144764 /code.launchpad .net/~sil2100/ compiz/ revert_ 3427_0. 9.8/+merge/ 144764 opengl/ src/glxtfpbind/ src/glx- tfp-bind. cpp' opengl/ src/glxtfpbind/ src/glx- tfp-bind. cpp 2012-12-11 opengl/ src/glxtfpbind/ src/glx- tfp-bind. cpp 2013-01-24 lidity (x11Pixmap)) NOT_FIXED
> into lp:compiz/0.9.8.
>
> Commit message:
> Revert revision 3427 - it seems to cause regressions on VirtualBox for
> quantal.
>
> Requested reviews:
> Compiz Maintainers (compiz-team)
>
> For more details, see:
> https:/
>
> - Problem:
>
> The current 0.9.8 snapshot branch causes crashes and hangups on
> VirtualBox. Francis bisected it to be caused by fix of LP: #1060327 .
>
> - Fix:
>
> Reverting revision 3427 (fix for LP: #1060327). It is said to be fixing
> the regressions.
>
> - Tests:
>
> N/A
> --
> https:/
> Your team Compiz Maintainers is requested to review the proposed merge of
> lp:~sil2100/compiz/revert_3427_0.9.8 into lp:compiz/0.9.8.
>
> === modified file 'plugins/
> --- plugins/
> 04:53:02 +0000
> +++ plugins/
> 18:16:22 +0000
> @@ -52,12 +52,6 @@
> #endif
> if (!checkPixmapVa
> return false;
> -
> -#ifdef LP_1030891_
> - // We need to bind before the above ServerLock is lost
> - bindTexImageEXT (glxPixmap);
> - return true;
> -#endif
> }
>
> bindTexImageEXT (glxPixmap);
>
>
>