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

Proposed by Sam Spilsbury
Status: Merged
Merged at revision: 3223
Proposed branch: lp://qastaging/~compiz-team/compiz/compiz.fix_1002602
Merge into: lp://qastaging/compiz/0.9.8
Diff against target: 213 lines (+65/-18)
5 files modified
plugins/composite/include/composite/composite.h (+8/-0)
plugins/composite/src/privates.h (+2/-0)
plugins/composite/src/window.cpp (+42/-12)
plugins/opengl/src/privates.h (+2/-0)
plugins/opengl/src/window.cpp (+11/-6)
To merge this branch: bzr merge lp://qastaging/~compiz-team/compiz/compiz.fix_1002602
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
Review via email: mp+107325@code.qastaging.launchpad.net

Description of the change

Delay unbinding of pixmaps until then next rebind (so that they stay bound until we are able to get the next one so you never actually lose the image of the window) and added a callback mechanism to notify renderers just before the pixmap is replaced (so they can do any necessary cleanup such as unbinding textures).

The reason for this is because the nvidia driver seems to require that any textures that are bound to the pixmap are unbound before the pixmap is released. Otherwise it will cause any futher rebind operations to fail silently.

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

A small note here - I am writing the tests for this now ... they will come subsequently, some refactoring is required

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

Looks good, works well.

I believe the static on line 129 is probably pointless, but don't care.

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