lp:compiz-core/gles

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:compiz-core/0.9.8

Daniel van Vugt: Needs Resubmitting on 2012-05-17

Diff: 13017 lines (+5133/-4363)

68 files modified

CMakeLists.txt (+3/-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)
gtk/config.h.gtk.in (+0/-25)
gtk/window-decorator/actionmenu.c (+0/-133)
gtk/window-decorator/blurprops.c (+0/-89)
gtk/window-decorator/forcequit.c (+0/-201)
gtk/window-decorator/gdk.c (+0/-106)
gtk/window-decorator/style.c (+0/-66)
gtk/window-decorator/util.c (+0/-299)
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/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/-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 (+123/-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 (+410/-419)
plugins/opengl/src/privatefragment.h (+0/-54)
plugins/opengl/src/privates.h (+36/-11)
plugins/opengl/src/privatetexture.h (+32/-0)
plugins/opengl/src/privatevertexbuffer.h (+141/-0)
plugins/opengl/src/program.cpp (+262/-0)
plugins/opengl/src/programcache.cpp (+175/-0)
plugins/opengl/src/screen.cpp (+548/-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 (+567/-0)
plugins/opengl/src/window.cpp (+69/-84)
plugins/resize/src/resize.cpp (+95/-39)
plugins/rotate/CMakeLists.txt (+1/-1)
plugins/scale/src/scale.cpp (+12/-24)
plugins/screenshot/src/screenshot.cpp (+52/-25)
plugins/switcher/src/switcher.cpp (+49/-48)
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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3150. By Daniel van Vugt on 2012-05-16

Fixed water lighting calculations (LP: #1000097)
 - Normals were inside-out as I predicted.
 - Slightly simplified the shader code.
 - Use all 3 dimensions of the lighting vector, not just 2.
 - Increased the offset scale (diffraction effect) to look like the old code.
 - Reversed lighting vector X component to look like the old code..
 - Set lighting vector Z component to zero to avoid lighting whole screen.

3149. By Daniel van Vugt on 2012-05-16

Fix annotate turning display completely black (LP: #1000093)

3148. By Daniel van Vugt on 2012-05-15

plugins/opengl/src/screen.cpp: Delete an outdated comment and deduplicate
another.

3147. By Daniel van Vugt on 2012-05-15

Rebase on lp:compiz-core r3137

3146. By Sam Spilsbury on 2012-05-14

Give AutoProgram a virtual destructor and move it into a namespace.

Nested classes and nonvirtual destructors on abstract classes are evil.

3145. By Sam Spilsbury on 2012-05-14

Start implementing eglSwapBuffers in the paint dispatch. Removed a useless functor check

3144. By Sam Spilsbury on 2012-05-14

Remove useless spew

3143. By Sam Spilsbury on 2012-05-14

GL_TEXTURE_COORD_ARRAY client state setting is not necessary because its done implicitly
when binding OpenGL buffer objects.

Disable output clipping, skybox and texture modulation on GLES2 for now

3142. By Sam Spilsbury on 2012-05-14

Clip planes aren't yet supported on GLES .. remove glNormal* usage

3141. By Sam Spilsbury on 2012-05-14

Port the bottom cap renderer to GLES.

Since both caps use the same vertex array with GL_TRIANGLE_FAN ... a rather unsatisfactory
workaround was added to GLVertexBuffer to control the behaviour of glDrawArrays ... worth looking
into removing