← Back to branch summary

~mc-return/compiz/compiz0.9.9.merge-plugin-startup

~mc-return/compiz/compiz0.9.9.merge-plugin-startup

« back to all changes in this revision

Viewing changes to plugins/opengl/src/privates.h

Committer: MC Return
Date: 2013-02-27 11:48:55 UTC
mfrom: (3286.2.341 0.9.9)
mto: (3286.2.342 0.9.9)
mto: This revision was merged to the branch mainline in revision 3299.
Revision ID: mc.return@gmx.net-20130227114855-lkw92ke5ag2i57aj

Merged latest lp:compiz

files added:
include/core/configurerequestbuffer.h

src/asyncserverwindow.h

src/configurerequestbuffer-impl.h

src/configurerequestbuffer.cpp

src/serverwindow.h

src/syncserverwindow.h

src/tests/test_configurerequestbuffer.cpp

tests/system/xorg-gtest/tests/compiz_xorg_gtest_configure_window.cpp

tests/xorg-gtest/communicator

tests/xorg-gtest/communicator/CMakeLists.txt

tests/xorg-gtest/communicator/compiz_xorg_gtest_communicator.cpp

tests/xorg-gtest/communicator/compiz_xorg_gtest_communicator.h

tests/xorg-gtest/plugins

tests/xorg-gtest/plugins/CMakeLists.txt

tests/xorg-gtest/plugins/testhelper

tests/xorg-gtest/plugins/testhelper/CMakeLists.txt

tests/xorg-gtest/plugins/testhelper/src

tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp

tests/xorg-gtest/plugins/testhelper/src/testhelper.h

tests/xorg-gtest/plugins/testhelper/testhelper.xml.in

files removed:
tests/xorg-gtest/src/CMakeLists.txt

files modified:
CMakeLists.txt

cmake/CompizGSettings.cmake

cmake/CompizPlugin.cmake

cmake/plugin_extensions/CompizGenGSettings.cmake

cmake/plugin_extensions/CompizGenGconf.cmake

cmake/plugin_extensions/CompizGenInstallData.cmake

cmake/plugin_extensions/CompizGenInstallImages.cmake

debian/changelog

include/core/CMakeLists.txt

include/core/window.h

plugins/CMakeLists.txt

plugins/addhelper/src/addhelper.cpp

plugins/composite/src/window.cpp

plugins/decor/src/decor.cpp

plugins/firepaint/src/firepaint.cpp

plugins/firepaint/src/firepaint.h

plugins/inotify/src/inotify.cpp

plugins/move/move.xml.in

plugins/move/src/move.cpp

plugins/move/src/move.h

plugins/opengl/src/paint.cpp

plugins/opengl/src/privates.h

plugins/opengl/src/window.cpp

plugins/showmouse/src/showmouse.cpp

plugins/showmouse/src/showmouse.h

src/CMakeLists.txt

src/event.cpp

src/plugin.cpp

src/plugin/tests/CMakeLists.txt

src/plugin/tests/test-plugin.cpp

src/privatescreen.h

src/privatewindow.h

src/tests/CMakeLists.txt

src/window.cpp

tests/acceptance-tests/xorg-gtest/tests/compiz_acceptance_replace_current_wm.cpp

tests/system/xorg-gtest/tests/CMakeLists.txt

tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp

tests/system/xorg-gtest/tests/compiz_xorg_gtest_icccm.cpp

tests/xorg-gtest/CMakeLists.txt

tests/xorg-gtest/include/compiz-xorg-gtest.h

tests/xorg-gtest/src/compiz-xorg-gtest-config.h.in

tests/xorg-gtest/src/compiz-xorg-gtest.cpp

tests/xorg-gtest/src/xorg_gtest_wrapper.cpp

Show diffs side-by-side

added added

removed removed

plugins/opengl/src/privates.h

33

33

#include <composite/composite.h>

34

34

#include <opengl/opengl.h>

35

35

#include <core/atoms.h>

36

#include <core/configurerequestbuffer.h>

36

37

37

38

#ifdef USE_GLES

38

39

#include <opengl/framebufferobject.h>

283

284

GLVertexBuffer::AutoProgram *autoProgram;

284

285

285

286

std::list<GLIcon> icons;

287

288

compiz::window::configure_buffers::Releasable::Ptr configureLock;

286

289

};

287

290

288

291

#endif

Older »