Merge lp:~azzar1/compiz/fix-blank-window into lp:compiz/0.9.12

Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 3927
Merged at revision: 3930
Proposed branch: lp:~azzar1/compiz/fix-blank-window
Merge into: lp:compiz/0.9.12
Diff against target: 34 lines (+1/-6)
2 files modified
plugins/animation/include/animation/animeffect.h (+0/-2)
plugins/animation/src/animation.cpp (+1/-4)
To merge this branch: bzr merge lp:~azzar1/compiz/fix-blank-window
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+251392@code.launchpad.net

Commit message

Do not cache textures in animation.cpp.

Description of the change

Caching textures in animation.cpp causes blank-window issue on nvidia systems. For what I understand we don't need to do that anymore. Probably is a leftover of the c++ port. Everything work just fine here even without caching textures.

Thanks to Arthur Huillet for the help.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Cool... Nice catch.

This was indeed an unneeded leftover.
Tested here (intel/radeon) works fine.

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

Nice work :D. Its curious that creating a copy of a TFP-d texture might cause corruption on the driver side. Perhaps this is something that should be reported to nvidia too?

Revision history for this message
Stephen M. Webb (bregma) wrote :

nVidia are definitely already aware of the problem.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/animation/include/animation/animeffect.h'
2--- plugins/animation/include/animation/animeffect.h 2012-09-04 06:54:16 +0000
3+++ plugins/animation/include/animation/animeffect.h 2015-03-01 22:10:44 +0000
4@@ -100,8 +100,6 @@
5 int mDecorTopHeight;
6 int mDecorBottomHeight;
7
8- GLTexture::List *texturesCache;
9-
10 CompOption::Value &optVal (unsigned int optionId);
11
12 inline bool optValB (unsigned int optionId) { return optVal (optionId).b (); }
13
14=== modified file 'plugins/animation/src/animation.cpp'
15--- plugins/animation/src/animation.cpp 2014-10-30 19:03:07 +0000
16+++ plugins/animation/src/animation.cpp 2015-03-01 22:10:44 +0000
17@@ -479,16 +479,13 @@
18 mDecorBottomHeight = w->output ().bottom;
19 }
20
21- texturesCache = new GLTexture::List (GLWindow::get (w)->textures ());
22 PrivateAnimScreen *as = mAWindow->priv->paScreen ();
23
24 mTimestep = as->optionGetTimeStep ();
25 }
26
27 Animation::~Animation ()
28-{
29- delete texturesCache;
30-}
31+{}
32
33 CompOption::Value &
34 Animation::optVal (unsigned int optionId)

Subscribers

People subscribed via source and target branches