Unity

Merge lp:~nicolas-doffay/unity/blocker-fix into lp:unity/6.0

  1. blocker-fix
  2. Merge into 6.0
Proposed by Nicolas d'Offay
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 2754
Proposed branch: lp:~nicolas-doffay/unity/blocker-fix
Merge into: lp:unity/6.0
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/unityshell/src/unityshell.cpp (+1/-1)
To merge this branch: bzr merge lp:~nicolas-doffay/unity/blocker-fix
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+127497@code.launchpad.net

Commit message

Workaround a crash when using mesa's software rendering

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Ok

review: Approve
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Works for me.

review: Approve
Revision history for this message
Andrea Azzarone (azzar1) wrote :

Link to the bug?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/unityshell.cpp'
2--- plugins/unityshell/src/unityshell.cpp 2012-10-02 00:16:15 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2012-10-02 14:33:23 +0000
4@@ -3412,7 +3412,7 @@
5 : w_(width)
6 , h_(height)
7 , pixmap_(XCreatePixmap(screen->dpy(), screen->root(), w_, h_, 32))
8- , texture_(GLTexture::bindPixmapToTexture(pixmap_, w_, h_, 32))
9+ , texture_(GLTexture::bindPixmapToTexture(pixmap_, w_, h_, 32, compiz::opengl::ExternallyManaged)) //FIXME: This is a workaround, should create a new wrapper class which owns the texture and the cairo context.
10 , surface_(nullptr)
11 , cr_(nullptr)
12 {

Subscribers

People subscribed via source and target branches