lp:~amaranth/compiz-core/gles

Branch merges

Propose for merging

No branches dependent on this one.

Superseded for merging into lp:compiz-core/0.9.5

Sam Spilsbury: Pending requested 2011-08-10

Diff: 6779 lines (+2760/-2251)

50 files modified

CMakeLists.txt (+13/-0)
cmake/CMakeLists.txt (+2/-0)
cmake/CompizCommon.cmake (+12/-0)
cmake/CompizPlugin.cmake (+14/-10)
cmake/FindOpenGLES2.cmake (+51/-0)
cmake/base.cmake (+3/-1)
cmake/plugin_extensions/CompizOpenGLFixups.cmake (+22/-0)
include/core/rect.h (+2/-0)
plugins/annotate/src/annotate.cpp (+133/-77)
plugins/clone/src/clone.cpp (+0/-5)
plugins/compiztoolbox/src/compiztoolbox.cpp (+14/-28)
plugins/copytex/src/copytex.cpp (+9/-0)
plugins/cube/src/cube.cpp (+0/-4)
plugins/decor/src/decor.cpp (+17/-15)
plugins/decor/src/decor.h (+1/-1)
plugins/imgsvg/src/imgsvg.cpp (+12/-9)
plugins/imgsvg/src/imgsvg.h (+2/-1)
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/-124)
plugins/opengl/include/opengl/matrix.h (+2/-0)
plugins/opengl/include/opengl/opengl.h (+126/-65)
plugins/opengl/include/opengl/program.h (+68/-0)
plugins/opengl/include/opengl/programcache.h (+51/-0)
plugins/opengl/include/opengl/texture.h (+4/-0)
plugins/opengl/include/opengl/vertexbuffer.h (+83/-0)
plugins/opengl/opengl.xml.in (+1/-1)
plugins/opengl/src/fragment.cpp (+0/-1145)
plugins/opengl/src/matrix.cpp (+54/-0)
plugins/opengl/src/paint.cpp (+291/-418)
plugins/opengl/src/privatefragment.h (+0/-54)
plugins/opengl/src/privates.h (+22/-10)
plugins/opengl/src/privatetexture.h (+32/-0)
plugins/opengl/src/privatevertexbuffer.h (+71/-0)
plugins/opengl/src/program.cpp (+225/-0)
plugins/opengl/src/programcache.cpp (+175/-0)
plugins/opengl/src/screen.cpp (+316/-27)
plugins/opengl/src/shaders.h (+130/-0)
plugins/opengl/src/texture.cpp (+126/-3)
plugins/opengl/src/vertexbuffer.cpp (+414/-0)
plugins/opengl/src/window.cpp (+29/-84)
plugins/resize/src/resize.cpp (+56/-37)
plugins/scale/src/scale.cpp (+12/-24)
plugins/screenshot/src/screenshot.cpp (+50/-25)
plugins/switcher/src/switcher.cpp (+41/-48)
plugins/zoom/src/zoom.cpp (+41/-19)
src/event.cpp (+11/-0)
src/plugin.cpp (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2782. By Travis Watkins on 2011-08-10

merge in gles git branch

2781. By Ville Syrjala <email address hidden> on 2011-08-01

[PATCH] Don't unredirect overlay windows until we have set the new
bounding shape for the output window.

Unredirecting them before this time meant that they were stacked
underneath the overlay window and changing the bounding shape of
the output window would cause an expose event to be sent to
the overlay window causing a breif flicker as it redraws.

Unredirecting after this means that no expose event is sent because
the backing store is only set again after the bounding shape of the
output window has been changed

2780. By Sam Spilsbury on 2011-07-29

Merge trunk

2779. By Sam Spilsbury on 2011-07-29

Merge in doc for decor

2778. By Andrea Azzarone on 2011-07-27

Merge in lp:~andyrock/compiz-core/fix-1309

2777. By Sam Spilsbury on 2011-07-27

Merge

2776. By Sam Spilsbury on 2011-07-26

Merge in gsettings schema generation

2775. By soreau on 2011-07-14

Merge in default value change for obs

2774. By Sam Spilsbury on 2011-07-13

Fix typo, also add files that are being copied into staging

2773. By Sam Spilsbury on 2011-07-13

Bump VERSION