← Back to branch summary

~mir-team/mir/trusty

~mir-team/mir/trusty

Viewing all changes in revision 1179.

Committer: CI bot
Author(s): Daniel van Vugt, Kevin Gunn
Date: 2014-03-17 15:11:49 UTC
mfrom: (1178.1.4 trunk-0.1.7)
Revision ID: ps-jenkins@lists.canonical.com-20140317151149-m7qp32hoknn8l3sb

Merge latest upstream release 0.1.7 (development-branch r1473)

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

examples/demo-shell/demo_renderer.h

include/test/mir_test_doubles/mock_render_function.h

include/test/mir_test_doubles/mock_render_function.h.moved

include/test/mir_test_doubles/mock_scene.h

include/test/mir_test_doubles/mock_swapping_gl_context.h

include/test/mir_test_doubles/stub_swapping_gl_context.h

src/platform/graphics/android/real_hwc_wrapper.cpp

src/platform/graphics/android/real_hwc_wrapper.h

tests/integration-tests/input/test_nested_input.cpp

tests/unit-tests/graphics/android/test_hwc_wrapper.cpp

files removed:
include/server/mir/compositor/compositing_criteria.h

include/test/mir_test_doubles/mock_compositing_criteria.h

files renamed:
debian/libmirserver16.install => debian/libmirserver17.install

src/platform/graphics/mesa/overlapping_output_grouping.h => include/platform/mir/graphics/overlapping_output_grouping.h

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

include/test/mir_test/draw/ => include/shared/testdraw/

include/test/mir_test_doubles/stub_compositing_criteria.h => include/test/mir_test_doubles/fake_renderable.h

src/platform/graphics/mesa/overlapping_output_grouping.cpp => src/platform/graphics/overlapping_output_grouping.cpp

tests/draw/ => src/shared/testdraw/

files modified:
3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp

CMakeLists.txt

debian/changelog

debian/control

debian/rules

examples/CMakeLists.txt

examples/demo-shell/CMakeLists.txt

examples/demo-shell/demo_shell.cpp

examples/demo-shell/window_manager.cpp

examples/eglplasma.c

examples/image_renderer.cpp

examples/pixel_format_selector.cpp

examples/render_overlays.cpp

examples/render_surfaces.cpp

examples/scroll.cpp

examples/server_configuration.cpp

include/platform/mir/graphics/display_configuration.h

include/platform/mir/graphics/renderable.h

include/platform/mir/options/configuration.h

include/server/mir/compositor/buffer_stream.h

include/server/mir/compositor/display_buffer_compositor.h

include/server/mir/compositor/scene.h

include/server/mir/frontend/screencast.h

include/server/mir/shell/session.h

include/shared/mir_toolkit/client_types.h

include/shared/testdraw/draw_pattern_checkered-inl.h

include/shared/testdraw/graphics_region_factory.h

include/shared/testdraw/patterns.h

include/test/mir_test_doubles/mock_android_native_buffer.h

include/test/mir_test_doubles/mock_buffer_bundle.h

include/test/mir_test_doubles/mock_buffer_stream.h

include/test/mir_test_doubles/mock_display_device.h

include/test/mir_test_doubles/mock_gl.h

include/test/mir_test_doubles/mock_renderable.h

include/test/mir_test_doubles/mock_renderer.h

include/test/mir_test_doubles/mock_screencast.h

include/test/mir_test_doubles/null_display_configuration.h

include/test/mir_test_doubles/null_screencast.h

include/test/mir_test_doubles/stub_buffer.h

include/test/mir_test_doubles/stub_buffer_stream.h

include/test/mir_test_doubles/stub_display_configuration.h

include/test/mir_test_doubles/stub_display_device.h

include/test/mir_test_doubles/stub_renderable.h

include/test/mir_test_doubles/stub_renderer.h

src/client/CMakeLists.txt

src/client/android/CMakeLists.txt

src/client/mesa/CMakeLists.txt

src/client/mir_screencast.cpp

src/client/mir_screencast.h

src/client/mir_screencast_api.cpp

src/client/mir_surface.h

src/platform/graphics/CMakeLists.txt

src/platform/graphics/android/CMakeLists.txt

src/platform/graphics/android/android_display.cpp

src/platform/graphics/android/android_display_configuration.cpp

src/platform/graphics/android/android_display_configuration.h

src/platform/graphics/android/display_buffer.cpp

src/platform/graphics/android/display_buffer.h

src/platform/graphics/android/display_device.h

src/platform/graphics/android/fb_device.cpp

src/platform/graphics/android/fb_device.h

src/platform/graphics/android/gl_context.cpp

src/platform/graphics/android/gl_context.h

src/platform/graphics/android/hwc_device.cpp

src/platform/graphics/android/hwc_device.h

src/platform/graphics/android/hwc_fb_device.cpp

src/platform/graphics/android/hwc_fb_device.h

src/platform/graphics/android/hwc_layerlist.cpp

src/platform/graphics/android/hwc_layerlist.h

src/platform/graphics/android/hwc_layers.cpp

src/platform/graphics/android/hwc_layers.h

src/platform/graphics/android/resource_factory.cpp

src/platform/graphics/display_configuration.cpp

src/platform/graphics/mesa/CMakeLists.txt

src/platform/graphics/mesa/cursor.cpp

src/platform/graphics/mesa/cursor.h

src/platform/graphics/mesa/display.cpp

src/platform/graphics/mesa/linux_virtual_terminal.cpp

src/platform/graphics/mesa/linux_virtual_terminal.h

src/platform/graphics/mesa/native_platform.cpp

src/platform/graphics/mesa/native_platform.h

src/platform/graphics/mesa/platform.cpp

src/platform/graphics/mesa/real_kms_display_configuration.cpp

src/platform/graphics/mesa/real_kms_display_configuration.h

src/platform/options/default_configuration.cpp

src/server/CMakeLists.txt

src/server/compositor/buffer_bundle.h

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/buffer_stream_surfaces.h

src/server/compositor/bypass.cpp

src/server/compositor/bypass.h

src/server/compositor/compositing_screencast.cpp

src/server/compositor/compositing_screencast.h

src/server/compositor/default_configuration.cpp

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/default_display_buffer_compositor.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/multi_threaded_compositor.cpp

src/server/compositor/multi_threaded_compositor.h

src/server/compositor/occlusion.cpp

src/server/compositor/occlusion.h

src/server/compositor/rendering_operator.cpp

src/server/compositor/rendering_operator.h

src/server/compositor/screencast_display_buffer.cpp

src/server/compositor/switching_bundle.cpp

src/server/compositor/switching_bundle.h

src/server/frontend/session_mediator.cpp

src/server/graphics/default_configuration.cpp

src/server/graphics/default_display_configuration_policy.cpp

src/server/graphics/nested/nested_display.cpp

src/server/graphics/nested/nested_display_configuration.cpp

src/server/graphics/nested/nested_display_configuration.h

src/server/graphics/offscreen/display.cpp

src/server/graphics/offscreen/display_configuration.cpp

src/server/graphics/offscreen/display_configuration.h

src/server/input/default_configuration.cpp

src/server/input/nested_input_relay.cpp

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/mediating_display_changer.cpp

src/server/scene/surface_stack.cpp

src/shared/CMakeLists.txt

src/shared/protobuf/mir_protobuf.proto

src/shared/testdraw/CMakeLists.txt

src/shared/testdraw/android_graphics_region_factory.cpp

src/shared/testdraw/mesa_graphics_region_factory.cpp

src/shared/testdraw/patterns.cpp

src/utils/screencast.cpp

tests/CMakeLists.txt

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_screencast.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/client/test_screencast.cpp

tests/integration-tests/graphics/android/test_buffer_integration.cpp

tests/integration-tests/input/CMakeLists.txt

tests/integration-tests/test_session.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir_test/display_config_matchers.cpp

tests/mir_test_doubles/mock_gl.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/unit-tests/client/test_mir_screencast.cpp

tests/unit-tests/compositor/test_bypass.cpp

tests/unit-tests/compositor/test_compositing_screencast.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/compositor/test_occlusion.cpp

tests/unit-tests/compositor/test_rendering_operator.cpp

tests/unit-tests/compositor/test_screencast_display_buffer.cpp

tests/unit-tests/draw/test_draw_patterns.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/android/CMakeLists.txt

tests/unit-tests/graphics/android/hwc_struct_helpers.h

tests/unit-tests/graphics/android/test_android_fb.cpp

tests/unit-tests/graphics/android/test_fb_device.cpp

tests/unit-tests/graphics/android/test_hwc_common_device.cpp

tests/unit-tests/graphics/android/test_hwc_device.cpp

tests/unit-tests/graphics/android/test_hwc_display.cpp

tests/unit-tests/graphics/android/test_hwc_fb_device.cpp

tests/unit-tests/graphics/android/test_hwc_layerlist.cpp

tests/unit-tests/graphics/android/test_hwc_layers.cpp

tests/unit-tests/graphics/mesa/test_cursor.cpp

tests/unit-tests/graphics/mesa/test_display_multi_monitor.cpp

tests/unit-tests/graphics/mesa/test_linux_virtual_terminal.cpp

tests/unit-tests/graphics/mesa/test_native_platform.cpp

tests/unit-tests/graphics/mesa/test_overlapping_output_grouping.cpp

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

tests/unit-tests/graphics/test_default_display_configuration_policy.cpp

tests/unit-tests/graphics/test_display.cpp

tests/unit-tests/graphics/test_display_configuration.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_stack.cpp

tests/unit-tests/test_udev_wrapper.cpp

tools/install_on_android.sh

Show diffs side-by-side

added added

removed removed

3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp

debian/changelog

debian/libmirserver17.install

examples/CMakeLists.txt

examples/demo-shell/CMakeLists.txt

examples/demo-shell/demo_renderer.cpp

examples/demo-shell/demo_renderer.h

examples/demo-shell/demo_shell.cpp

examples/demo-shell/window_manager.cpp

examples/eglplasma.c

examples/image_renderer.cpp

examples/pixel_format_selector.cpp

examples/render_overlays.cpp

examples/render_surfaces.cpp

examples/scroll.cpp

examples/server_configuration.cpp

include/platform/mir/graphics/display_configuration.h

include/platform/mir/graphics/overlapping_output_grouping.h

include/platform/mir/graphics/renderable.h

include/platform/mir/options/configuration.h

include/server/mir/compositor/buffer_stream.h

include/server/mir/compositor/compositing_criteria.h

include/server/mir/compositor/display_buffer_compositor.h

include/server/mir/compositor/gl_renderer.h

include/server/mir/compositor/renderer.h

include/server/mir/compositor/scene.h

include/server/mir/frontend/screencast.h

include/server/mir/shell/session.h

include/shared/mir_toolkit/client_types.h

include/shared/testdraw/draw_pattern_checkered-inl.h

include/shared/testdraw/graphics_region_factory.h

include/shared/testdraw/patterns.h

include/test/mir_test_doubles/fake_renderable.h

include/test/mir_test_doubles/mock_android_native_buffer.h

include/test/mir_test_doubles/mock_buffer_bundle.h

include/test/mir_test_doubles/mock_buffer_stream.h

include/test/mir_test_doubles/mock_compositing_criteria.h

include/test/mir_test_doubles/mock_display_device.h

include/test/mir_test_doubles/mock_gl.h

include/test/mir_test_doubles/mock_render_function.h

include/test/mir_test_doubles/mock_render_function.h.moved

include/test/mir_test_doubles/mock_renderable.h

include/test/mir_test_doubles/mock_renderer.h

include/test/mir_test_doubles/mock_scene.h

include/test/mir_test_doubles/mock_screencast.h

include/test/mir_test_doubles/mock_swapping_gl_context.h

include/test/mir_test_doubles/null_display_configuration.h

include/test/mir_test_doubles/null_screencast.h

include/test/mir_test_doubles/stub_buffer.h

include/test/mir_test_doubles/stub_buffer_stream.h

include/test/mir_test_doubles/stub_display_configuration.h

include/test/mir_test_doubles/stub_display_device.h

include/test/mir_test_doubles/stub_renderable.h

include/test/mir_test_doubles/stub_renderer.h

include/test/mir_test_doubles/stub_swapping_gl_context.h

src/client/CMakeLists.txt

src/client/android/CMakeLists.txt

src/client/mesa/CMakeLists.txt

src/client/mir_screencast.cpp

src/client/mir_screencast.h

src/client/mir_screencast_api.cpp

src/client/mir_surface.h

src/platform/graphics/CMakeLists.txt

src/platform/graphics/android/CMakeLists.txt

src/platform/graphics/android/android_display.cpp

src/platform/graphics/android/android_display_configuration.cpp

src/platform/graphics/android/android_display_configuration.h

src/platform/graphics/android/display_buffer.cpp

src/platform/graphics/android/display_buffer.h

src/platform/graphics/android/display_device.h

src/platform/graphics/android/fb_device.cpp

src/platform/graphics/android/fb_device.h

src/platform/graphics/android/gl_context.cpp

src/platform/graphics/android/gl_context.h

src/platform/graphics/android/hwc_device.cpp

src/platform/graphics/android/hwc_device.h

src/platform/graphics/android/hwc_fb_device.cpp

src/platform/graphics/android/hwc_fb_device.h

src/platform/graphics/android/hwc_layerlist.cpp

src/platform/graphics/android/hwc_layerlist.h

src/platform/graphics/android/hwc_layers.cpp

src/platform/graphics/android/hwc_layers.h

src/platform/graphics/android/real_hwc_wrapper.cpp

src/platform/graphics/android/real_hwc_wrapper.h

src/platform/graphics/android/resource_factory.cpp

src/platform/graphics/display_configuration.cpp

src/platform/graphics/mesa/CMakeLists.txt

src/platform/graphics/mesa/cursor.cpp

src/platform/graphics/mesa/cursor.h

src/platform/graphics/mesa/display.cpp

src/platform/graphics/mesa/linux_virtual_terminal.cpp

src/platform/graphics/mesa/linux_virtual_terminal.h

src/platform/graphics/mesa/native_platform.cpp

src/platform/graphics/mesa/native_platform.h

src/platform/graphics/mesa/platform.cpp

src/platform/graphics/mesa/real_kms_display_configuration.cpp

src/platform/graphics/mesa/real_kms_display_configuration.h

src/platform/graphics/overlapping_output_grouping.cpp

src/platform/options/default_configuration.cpp

src/server/CMakeLists.txt

src/server/compositor/buffer_bundle.h

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/buffer_stream_surfaces.h

src/server/compositor/bypass.cpp

src/server/compositor/bypass.h

src/server/compositor/compositing_screencast.cpp

src/server/compositor/compositing_screencast.h

src/server/compositor/default_configuration.cpp

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/default_display_buffer_compositor.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/multi_threaded_compositor.cpp

src/server/compositor/multi_threaded_compositor.h

src/server/compositor/occlusion.cpp

src/server/compositor/occlusion.h

src/server/compositor/rendering_operator.cpp

src/server/compositor/rendering_operator.h

src/server/compositor/screencast_display_buffer.cpp

src/server/compositor/switching_bundle.cpp

src/server/compositor/switching_bundle.h

src/server/frontend/session_mediator.cpp

src/server/graphics/default_configuration.cpp

src/server/graphics/default_display_configuration_policy.cpp

src/server/graphics/nested/nested_display.cpp

src/server/graphics/nested/nested_display_configuration.cpp

src/server/graphics/nested/nested_display_configuration.h

src/server/graphics/offscreen/display.cpp

src/server/graphics/offscreen/display_configuration.cpp

src/server/graphics/offscreen/display_configuration.h

src/server/input/default_configuration.cpp

src/server/input/nested_input_relay.cpp

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/mediating_display_changer.cpp

src/server/scene/surface_stack.cpp

src/shared/CMakeLists.txt

src/shared/protobuf/mir_protobuf.proto

src/shared/testdraw/CMakeLists.txt

src/shared/testdraw/android_graphics_region_factory.cpp

src/shared/testdraw/mesa_graphics_region_factory.cpp

src/shared/testdraw/patterns.cpp

src/utils/screencast.cpp

tests/CMakeLists.txt

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_screencast.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/client/test_screencast.cpp

tests/integration-tests/graphics/android/test_buffer_integration.cpp

tests/integration-tests/input/CMakeLists.txt

tests/integration-tests/input/test_nested_input.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/display_config_matchers.cpp

tests/mir_test_doubles/mock_gl.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/unit-tests/client/test_mir_screencast.cpp

tests/unit-tests/compositor/test_bypass.cpp

tests/unit-tests/compositor/test_compositing_screencast.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/compositor/test_occlusion.cpp

tests/unit-tests/compositor/test_rendering_operator.cpp

tests/unit-tests/compositor/test_screencast_display_buffer.cpp

tests/unit-tests/draw/test_draw_patterns.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/android/CMakeLists.txt

tests/unit-tests/graphics/android/hwc_struct_helpers.h

tests/unit-tests/graphics/android/test_android_fb.cpp

tests/unit-tests/graphics/android/test_fb_device.cpp

tests/unit-tests/graphics/android/test_hwc_common_device.cpp

tests/unit-tests/graphics/android/test_hwc_device.cpp

tests/unit-tests/graphics/android/test_hwc_display.cpp

tests/unit-tests/graphics/android/test_hwc_fb_device.cpp

tests/unit-tests/graphics/android/test_hwc_layerlist.cpp

tests/unit-tests/graphics/android/test_hwc_layers.cpp

tests/unit-tests/graphics/android/test_hwc_wrapper.cpp

tests/unit-tests/graphics/mesa/test_cursor.cpp

tests/unit-tests/graphics/mesa/test_display_multi_monitor.cpp

tests/unit-tests/graphics/mesa/test_linux_virtual_terminal.cpp

tests/unit-tests/graphics/mesa/test_native_platform.cpp

tests/unit-tests/graphics/mesa/test_overlapping_output_grouping.cpp

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

tests/unit-tests/graphics/test_default_display_configuration_policy.cpp

tests/unit-tests/graphics/test_display.cpp

tests/unit-tests/graphics/test_display_configuration.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_stack.cpp

tests/unit-tests/test_udev_wrapper.cpp

tools/install_on_android.sh

Older »