← Back to branch summary

~compiz-team/compiz/compiz.fix_1077866

~compiz-team/compiz/compiz.fix_1077866

Viewing all changes in revision 3201.2.1.

Committer: Daniel van Vugt
Date: 2012-05-17 10:41:21 UTC
mto: (3201.9.2 compiz.gles2) (3248.5.23 ubuntu_quantal_trunk)
mto: This revision was merged to the branch mainline in revision 3320.
Revision ID: daniel.van.vugt@canonical.com-20120517104121-hllmipdy8p6f45l8

Import GLES2 branch: lp:~compiz-linaro-team/compiz-core/compiz-core.gles2

files added:
cmake/FindOpenGLES2.cmake

cmake/plugin_extensions/CompizOpenGLFixups.cmake

plugins/opengl/include/opengl/framebufferobject.h

plugins/opengl/include/opengl/program.h

plugins/opengl/include/opengl/programcache.h

plugins/opengl/include/opengl/shadercache.h

plugins/opengl/include/opengl/vertexbuffer.h

plugins/opengl/src/framebufferobject.cpp

plugins/opengl/src/privatevertexbuffer.h

plugins/opengl/src/program.cpp

plugins/opengl/src/programcache.cpp

plugins/opengl/src/shadercache.cpp

plugins/opengl/src/vertexbuffer.cpp

plugins/water/src/shaders.h

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/wrapsystem.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/include/cube/cube.h

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/include/opengl/vector.h

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/vector.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/water/src/water.cpp

plugins/water/src/water.h

plugins/water/water.xml.in

plugins/wobbly/src/wobbly.cpp

plugins/wobbly/src/wobbly.h

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/wrapsystem.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/include/cube/cube.h

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/framebufferobject.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/shadercache.h

plugins/opengl/include/opengl/texture.h

plugins/opengl/include/opengl/vector.h

plugins/opengl/include/opengl/vertexbuffer.h

plugins/opengl/src/fragment.cpp

plugins/opengl/src/framebufferobject.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/shadercache.cpp

plugins/opengl/src/texture.cpp

plugins/opengl/src/vector.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/water/src/shaders.h

plugins/water/src/water.cpp

plugins/water/src/water.h

plugins/water/water.xml.in

plugins/wobbly/src/wobbly.cpp

plugins/wobbly/src/wobbly.h

Older »