← Back to branch summary

~vanvugt/mir/compositor-test

~vanvugt/mir/compositor-test

« back to all changes in this revision

Viewing changes to src/server/compositor/rendering_operator.h

Committer: Daniel van Vugt
Date: 2014-03-06 06:05:17 UTC
mfrom: (1454 development-branch)
mto: This revision was merged to the branch mainline in revision 1463.
Revision ID: daniel.van.vugt@canonical.com-20140306060517-yhff25duwlo5otn1

Merge latest development-branch

files added:
examples/demo-shell/demo_renderer.cpp

examples/demo-shell/demo_renderer.h

files renamed:
src/server/compositor/gl_renderer.h => include/server/mir/compositor/gl_renderer.h

src/server/compositor/renderer.h => include/server/mir/compositor/renderer.h

src/server/compositor/renderer_factory.h => include/server/mir/compositor/renderer_factory.h

files modified:
examples/demo-shell/CMakeLists.txt

examples/demo-shell/demo_shell.cpp

include/test/mir_test_doubles/mock_renderer.h

include/test/mir_test_doubles/stub_renderer.h

src/server/compositor/default_display_buffer_compositor_factory.cpp

src/server/compositor/gl_renderer.cpp

src/server/compositor/gl_renderer_factory.cpp

src/server/compositor/gl_renderer_factory.h

src/server/compositor/rendering_operator.h

tests/acceptance-tests/test_server_shutdown.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/scene/test_surface_stack.cpp

Show diffs side-by-side

added added

removed removed

src/server/compositor/rendering_operator.h

18

18

#ifndef MIR_COMPOSITOR_RENDERING_OPERATOR_H_

19

19

#define MIR_COMPOSITOR_RENDERING_OPERATOR_H_

20

20

21

#include "renderer.h"

21

#include "mir/compositor/renderer.h"

22

22

#include "mir/compositor/scene.h"

23

23

24

24

#include <functional>

Older »