← Back to branch summary

~compiz-team/compiz-core/compiz-core.gles2_support

~compiz-team/compiz-core/compiz-core.gles2_support

Viewing all changes in revision 2891.

Committer: Sam Spilsbury
Date: 2011-10-27 00:02:51 UTC
mfrom: (2884.2.2 compiz-core.gles)
Revision ID: sam.spilsbury@canonical.com-20111027000251-p4i2k9zgdbec53vk

Merge lp:~compiz-team/compiz-core/compiz-core.gles2_support

files added:
cmake/FindOpenGLES2.cmake

cmake/plugin_extensions/CompizOpenGLFixups.cmake

plugins/opengl/include/opengl/program.h

plugins/opengl/include/opengl/programcache.h

plugins/opengl/include/opengl/vertexbuffer.h

plugins/opengl/src/privatevertexbuffer.h

plugins/opengl/src/program.cpp

plugins/opengl/src/programcache.cpp

plugins/opengl/src/shaders.h

plugins/opengl/src/vertexbuffer.cpp

files removed:
plugins/opengl/include/opengl/fragment.h

plugins/opengl/src/fragment.cpp

plugins/opengl/src/privatefragment.h

files modified:
CMakeLists.txt

cmake/CMakeLists.txt

cmake/CompizCommon.cmake

cmake/CompizPlugin.cmake

cmake/base.cmake

include/core/rect.h

plugins/annotate/src/annotate.cpp

plugins/blur/CMakeLists.txt

plugins/clone/src/clone.cpp

plugins/compiztoolbox/src/compiztoolbox.cpp

plugins/copytex/src/copytex.cpp

plugins/cube/CMakeLists.txt

plugins/cube/src/cube.cpp

plugins/decor/src/decor.cpp

plugins/decor/src/decor.h

plugins/imgsvg/src/imgsvg.cpp

plugins/imgsvg/src/imgsvg.h

plugins/obs/src/obs.cpp

plugins/obs/src/obs.h

plugins/opengl/CMakeLists.txt

plugins/opengl/compiz-opengl.pc.in

plugins/opengl/include/opengl/matrix.h

plugins/opengl/include/opengl/opengl.h

plugins/opengl/include/opengl/texture.h

plugins/opengl/opengl.xml.in

plugins/opengl/src/matrix.cpp

plugins/opengl/src/paint.cpp

plugins/opengl/src/privates.h

plugins/opengl/src/privatetexture.h

plugins/opengl/src/screen.cpp

plugins/opengl/src/texture.cpp

plugins/opengl/src/window.cpp

plugins/resize/src/resize.cpp

plugins/rotate/CMakeLists.txt

plugins/scale/src/scale.cpp

plugins/screenshot/src/screenshot.cpp

plugins/switcher/src/switcher.cpp

plugins/water/CMakeLists.txt

plugins/wobbly/CMakeLists.txt

plugins/zoom/src/zoom.cpp

src/event.cpp

src/plugin.cpp

Show diffs side-by-side

added added

removed removed

cmake/CMakeLists.txt

cmake/CompizCommon.cmake

cmake/CompizPlugin.cmake

cmake/FindOpenGLES2.cmake

cmake/base.cmake

cmake/plugin_extensions/CompizOpenGLFixups.cmake

include/core/rect.h

plugins/annotate/src/annotate.cpp

plugins/blur/CMakeLists.txt

plugins/clone/src/clone.cpp

plugins/compiztoolbox/src/compiztoolbox.cpp

plugins/copytex/src/copytex.cpp

plugins/cube/CMakeLists.txt

plugins/cube/src/cube.cpp

plugins/decor/src/decor.cpp

plugins/decor/src/decor.h

plugins/imgsvg/src/imgsvg.cpp

plugins/imgsvg/src/imgsvg.h

plugins/obs/src/obs.cpp

plugins/obs/src/obs.h

plugins/opengl/CMakeLists.txt

plugins/opengl/compiz-opengl.pc.in

plugins/opengl/include/opengl/fragment.h

plugins/opengl/include/opengl/matrix.h

plugins/opengl/include/opengl/opengl.h

plugins/opengl/include/opengl/program.h

plugins/opengl/include/opengl/programcache.h

plugins/opengl/include/opengl/texture.h

plugins/opengl/include/opengl/vertexbuffer.h

plugins/opengl/opengl.xml.in

plugins/opengl/src/fragment.cpp

plugins/opengl/src/matrix.cpp

plugins/opengl/src/paint.cpp

plugins/opengl/src/privatefragment.h

plugins/opengl/src/privates.h

plugins/opengl/src/privatetexture.h

plugins/opengl/src/privatevertexbuffer.h

plugins/opengl/src/program.cpp

plugins/opengl/src/programcache.cpp

plugins/opengl/src/screen.cpp

plugins/opengl/src/shaders.h

plugins/opengl/src/texture.cpp

plugins/opengl/src/vertexbuffer.cpp

plugins/opengl/src/window.cpp

plugins/resize/src/resize.cpp

plugins/rotate/CMakeLists.txt

plugins/scale/src/scale.cpp

plugins/screenshot/src/screenshot.cpp

plugins/switcher/src/switcher.cpp

plugins/water/CMakeLists.txt

plugins/wobbly/CMakeLists.txt

plugins/zoom/src/zoom.cpp

Older »