Merge lp://qastaging/~smspillaz/compiz/gles2.fix_1001171 into lp://qastaging/compiz/0.9.8
Proposed by
Sam Spilsbury
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~smspillaz/compiz/gles2.fix_1001171 |
| Merge into: | lp://qastaging/compiz/0.9.8 |
| Diff against target: |
15750 lines (+6875/-4608) 97 files modified
cmake/CMakeLists.txt (+2/-0) cmake/CompizCommon.cmake (+12/-0) cmake/CompizPlugin.cmake (+14/-10) cmake/FindOpenGLES2.cmake (+51/-0) cmake/base.cmake (+3/-0) cmake/plugin_extensions/CompizOpenGLFixups.cmake (+22/-0) include/core/wrapsystem.h (+8/-0) plugins/CMakeLists.txt (+29/-0) plugins/animation/CMakeLists.txt (+3/-5) plugins/animation/include/animation/animation.h (+1/-1) plugins/animation/include/animation/animeffect.h (+6/-6) plugins/animation/include/animation/grid.h (+0/-3) plugins/animation/include/animation/multi.h (+0/-6) plugins/animation/src/animation.cpp (+83/-54) plugins/animation/src/grid.cpp (+47/-86) plugins/animation/src/private.h (+2/-3) plugins/annotate/src/annotate.cpp (+151/-73) plugins/blur/CMakeLists.txt (+12/-12) plugins/clone/src/clone.cpp (+0/-5) plugins/compiztoolbox/src/compiztoolbox.cpp (+14/-28) plugins/copytex/src/copytex.cpp (+9/-0) plugins/cube/CMakeLists.txt (+1/-1) plugins/cube/include/cube/cube.h (+9/-6) plugins/cube/src/cube.cpp (+85/-80) plugins/decor/src/decor.cpp (+34/-22) plugins/decor/src/decor.h (+3/-3) plugins/expo/CMakeLists.txt (+1/-4) plugins/expo/src/expo.cpp (+290/-140) plugins/expo/src/expo.h (+20/-20) plugins/ezoom/src/ezoom.cpp (+126/-68) plugins/grid/src/grid.cpp (+141/-86) plugins/imgsvg/src/imgsvg.cpp (+12/-9) plugins/imgsvg/src/imgsvg.h (+2/-1) plugins/kdecompat/src/kdecompat.cpp (+7/-22) plugins/neg/src/neg.cpp (+36/-109) plugins/neg/src/neg.h (+4/-7) plugins/obs/src/obs.cpp (+9/-8) plugins/obs/src/obs.h (+1/-1) plugins/opengl/CMakeLists.txt (+9/-4) plugins/opengl/compiz-opengl.pc.in (+2/-2) plugins/opengl/include/opengl/fragment.h (+0/-125) plugins/opengl/include/opengl/framebufferobject.h (+107/-0) plugins/opengl/include/opengl/matrix.h (+2/-0) plugins/opengl/include/opengl/opengl.h (+264/-72) plugins/opengl/include/opengl/program.h (+75/-0) plugins/opengl/include/opengl/programcache.h (+51/-0) plugins/opengl/include/opengl/shadercache.h (+100/-0) plugins/opengl/include/opengl/texture.h (+5/-0) plugins/opengl/include/opengl/vector.h (+3/-3) plugins/opengl/include/opengl/vertexbuffer.h (+126/-0) plugins/opengl/src/fragment.cpp (+0/-1146) plugins/opengl/src/framebufferobject.cpp (+191/-0) plugins/opengl/src/matrix.cpp (+54/-0) plugins/opengl/src/paint.cpp (+411/-419) plugins/opengl/src/privatefragment.h (+0/-54) plugins/opengl/src/privates.h (+37/-11) plugins/opengl/src/privatetexture.h (+32/-0) plugins/opengl/src/privatevertexbuffer.h (+143/-0) plugins/opengl/src/program.cpp (+262/-0) plugins/opengl/src/programcache.cpp (+175/-0) plugins/opengl/src/screen.cpp (+560/-69) plugins/opengl/src/shadercache.cpp (+246/-0) plugins/opengl/src/texture.cpp (+136/-11) plugins/opengl/src/vector.cpp (+4/-4) plugins/opengl/src/vertexbuffer.cpp (+594/-0) plugins/opengl/src/window.cpp (+70/-84) plugins/resize/src/resize.cpp (+95/-39) plugins/resizeinfo/src/resizeinfo.cpp (+47/-29) plugins/resizeinfo/src/resizeinfo.h (+3/-2) plugins/ring/src/ring.cpp (+32/-51) plugins/ring/src/ring.h (+1/-1) plugins/rotate/CMakeLists.txt (+1/-1) plugins/scale/src/scale.cpp (+12/-24) plugins/scaleaddon/src/scaleaddon.cpp (+52/-22) plugins/scaleaddon/src/scaleaddon.h (+2/-2) plugins/scalefilter/src/scalefilter.cpp (+1/-6) plugins/screenshot/src/screenshot.cpp (+52/-25) plugins/shift/src/shift.cpp (+125/-131) plugins/shift/src/shift.h (+1/-1) plugins/staticswitcher/src/staticswitcher.cpp (+164/-80) plugins/staticswitcher/src/staticswitcher.h (+11/-9) plugins/switcher/src/switcher.cpp (+49/-48) plugins/text/include/text/text.h (+4/-3) plugins/text/src/text.cpp (+56/-27) plugins/thumbnail/src/thumbnail.cpp (+305/-122) plugins/thumbnail/src/thumbnail.h (+8/-6) plugins/wall/src/wall.cpp (+63/-47) plugins/wall/src/wall.h (+1/-1) plugins/water/CMakeLists.txt (+1/-1) plugins/water/src/shaders.h (+200/-0) plugins/water/src/water.cpp (+265/-803) plugins/water/src/water.h (+37/-67) plugins/water/water.xml.in (+26/-2) plugins/wobbly/src/wobbly.cpp (+334/-169) plugins/wobbly/src/wobbly.h (+0/-1) plugins/workarounds/src/workarounds.cpp (+14/-5) plugins/workarounds/src/workarounds.h (+4/-0) |
| To merge this branch: | bzr merge lp://qastaging/~smspillaz/compiz/gles2.fix_1001171 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Compiz Maintainers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2012-05-26.
Description of the change
Fixes LP#1101171 ... at least for me.
1) Scale up the view matrix by 2 on each axis so that it matches the projection matrix when setting clip planes
2) Set the transformed bit on windows sliding on wall.
I am almost certain that #1 is the wrong approach here ... although I couldn't find anything else in the code that wasn't a value that it was supposed to be. Perhaps the projection matrix is setup differently?
#2 also shouldn't be necessary ... but is harmless and makes sense (moving windows ... different clip regions etc)
To post a comment you must log in.
Unmerged revisions
- 3229. By Sam Spilsbury
-
Scale the plane clipping up to the projection matrix space and always
set the transformed bit on moving windows in wall
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
