← Back to branch summary

~vanvugt/mir/radial.zoom

~vanvugt/mir/radial.zoom

Viewing all changes in revision 1544.

Committer: Daniel van Vugt
Date: 2014-04-24 06:04:25 UTC
mfrom: (1493.19.48 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20140424060425-3p43iwe1s8l1ocep

Merge latest development-branch

files added:
include/platform/mir/graphics/gl_program_factory.h

include/test/mir_test_doubles/stub_input_targets.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/mir_client_host_connection.h

src/server/graphics/program_factory.cpp

src/server/graphics/program_factory.h

tests/unit-tests/graphics/test_program_factory.cpp

files removed:
src/server/graphics/nested/host_connection.cpp

src/server/graphics/nested/mir_api_wrappers.h

files renamed:
include/server/mir/compositor/gl_program.h => include/server/mir/graphics/gl_program.h

src/server/compositor/gl_program.cpp => src/server/graphics/gl_program.cpp

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

examples/demo-shell/demo_renderer.h

examples/demo-shell/demo_shell.cpp

include/server/mir/compositor/gl_renderer.h

include/server/mir/default_server_configuration.h

include/server/mir/input/input_targets.h

include/server/mir/input/surface.h

include/test/mir_test_doubles/mock_input_surface.h

src/server/compositor/CMakeLists.txt

src/server/compositor/default_configuration.cpp

src/server/compositor/gl_renderer.cpp

src/server/compositor/gl_renderer_factory.cpp

src/server/compositor/gl_renderer_factory.h

src/server/graphics/CMakeLists.txt

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/CMakeLists.txt

src/server/graphics/nested/host_connection.h

src/server/graphics/nested/nested_display.cpp

src/server/graphics/nested/nested_display.h

src/server/graphics/nested/nested_display_configuration.cpp

src/server/graphics/nested/nested_display_configuration.h

src/server/graphics/nested/nested_output.cpp

src/server/graphics/nested/nested_output.h

src/server/graphics/nested/nested_platform.cpp

src/server/input/android/android_input_target_enumerator.cpp

src/server/scene/surface_stack.cpp

src/server/scene/surface_stack.h

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/input/test_nested_input.cpp

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/graphics/CMakeLists.txt

tests/unit-tests/graphics/nested/test_nested_display_configuration.cpp

tests/unit-tests/input/android/test_android_input_registrar.cpp

tests/unit-tests/input/android/test_android_input_target_enumerator.cpp

Show diffs side-by-side

added added

removed removed

examples/demo-shell/demo_renderer.cpp

examples/demo-shell/demo_renderer.h

examples/demo-shell/demo_shell.cpp

include/platform/mir/graphics/gl_program_factory.h

include/server/mir/compositor/gl_renderer.h

include/server/mir/default_server_configuration.h

include/server/mir/graphics/gl_program.h

include/server/mir/input/input_targets.h

include/server/mir/input/surface.h

include/test/mir_test_doubles/mock_input_surface.h

include/test/mir_test_doubles/stub_input_targets.h

src/server/compositor/CMakeLists.txt

src/server/compositor/default_configuration.cpp

src/server/compositor/gl_renderer.cpp

src/server/compositor/gl_renderer_factory.cpp

src/server/compositor/gl_renderer_factory.h

src/server/graphics/CMakeLists.txt

src/server/graphics/default_configuration.cpp

src/server/graphics/gl_program.cpp

src/server/graphics/nested/CMakeLists.txt

src/server/graphics/nested/host_connection.cpp

src/server/graphics/nested/host_connection.h

src/server/graphics/nested/mir_api_wrappers.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/mir_client_host_connection.h

src/server/graphics/nested/nested_display.cpp

src/server/graphics/nested/nested_display.h

src/server/graphics/nested/nested_display_configuration.cpp

src/server/graphics/nested/nested_display_configuration.h

src/server/graphics/nested/nested_output.cpp

src/server/graphics/nested/nested_output.h

src/server/graphics/nested/nested_platform.cpp

src/server/graphics/program_factory.cpp

src/server/graphics/program_factory.h

src/server/input/android/android_input_target_enumerator.cpp

src/server/scene/surface_stack.cpp

src/server/scene/surface_stack.h

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/input/test_nested_input.cpp

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/graphics/CMakeLists.txt

tests/unit-tests/graphics/nested/test_nested_display_configuration.cpp

tests/unit-tests/graphics/test_program_factory.cpp

tests/unit-tests/input/android/test_android_input_registrar.cpp

tests/unit-tests/input/android/test_android_input_target_enumerator.cpp

Older »