Merge lp:~khadgaray/compiz/lp1213809 into lp:compiz/0.9.11

Proposed by Ritesh Khadgaray on 2013-08-19
Status: Merged
Approved by: Francis Ginther on 2013-08-29
Approved revision: 3783
Merged at revision: 3785
Proposed branch: lp:~khadgaray/compiz/lp1213809
Merge into: lp:compiz/0.9.11
Diff against target: 11 lines (+1/-0)
1 file modified
plugins/opengl/src/screen.cpp (+1/-0)
To merge this branch: bzr merge lp:~khadgaray/compiz/lp1213809
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-08-29
MC Return 2013-08-19 Approve on 2013-08-27
Review via email: mp+180787@code.launchpad.net

Commit message

OpenGL contexts are reference counted and only destroyed
once they are no longer current to any thread. To ensure
the context really is destroyed, lose current from it
before destroying it.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3783
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~khadgaray/compiz/lp1213809/+merge/180787/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/compiz-ci/287/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/100
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/100
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/100

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/287/rebuild

review: Needs Fixing (continuous-integration)
MC Return (mc-return) wrote :

LGTM and seems to work perfectly. Thanks !

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Francis Ginther (fginther) wrote :

Found jenkins issue, re-approving.

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/opengl/src/screen.cpp'
2--- plugins/opengl/src/screen.cpp 2013-05-15 10:47:42 +0000
3+++ plugins/opengl/src/screen.cpp 2013-08-19 06:47:31 +0000
4@@ -1238,6 +1238,7 @@
5 eglReleaseThread ();
6 #else
7
8+ glXMakeCurrent (screen->dpy (), None, NULL);
9 if (priv->ctx)
10 glXDestroyContext (screen->dpy (), priv->ctx);
11 #endif

Subscribers

People subscribed via source and target branches