lp:~smspillaz/compiz/compiz.revenge-of-the-blur-plugin

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz/0.9.12 at revision 4020

Marco Trevisan (Treviño): Approve on 2016-05-14

PS Jenkins bot (community): Approve (continuous-integration) on 2016-05-14

Diff: 3208 lines (+1260/-1141)

16 files modified

debian/compiz-plugins.install (+2/-0)
plugins/CMakeLists.txt (+0/-1)
plugins/blur/CMakeLists.txt (+12/-12)
plugins/blur/src/blur.cpp (+1086/-1077)
plugins/blur/src/blur.h (+59/-38)
plugins/opengl/DRIVERS (+10/-0)
plugins/opengl/include/opengl/opengl.h (+14/-2)
plugins/opengl/include/opengl/program.h (+1/-1)
plugins/opengl/include/opengl/vertexbuffer.h (+1/-0)
plugins/opengl/src/paint.cpp (+10/-0)
plugins/opengl/src/privates.h (+3/-0)
plugins/opengl/src/program.cpp (+2/-2)
plugins/opengl/src/screen.cpp (+44/-4)
plugins/opengl/src/shadercache.cpp (+5/-4)
plugins/opengl/src/vertexbuffer.cpp (+5/-0)
plugins/opengl/src/window.cpp (+6/-0)

api

Related source package recipes

1 recipe using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

4020. By Sam Spilsbury <email address hidden> on 2016-05-14

opengl: Don't invalidate the scratch buffer frame age every time it is queried

We only want to do this when we query the scratch buffer age and then
use it - as it is only on use when the age resets back to an invalidated
state.

Previously, the age would re-set every time it is queried, which would
cause it to appear invalidated the next time damageCutoff was reached.

4019. By Sam Spilsbury <email address hidden> on 2016-05-13

debian: Install the blur plugin as part of compiz-plugins

4018. By Sam Spilsbury <email address hidden> on 2016-05-13

opengl: Add note about broken glGenerateMipmap support in vmwgfx

4017. By Sam Spilsbury <email address hidden> on 2016-05-13

opengl: Work around broken glGenerateMipmap implementation on vmwgfx

glGenerateMipmap is unimplemented on vmwgfx so don't use it there.

4016. By Sam Spilsbury <email address hidden> on 2016-05-13

blur: Port the blur plugin to use Modern OpenGL and enable it

The whole plugin needed to be re-written to a large extent in order to
use GLSL-based shaders instead of the old ASM based ones, use the new
GLFramebufferObject API and also play nice with damage tracking.

There's still a lot of work to do as the code is very messy.

Notably, generating mipmaps of FBOs seems to be an edge case which is
broken on a lot of hardware.

4015. By Sam Spilsbury <email address hidden> on 2016-05-13

opengl: Added glTransformationComplete wrapable function

This function is called when glPaint is complete, but before
it either early-returns or calls glDraw. Effectively, it is useful
if a plugin needs to see the entire matrix transformation for some reason
such as needing to store the 2D region of a projected surface.

4014. By Sam Spilsbury <email address hidden> on 2016-05-13

shadercache: Don't sample every single texture

Sampling every single texture doesn't make any sense - we only draw
a single texture at a time for each window when vertexBuffer->render
is called - the other textures are typically added by plugins
(such as blur) to be sampled from at other points.

4013. By Sam Spilsbury <email address hidden> on 2016-05-12

opengl: Missing const

4012. By Sam Spilsbury <email address hidden> on 2016-05-12

opengl: Add countTextures () method to GLVertexBuffer
------------- This line and the following will be ignored --------------

modified:
  plugins/opengl/include/opengl/vertexbuffer.h
  plugins/opengl/src/vertexbuffer.cpp
unknown:
  .AUTHORS.sed
  compizconfig/ccsm/build/
  compizconfig/ccsm/ccsm.desktop
  compizconfig/ccsm/installed_files
  po/compiz.pot

4011. By Sam Spilsbury <email address hidden> on 2016-05-12

opengl: Make vertexShader and fragmentShader const &