lp:~mir-team/mir/trunk-0.1.4
Created by
Daniel van Vugt
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
- PS Jenkins bot (community): Approve (continuous-integration)
- Didier Roche-Tolomelli: Needs Fixing
- Daniel van Vugt: Approve
- Mir development team: Pending requested
-
Diff: 22872 lines (+9059/-5877)320 files modified.clang-format (+46/-0)
3rd_party/android-deps/cutils/native_handle.h (+0/-69)
3rd_party/android-deps/hardware/fb.h (+0/-167)
3rd_party/android-deps/hardware/gralloc.h (+0/-306)
3rd_party/android-deps/hardware/hardware.h (+0/-244)
3rd_party/android-deps/hardware/hwcomposer.h (+0/-592)
3rd_party/android-deps/hardware/hwcomposer_defs.h (+0/-205)
3rd_party/android-deps/hardware/hwcomposer_v0.h (+0/-272)
3rd_party/android-deps/pixelflinger/format.h (+0/-136)
3rd_party/android-deps/pixelflinger/pixelflinger.h (+0/-330)
3rd_party/android-deps/sync/sync.h (+0/-62)
3rd_party/android-deps/sys/limits.h (+0/-178)
3rd_party/android-deps/system/graphics.h (+0/-175)
3rd_party/android-deps/system/window.h (+0/-842)
3rd_party/android-input/android/frameworks/base/services/input/InputEventPrinter.h (+30/-0)
3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp (+8/-5)
3rd_party/android-input/android/frameworks/base/services/input/InputReader.h (+2/-0)
CMakeLists.txt (+4/-11)
benchmarks/CMakeLists.txt (+5/-1)
cmake/FindLibHardware.cmake (+6/-14)
cmake/LinuxCrossCompile.cmake (+3/-0)
cmake/MirCommon.cmake (+7/-4)
cross-compile-chroot.sh (+3/-0)
debian/changelog (+118/-0)
debian/control (+17/-6)
debian/libmirclient6.install (+1/-1)
debian/libmirserver14.install (+1/-1)
debian/mir-demos.install (+1/-1)
debian/mir-utils.install (+2/-0)
debian/rules (+1/-0)
doc/building_source_for_android.md (+21/-32)
doc/mainpage.md (+7/-0)
doc/using_mir_on_pc.md (+2/-2)
examples/CMakeLists.txt (+26/-0)
examples/basic.c (+3/-3)
examples/basic_server.cpp (+2/-36)
examples/basic_server_configuration.cpp (+60/-0)
examples/basic_server_configuration.h (+43/-0)
examples/demo-shell/window_manager.cpp (+52/-2)
examples/eglapp.c (+7/-0)
examples/flicker.c (+10/-3)
examples/multiwin.c (+25/-3)
examples/pixel_format_selector.cpp (+70/-0)
examples/pixel_format_selector.h (+51/-0)
examples/render_surfaces.cpp (+7/-8)
examples/scroll.cpp (+3/-3)
examples/server_configuration.cpp (+27/-11)
examples/translucent_server.cpp (+38/-0)
examples/translucent_server_configuration.cpp (+45/-0)
examples/translucent_server_configuration.h (+43/-0)
guides/cppguide.xml (+189/-183)
include/client/mir/client/private.h (+51/-0)
include/client/mir_toolkit/mir_screencast.h (+64/-0)
include/platform/mir/graphics/display_buffer.h (+25/-1)
include/platform/mir/graphics/display_configuration.h (+13/-3)
include/platform/mir/graphics/pixel_format_utils.h (+50/-0)
include/platform/mir/graphics/renderable.h (+48/-0)
include/platform/mir/options/option.h (+8/-1)
include/platform/mir/options/program_option.h (+6/-4)
include/platform/mir/udev/wrapper.h (+69/-69)
include/server/mir/compositor/compositor_report.h (+58/-0)
include/server/mir/default_configuration_options.h (+3/-1)
include/server/mir/default_server_configuration.h (+10/-8)
include/server/mir/frontend/fd_sets.h (+3/-0)
include/server/mir/frontend/message_processor.h (+10/-11)
include/server/mir/frontend/protobuf_message_sender.h (+52/-0)
include/server/mir/frontend/protobuf_session_creator.h (+13/-2)
include/server/mir/frontend/template_protobuf_message_processor.h (+91/-0)
include/server/mir/logging/message_processor_report.h (+3/-3)
include/server/mir/shell/surface.h (+2/-0)
include/server/mir/time/clock.h (+6/-6)
include/server/mir/time/high_resolution_clock.h (+2/-2)
include/shared/mir/logging/input_timestamp.h (+35/-0)
include/shared/mir_toolkit/client_types.h (+22/-1)
include/shared/mir_toolkit/common.h (+8/-0)
include/test/mir_test_doubles/mock_android_native_buffer.h (+2/-0)
include/test/mir_test_doubles/mock_client_surface.h (+2/-2)
include/test/mir_test_doubles/mock_compositor_report.h (+51/-0)
include/test/mir_test_doubles/mock_display_buffer.h (+11/-0)
include/test/mir_test_doubles/mock_display_device.h (+2/-1)
include/test/mir_test_doubles/mock_gl.h (+62/-36)
include/test/mir_test_doubles/mock_hwc_composer_device_1.h (+58/-17)
include/test/mir_test_doubles/mock_renderable.h (+41/-0)
include/test/mir_test_doubles/mock_surface_renderer.h (+3/-1)
include/test/mir_test_doubles/mock_udev_device.h (+47/-0)
include/test/mir_test_doubles/null_client_buffer.h (+54/-0)
include/test/mir_test_doubles/null_display_buffer.h (+4/-0)
include/test/mir_test_doubles/null_display_configuration.h (+7/-7)
include/test/mir_test_doubles/stub_display_configuration.h (+19/-6)
include/test/mir_test_doubles/stub_display_device.h (+4/-1)
include/test/mir_test_doubles/stub_ipc_factory.h (+2/-8)
include/test/mir_test_doubles/stub_renderable.h (+53/-0)
include/test/mir_test_framework/in_process_server.h (+2/-0)
include/test/mir_test_framework/testing_client_configuration.h (+1/-1)
include/test/mir_test_framework/using_stub_client_platform.h (+43/-0)
src/CMakeLists.txt (+1/-0)
src/client/CMakeLists.txt (+5/-2)
src/client/android/client_surface_interpreter.cpp (+1/-4)
src/client/api_impl.h (+27/-0)
src/client/api_impl_types.h (+32/-0)
src/client/client_buffer_depository.h (+2/-0)
src/client/client_platform.h (+2/-1)
src/client/connection_configuration.h (+3/-6)
src/client/default_connection_configuration.cpp (+1/-1)
src/client/default_connection_configuration.h (+2/-2)
src/client/display_configuration.cpp (+2/-1)
src/client/egl_native_window_factory.h (+49/-0)
src/client/logging/input_receiver_report.cpp (+3/-2)
src/client/mesa/client_buffer.cpp (+5/-0)
src/client/mesa/native_surface.cpp (+2/-7)
src/client/mir_client_library.cpp (+4/-6)
src/client/mir_client_surface.h (+6/-6)
src/client/mir_connection.cpp (+52/-46)
src/client/mir_connection.h (+12/-5)
src/client/mir_screencast.cpp (+224/-0)
src/client/mir_screencast.h (+93/-0)
src/client/mir_screencast_api.cpp (+93/-0)
src/client/mir_surface.cpp (+44/-35)
src/client/mir_surface.h (+7/-3)
src/client/private.cpp (+26/-0)
src/client/rpc/make_rpc_channel.h (+3/-2)
src/client/rpc/make_socket_rpc_channel.cpp (+1/-1)
src/client/rpc/mir_basic_rpc_channel.cpp (+16/-17)
src/client/rpc/mir_basic_rpc_channel.h (+1/-2)
src/client/rpc/mir_socket_rpc_channel.cpp (+3/-4)
src/client/rpc/mir_socket_rpc_channel.h (+1/-1)
src/platform/CMakeLists.txt (+16/-1)
src/platform/graphics/CMakeLists.txt (+3/-5)
src/platform/graphics/android/CMakeLists.txt (+4/-3)
src/platform/graphics/android/android_display.cpp (+13/-0)
src/platform/graphics/android/android_display_configuration.cpp (+12/-3)
src/platform/graphics/android/android_display_configuration.h (+6/-3)
src/platform/graphics/android/buffer.cpp (+19/-10)
src/platform/graphics/android/buffer.h (+3/-3)
src/platform/graphics/android/display_buffer.cpp (+55/-4)
src/platform/graphics/android/display_buffer.h (+11/-0)
src/platform/graphics/android/display_device.h (+5/-1)
src/platform/graphics/android/display_resource_factory.h (+2/-2)
src/platform/graphics/android/fb_device.cpp (+5/-1)
src/platform/graphics/android/fb_device.h (+2/-1)
src/platform/graphics/android/framebuffers.cpp (+15/-6)
src/platform/graphics/android/hwc_device.cpp (+14/-10)
src/platform/graphics/android/hwc_device.h (+8/-6)
src/platform/graphics/android/hwc_fb_device.cpp (+12/-6)
src/platform/graphics/android/hwc_fb_device.h (+7/-6)
src/platform/graphics/android/hwc_layerlist.cpp (+11/-64)
src/platform/graphics/android/hwc_layerlist.h (+1/-25)
src/platform/graphics/android/hwc_layers.cpp (+138/-0)
src/platform/graphics/android/hwc_layers.h (+87/-0)
src/platform/graphics/android/output_builder.cpp (+21/-14)
src/platform/graphics/android/resource_factory.cpp (+6/-6)
src/platform/graphics/android/resource_factory.h (+2/-2)
src/platform/graphics/display_configuration.cpp (+16/-0)
src/platform/graphics/mesa/CMakeLists.txt (+0/-2)
src/platform/graphics/mesa/cursor.cpp (+2/-0)
src/platform/graphics/mesa/display.cpp (+20/-5)
src/platform/graphics/mesa/display.h (+1/-1)
src/platform/graphics/mesa/display_buffer.cpp (+32/-2)
src/platform/graphics/mesa/display_buffer.h (+6/-0)
src/platform/graphics/mesa/display_helpers.cpp (+6/-6)
src/platform/graphics/mesa/display_helpers.h (+4/-4)
src/platform/graphics/mesa/overlapping_output_grouping.cpp (+9/-20)
src/platform/graphics/mesa/platform.cpp (+6/-2)
src/platform/graphics/mesa/platform.h (+1/-1)
src/platform/graphics/mesa/real_kms_display_configuration.cpp (+22/-5)
src/platform/graphics/mesa/real_kms_display_configuration.h (+5/-3)
src/platform/graphics/pixel_format_utils.cpp (+54/-0)
src/platform/udev_wrapper.cpp (+94/-80)
src/server/CMakeLists.txt (+2/-1)
src/server/compositor/CMakeLists.txt (+1/-0)
src/server/compositor/bypass.cpp (+5/-3)
src/server/compositor/default_configuration.cpp (+3/-2)
src/server/compositor/default_display_buffer_compositor.cpp (+20/-4)
src/server/compositor/default_display_buffer_compositor.h (+4/-1)
src/server/compositor/default_display_buffer_compositor_factory.cpp (+7/-3)
src/server/compositor/default_display_buffer_compositor_factory.h (+4/-1)
src/server/compositor/gl_renderer.cpp (+85/-47)
src/server/compositor/gl_renderer.h (+25/-18)
src/server/compositor/multi_threaded_compositor.cpp (+41/-5)
src/server/compositor/multi_threaded_compositor.h (+8/-1)
src/server/compositor/null_compositor_report.cpp (+45/-0)
src/server/compositor/renderer.h (+4/-1)
src/server/compositor/switching_bundle.cpp (+18/-2)
src/server/compositor/switching_bundle.h (+9/-1)
src/server/default_configuration_options.cpp (+35/-32)
src/server/default_server_configuration.cpp (+10/-9)
src/server/frontend/CMakeLists.txt (+1/-1)
src/server/frontend/default_configuration.cpp (+4/-13)
src/server/frontend/event_sender.cpp (+1/-1)
src/server/frontend/message_sender.h (+2/-4)
src/server/frontend/null_message_processor.cpp (+0/-26)
src/server/frontend/protobuf_buffer_packer.cpp (+2/-1)
src/server/frontend/protobuf_ipc_factory.h (+0/-1)
src/server/frontend/protobuf_message_processor.cpp (+78/-138)
src/server/frontend/protobuf_message_processor.h (+10/-51)
src/server/frontend/protobuf_responder.cpp (+49/-0)
src/server/frontend/protobuf_responder.h (+60/-0)
src/server/frontend/protobuf_session_creator.cpp (+24/-6)
src/server/frontend/published_socket_connector.cpp (+3/-2)
src/server/frontend/published_socket_connector.h (+1/-0)
src/server/frontend/session_mediator.cpp (+11/-2)
src/server/frontend/socket_messenger.cpp (+1/-1)
src/server/frontend/socket_session.cpp (+16/-4)
src/server/frontend/socket_session.h (+2/-3)
src/server/frontend/surface.cpp (+1/-1)
src/server/graphics/default_configuration.cpp (+7/-3)
src/server/graphics/default_display_configuration_policy.cpp (+60/-17)
src/server/graphics/nested/nested_display.cpp (+46/-62)
src/server/graphics/nested/nested_display.h (+6/-5)
src/server/graphics/nested/nested_display_configuration.cpp (+31/-8)
src/server/graphics/nested/nested_display_configuration.h (+6/-4)
src/server/graphics/nested/nested_output.cpp (+18/-2)
src/server/graphics/nested/nested_output.h (+7/-1)
src/server/graphics/nested/nested_platform.cpp (+2/-2)
src/server/graphics/nested/nested_platform.h (+5/-5)
src/server/graphics/offscreen/display.cpp (+1/-3)
src/server/graphics/offscreen/display_buffer.cpp (+15/-0)
src/server/graphics/offscreen/display_buffer.h (+5/-0)
src/server/graphics/offscreen/display_configuration.cpp (+6/-2)
src/server/graphics/offscreen/display_configuration.h (+7/-4)
src/server/input/CMakeLists.txt (+2/-0)
src/server/input/default_configuration.cpp (+2/-2)
src/server/logging/CMakeLists.txt (+3/-0)
src/server/logging/compositor_report.cpp (+178/-0)
src/server/logging/compositor_report.h (+84/-0)
src/server/logging/default_configuration.cpp (+23/-3)
src/server/logging/input_report.cpp (+4/-3)
src/server/logging/message_processor_report.cpp (+4/-4)
src/server/options/program_option.cpp (+32/-9)
src/server/scene/basic_surface.cpp (+11/-1)
src/server/scene/basic_surface.h (+8/-1)
src/server/scene/default_configuration.cpp (+1/-1)
src/server/scene/mediating_display_changer.cpp (+3/-1)
src/server/scene/surface_impl.cpp (+15/-10)
src/server/scene/surface_impl.h (+2/-0)
src/server/shell/graphics_display_layout.cpp (+1/-1)
src/shared/graphics/android/CMakeLists.txt (+2/-0)
src/shared/input/CMakeLists.txt (+3/-0)
src/shared/logging/CMakeLists.txt (+1/-0)
src/shared/logging/input_timestamp.cpp (+41/-0)
src/shared/protobuf/mir_protobuf.proto (+21/-0)
src/shared/protobuf/mir_protobuf_wire.proto (+1/-1)
src/utils/CMakeLists.txt (+20/-0)
src/utils/out.c (+196/-0)
src/utils/ping.c (+135/-0)
tests/CMakeLists.txt (+33/-19)
tests/acceptance-tests/CMakeLists.txt (+22/-7)
tests/acceptance-tests/test_client_focus_notification.cpp (+7/-5)
tests/acceptance-tests/test_client_library.cpp (+1/-1)
tests/acceptance-tests/test_client_screencast.cpp (+290/-0)
tests/acceptance-tests/test_protobuf.cpp (+285/-0)
tests/acceptance-tests/test_protobuf.proto (+18/-0)
tests/acceptance-tests/test_server_shutdown.cpp (+8/-1)
tests/integration-tests/CMakeLists.txt (+12/-7)
tests/integration-tests/client/test_client_render.cpp (+1/-7)
tests/integration-tests/graphics/android/test_display_integration.cpp (+3/-1)
tests/integration-tests/graphics/mesa/test_buffer_integration.cpp (+1/-1)
tests/integration-tests/test_session.cpp (+7/-1)
tests/integration-tests/test_surface_first_frame_sync.cpp (+9/-1)
tests/mir_test/display_config_matchers.cpp (+10/-7)
tests/mir_test_doubles/mock_gl.cpp (+71/-0)
tests/mir_test_doubles/test_protobuf_socket_server.cpp (+6/-2)
tests/mir_test_framework/CMakeLists.txt (+8/-12)
tests/mir_test_framework/in_process_server.cpp (+13/-0)
tests/mir_test_framework/process.cpp (+1/-23)
tests/mir_test_framework/stubbed_server_configuration.cpp (+16/-6)
tests/mir_test_framework/testing_process_manager.cpp (+9/-36)
tests/mir_test_framework/using_stub_client_platform.cpp (+62/-0)
tests/unit-tests/CMakeLists.txt (+24/-9)
tests/unit-tests/android_input/input_reader.cpp (+31/-0)
tests/unit-tests/client/CMakeLists.txt (+1/-0)
tests/unit-tests/client/android/test_client_surface_interpreter.cpp (+3/-3)
tests/unit-tests/client/mesa/test_client_buffer.cpp (+14/-0)
tests/unit-tests/client/mesa/test_native_surface.cpp (+3/-3)
tests/unit-tests/client/test_client_display_conf.cpp (+1/-0)
tests/unit-tests/client/test_client_mir_surface.cpp (+5/-4)
tests/unit-tests/client/test_mir_connection.cpp (+1/-1)
tests/unit-tests/client/test_mir_screencast.cpp (+523/-0)
tests/unit-tests/compositor/test_bypass.cpp (+12/-0)
tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp (+117/-12)
tests/unit-tests/compositor/test_gl_renderer.cpp (+153/-48)
tests/unit-tests/compositor/test_multi_threaded_compositor.cpp (+86/-5)
tests/unit-tests/compositor/test_switching_bundle.cpp (+30/-1)
tests/unit-tests/frontend/test_event_sender.cpp (+5/-7)
tests/unit-tests/frontend/test_published_socket_connector.cpp (+6/-2)
tests/unit-tests/frontend/test_session_mediator.cpp (+13/-3)
tests/unit-tests/frontend/test_socket_session.cpp (+59/-35)
tests/unit-tests/graphics/CMakeLists.txt (+1/-0)
tests/unit-tests/graphics/android/CMakeLists.txt (+4/-2)
tests/unit-tests/graphics/android/hwc_struct_helpers.cpp (+46/-0)
tests/unit-tests/graphics/android/hwc_struct_helpers.h (+9/-26)
tests/unit-tests/graphics/android/test_android_fb.cpp (+26/-22)
tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp (+34/-0)
tests/unit-tests/graphics/android/test_fb_simple_swapper.cpp (+18/-5)
tests/unit-tests/graphics/android/test_hwc_common_device.cpp (+7/-7)
tests/unit-tests/graphics/android/test_hwc_device.cpp (+60/-23)
tests/unit-tests/graphics/android/test_hwc_display.cpp (+112/-4)
tests/unit-tests/graphics/android/test_hwc_fb_device.cpp (+46/-9)
tests/unit-tests/graphics/android/test_hwc_layerlist.cpp (+11/-72)
tests/unit-tests/graphics/android/test_hwc_layers.cpp (+217/-0)
tests/unit-tests/graphics/android/test_output_builder.cpp (+10/-13)
tests/unit-tests/graphics/mesa/CMakeLists.txt (+1/-1)
tests/unit-tests/graphics/mesa/test_cursor.cpp (+12/-9)
tests/unit-tests/graphics/mesa/test_display_buffer.cpp (+236/-0)
tests/unit-tests/graphics/mesa/test_display_configuration.cpp (+21/-14)
tests/unit-tests/graphics/mesa/test_display_multi_monitor.cpp (+31/-10)
tests/unit-tests/graphics/mesa/test_overlapping_output_grouping.cpp (+117/-43)
tests/unit-tests/graphics/nested/test_nested_display_configuration.cpp (+57/-16)
tests/unit-tests/graphics/offscreen/test_offscreen_display.cpp (+23/-0)
tests/unit-tests/graphics/test_default_display_configuration_policy.cpp (+185/-119)
tests/unit-tests/graphics/test_display_configuration.cpp (+52/-2)
tests/unit-tests/graphics/test_pixel_format_utils.cpp (+96/-0)
tests/unit-tests/logging/CMakeLists.txt (+1/-0)
tests/unit-tests/logging/message_processor_report.cpp (+12/-12)
tests/unit-tests/logging/test_compositor_report.cpp (+179/-0)
tests/unit-tests/options/test_program_option.cpp (+69/-0)
tests/unit-tests/scene/test_surface.cpp (+21/-1)
tests/unit-tests/scene/test_surface_impl.cpp (+67/-0)
tests/unit-tests/test_udev_wrapper.cpp (+91/-89)
tools/setup-partial-armhf-chroot.sh (+15/-0)
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:mir/0.1