Compiz

Merge lp://qastaging/~compiz-team/compiz/compiz.workaround_1030891 into lp://qastaging/compiz/0.9.8

  1. compiz.workaround_1030891
  2. Merge into 0.9.8
Proposed by Sam Spilsbury
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 3389
Merged at revision: 3392
Proposed branch: lp://qastaging/~compiz-team/compiz/compiz.workaround_1030891
Merge into: lp://qastaging/compiz/0.9.8
Diff against target: 119 lines (+50/-1)
4 files modified
plugins/opengl/DRIVERS (+10/-0)
plugins/opengl/src/glxtfpbind/include/glx-tfp-bind.h (+4/-0)
plugins/opengl/src/glxtfpbind/src/glx-tfp-bind.cpp (+7/-0)
plugins/opengl/src/glxtfpbind/tests/test-opengl-glx-tfp-bind.cpp (+29/-1)
To merge this branch: bzr merge lp://qastaging/~compiz-team/compiz/compiz.workaround_1030891
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
jenkins (community) continuous-integration Approve
Review via email: mp+126180@code.qastaging.launchpad.net

Commit message

Disable server grab while calling glXBindTexImageEXT for now
(LP: #1030891)

Description of the change

There seems to be no sign of life on the VirtualBox bug https://www.virtualbox.org/ticket/10894 and having this code in causes a big slowdown on nvidia. Until we can fix bug 1049214 leave this disabled. A test was added to make sure a very small window for the race condition in bug 927168

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

PASSED: Continuous integration, rev:3389
http://jenkins.qa.ubuntu.com/job/compiz-ci/113/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/113/console

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

It works for me, though I'm finding the double-negative wording confusing:
   #ifndef LP_1030891_NOT_FIXED

On that note, should this be ifndef?
51 +#ifdef LP_1030891_NOT_FIXED

review: Needs Information
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

> It works for me, though I'm finding the double-negative wording confusing:
> #ifndef LP_1030891_NOT_FIXED

Yeah that does suck, although this is weirder

#ifdef LP_1030891_FIXED
...
#endif

where LP_1030891_FIXED is not defined anywhere (and necessarily, if it were fixed, the ifdefs would just be removed)

>
> On that note, should this be ifndef?
> 51 +#ifdef LP_1030891_NOT_FIXED

If you are talking about

50 + {
51 +#ifdef LP_1030891_NOT_FIXED
52 + ServerLock lock (serverGrabInterface);
53 +#endif
54 if (!checkPixmapValidity (x11Pixmap))

That is correct. We want to ensure that there's a server grab for unmanaged pixmaps, to avoid regressing bug 927168 . This happens quite rarely anyways (only on decor pixmaps)

Revision history for this message
Daniel van Vugt (vanvugt) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches