Compiz Core

Merge lp://qastaging/~sil2100/compiz-core/fglrx_final_fix into lp://qastaging/compiz-core/0.9.8

fglrx_final_fix
Merge into 0.9.8

Proposed by Łukasz Zemczak on 2012-04-20

Status:	Merged
Merged at revision:	3109
Proposed branch:	lp://qastaging/~sil2100/compiz-core/fglrx_final_fix
Merge into:	lp://qastaging/compiz-core/0.9.8
Diff against target:	109 lines (+18/-42) 2 files modified plugins/decor/src/decor.cpp (+18/-40) plugins/decor/src/decor.h (+0/-2)
To merge this branch:	bzr merge lp://qastaging/~sil2100/compiz-core/fglrx_final_fix
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Daniel van Vugt		Approve on 2012-04-23
Sam Spilsbury	2012-04-20	Approve on 2012-04-21
Review via email: mp+102824@code.qastaging.launchpad.net

Commit message

Reverting the introduction of bindTexture - we don't need it, since the fix is actually a ONE LINER! Thanks Sam!

Description of the change

Do I even have to say anything besides: THE fix for LP: #770283 ;) ?

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2012-04-20:

fyi that's the fix

87 }
88 }
89 - return;
90 }
91 }
92 }

One line wonders ftw.

review: Approve

lp://qastaging/~sil2100/compiz-core/fglrx_final_fix updated on 2012-04-20

3111. By Łukasz Zemczak on 2012-04-20: Leftover from the revert!

Revision history for this message

Łukasz Zemczak (sil2100) wrote on 2012-04-20:

I forgot one leftover line from the old bindTexture code, I pushed the modification just now. Now it should be ready for the merge ;) I'm running it right now, and it 'just seems to work'!

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2012-04-20:

Looking at code it isn't immediately obvious that the changes should be:

89 - return;

as opposed to:

89 - return;
xx + break;

Not sure how to test.

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2012-04-20:

yes break is probably better.

lp://qastaging/~sil2100/compiz-core/fglrx_final_fix updated on 2012-04-20