← Back to branch summary

~robertcarr/mir/add-log-all-option

~robertcarr/mir/add-log-all-option

Viewing all changes in revision 1160.2.6.

Committer: Daniel van Vugt
Date: 2013-11-01 04:31:31 UTC
mfrom: (1186 dev)
mto: This revision was merged to the branch mainline in revision 1188.
Revision ID: daniel.van.vugt@canonical.com-20131101043131-xyg19ps8zcab8j4x

Merge latest development-branch

files added:
include/server/mir/surfaces/surfaces_report.h

include/test/mir_test_doubles/stub_driver_interpreter.h

src/server/compositor/default_configuration.cpp

src/server/graphics/default_configuration.cpp

src/server/logging/default_configuration.cpp

src/server/logging/surfaces_report.cpp

src/server/logging/surfaces_report.h

src/server/surfaces/default_configuration.cpp

src/server/surfaces/surfaces_report.cpp

tests/acceptance-tests/test_client_library_drm.cpp

files removed:
include/server/mir/graphics/nested

include/test/mir_test_doubles/mock_android_framebuffer_window.h

src/server/graphics/android/android_display_factory.cpp

src/server/graphics/android/android_display_factory.h

src/server/graphics/android/android_framebuffer_window.cpp

src/server/graphics/android/android_framebuffer_window.h

src/server/graphics/android/android_framebuffer_window_query.h

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

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

files renamed:
include/server/mir/surfaces/buffer_stream.h => include/server/mir/compositor/buffer_stream.h

include/test/mir_test_doubles/mock_display_support_provider.h => include/test/mir_test_doubles/mock_display_device.h

include/test/mir_test_doubles/stub_display_support_provider.h => include/test/mir_test_doubles/stub_display_device.h

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

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

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

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

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

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

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

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

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

include/server/mir/frontend/global_event_sender.h => src/server/frontend/global_event_sender.h

include/server/mir/frontend/protobuf_ipc_factory.h => src/server/frontend/protobuf_ipc_factory.h

include/server/mir/frontend/resource_cache.h => src/server/frontend/resource_cache.h

include/server/mir/frontend/session_mediator.h => src/server/frontend/session_mediator.h

src/server/graphics/android/display_support_provider.h => src/server/graphics/android/display_device.h

src/platform/graphics/default_display_configuration_policy.cpp => src/server/graphics/default_display_configuration_policy.cpp

include/platform/mir/graphics/default_display_configuration_policy.h => src/server/graphics/default_display_configuration_policy.h

include/server/mir/graphics/nested/host_connection.h => src/server/graphics/nested/host_connection.h

include/server/mir/graphics/nested/nested_platform.h => src/server/graphics/nested/nested_platform.h

include/server/mir/logging/connector_report.h => src/server/logging/connector_report.h

include/server/mir/logging/display_report.h => src/server/logging/display_report.h

include/server/mir/logging/session_mediator_report.h => src/server/logging/session_mediator_report.h

include/server/mir/surfaces/surface_allocator.h => src/server/surfaces/surface_allocator.h

include/server/mir/surfaces/surface_factory.h => src/server/surfaces/surface_factory.h

include/server/mir/surfaces/surface_stack.h => src/server/surfaces/surface_stack.h

include/server/mir/surfaces/surface_stack_model.h => src/server/surfaces/surface_stack_model.h

tests/unit-tests/graphics/android/test_framebuffer_factory.cpp => tests/unit-tests/graphics/android/test_resource_factory.cpp

files modified:
CMakeLists.txt

debian/changelog

doc/building_source_for_android.md

doc/component_reports.md

doc/installing_prebuilt_on_pc.md

doc/using_mir_on_pc.md

examples/image_renderer.cpp

examples/render_surfaces.cpp

examples/render_to_fb.cpp

include/client/mir_toolkit/mir_client_library_drm.h

include/platform/mir/graphics/nested_context.h

include/server/mir/compositor/scene.h

include/server/mir/default_configuration_options.h

include/server/mir/default_server_configuration.h

include/server/mir/shell/focus_controller.h

include/server/mir/shell/session.h

include/server/mir/surfaces/buffer_stream_factory.h

include/server/mir/surfaces/surface.h

include/server/mir/surfaces/surface_controller.h

include/test/mir_test/draw/android_graphics.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_shell_session.h

include/test/mir_test_doubles/mock_surface_renderer.h

include/test/mir_test_doubles/stub_buffer_allocator.h

include/test/mir_test_doubles/stub_buffer_stream.h

include/test/mir_test_doubles/stub_ipc_factory.h

include/test/mir_test_doubles/stub_shell_session.h

include/test/mir_test_doubles/stub_surface_builder.h

src/client/lttng/CMakeLists.txt

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/platform/graphics/CMakeLists.txt

src/server/CMakeLists.txt

src/server/compositor/CMakeLists.txt

src/server/compositor/buffer_bundle.h

src/server/compositor/buffer_stream_factory.cpp

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/bypass.cpp

src/server/compositor/bypass.h

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/default_display_buffer_compositor_factory.cpp

src/server/compositor/gl_renderer.cpp

src/server/compositor/gl_renderer.h

src/server/compositor/gl_renderer_factory.cpp

src/server/compositor/multi_threaded_compositor.cpp

src/server/compositor/occlusion.cpp

src/server/compositor/occlusion.h

src/server/compositor/rendering_operator.cpp

src/server/compositor/switching_bundle.cpp

src/server/compositor/switching_bundle.h

src/server/default_configuration_options.cpp

src/server/default_server_configuration.cpp

src/server/frontend/default_configuration.cpp

src/server/frontend/global_event_sender.cpp

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_session_creator.cpp

src/server/frontend/resource_cache.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator_android.cpp

src/server/frontend/session_mediator_gbm.cpp

src/server/graphics/CMakeLists.txt

src/server/graphics/android/CMakeLists.txt

src/server/graphics/android/android_display.cpp

src/server/graphics/android/android_display.h

src/server/graphics/android/android_display_buffer_factory.h

src/server/graphics/android/android_platform.cpp

src/server/graphics/android/android_platform.h

src/server/graphics/android/display_buffer_factory.cpp

src/server/graphics/android/display_buffer_factory.h

src/server/graphics/android/display_resource_factory.h

src/server/graphics/android/fb_device.cpp

src/server/graphics/android/fb_device.h

src/server/graphics/android/hwc10_device.cpp

src/server/graphics/android/hwc10_device.h

src/server/graphics/android/hwc11_device.cpp

src/server/graphics/android/hwc11_device.h

src/server/graphics/android/hwc_common_device.cpp

src/server/graphics/android/hwc_common_device.h

src/server/graphics/android/resource_factory.cpp

src/server/graphics/android/resource_factory.h

src/server/graphics/android/server_render_window.cpp

src/server/graphics/android/server_render_window.h

src/server/graphics/gbm/native_gbm_platform.cpp

src/server/graphics/nested/host_connection.cpp

src/server/graphics/nested/nested_display.cpp

src/server/graphics/nested/nested_display.h

src/server/graphics/nested/nested_platform.cpp

src/server/logging/CMakeLists.txt

src/server/logging/connector_report.cpp

src/server/logging/display_report.cpp

src/server/logging/session_mediator_report.cpp

src/server/lttng/CMakeLists.txt

src/server/surfaces/CMakeLists.txt

src/server/surfaces/surface.cpp

src/server/surfaces/surface_allocator.cpp

src/server/surfaces/surface_controller.cpp

src/server/surfaces/surface_stack.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/integration-tests/compositor/test_buffer_stream.cpp

tests/integration-tests/compositor/test_swapping_swappers.cpp

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

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

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

tests/integration-tests/shell/test_session.cpp

tests/integration-tests/shell/test_session_manager.cpp

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_error_reporting.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir-stress/src/client.h

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/compositor/test_buffer_stream.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_rendering_operator.cpp

tests/unit-tests/compositor/test_switching_bundle.cpp

tests/unit-tests/frontend/stress_protobuf_communicator.cpp

tests/unit-tests/frontend/test_global_event_sender.cpp

tests/unit-tests/frontend/test_protobuf_reports_errors.cpp

tests/unit-tests/frontend/test_protobuf_sends_fds.cpp

tests/unit-tests/frontend/test_protobuf_surface_apis.cpp

tests/unit-tests/frontend/test_published_socket_connector.cpp

tests/unit-tests/frontend/test_resource_cache.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/frontend/test_session_mediator_android.cpp

tests/unit-tests/frontend/test_session_mediator_gbm.cpp

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

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

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

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

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

tests/unit-tests/graphics/android/test_hwc11_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_server_interpreter.cpp

tests/unit-tests/graphics/gbm/test_gbm_display.cpp

tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp

tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp

tests/unit-tests/graphics/gbm/test_native_gbm_platform.cpp

tests/unit-tests/graphics/test_default_display_configuration_policy.cpp

tests/unit-tests/graphics/test_display.cpp

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

tests/unit-tests/logging/test_display_report.cpp

tests/unit-tests/options/test_program_option.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/shell/test_surface.cpp

tests/unit-tests/surfaces/test_surface.cpp

tests/unit-tests/surfaces/test_surface_allocator.cpp

tests/unit-tests/surfaces/test_surface_controller.cpp

tests/unit-tests/surfaces/test_surface_stack.cpp

tools/setup-partial-armhf-chroot.sh

Show diffs side-by-side

added added

removed removed

debian/changelog

doc/building_source_for_android.md

doc/component_reports.md

doc/installing_prebuilt_on_pc.md

doc/using_mir_on_pc.md

examples/image_renderer.cpp

examples/render_surfaces.cpp

examples/render_to_fb.cpp

include/client/mir_toolkit/mir_client_library_drm.h

include/platform/mir/graphics/nested_context.h

include/server/mir/compositor/buffer_stream.h

include/server/mir/compositor/scene.h

include/server/mir/default_configuration_options.h

include/server/mir/default_server_configuration.h

include/server/mir/graphics/nested/

include/server/mir/shell/focus_controller.h

include/server/mir/shell/session.h

include/server/mir/surfaces/buffer_stream_factory.h

include/server/mir/surfaces/surface.h

include/server/mir/surfaces/surface_controller.h

include/server/mir/surfaces/surfaces_report.h

include/test/mir_test/draw/android_graphics.h

include/test/mir_test_doubles/mock_android_framebuffer_window.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_shell_session.h

include/test/mir_test_doubles/mock_surface_renderer.h

include/test/mir_test_doubles/stub_buffer_allocator.h

include/test/mir_test_doubles/stub_buffer_stream.h

include/test/mir_test_doubles/stub_display_device.h

include/test/mir_test_doubles/stub_driver_interpreter.h

include/test/mir_test_doubles/stub_ipc_factory.h

include/test/mir_test_doubles/stub_shell_session.h

include/test/mir_test_doubles/stub_surface_builder.h

src/client/lttng/CMakeLists.txt

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/platform/graphics/CMakeLists.txt

src/server/CMakeLists.txt

src/server/compositor/CMakeLists.txt

src/server/compositor/buffer_bundle.h

src/server/compositor/buffer_stream_factory.cpp

src/server/compositor/buffer_stream_factory.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/default_configuration.cpp

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/default_display_buffer_compositor_factory.cpp

src/server/compositor/default_display_buffer_compositor_factory.h

src/server/compositor/gl_renderer.cpp

src/server/compositor/gl_renderer.h

src/server/compositor/gl_renderer_factory.cpp

src/server/compositor/gl_renderer_factory.h

src/server/compositor/multi_threaded_compositor.cpp

src/server/compositor/occlusion.cpp

src/server/compositor/occlusion.h

src/server/compositor/renderer.h

src/server/compositor/rendering_operator.cpp

src/server/compositor/rendering_operator.h

src/server/compositor/switching_bundle.cpp

src/server/compositor/switching_bundle.h

src/server/default_configuration_options.cpp

src/server/default_server_configuration.cpp

src/server/frontend/default_configuration.cpp

src/server/frontend/global_event_sender.cpp

src/server/frontend/global_event_sender.h

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_session_creator.cpp

src/server/frontend/resource_cache.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator_android.cpp

src/server/frontend/session_mediator_gbm.cpp

src/server/graphics/CMakeLists.txt

src/server/graphics/android/CMakeLists.txt

src/server/graphics/android/android_display.cpp

src/server/graphics/android/android_display.h

src/server/graphics/android/android_display_buffer_factory.h

src/server/graphics/android/android_display_factory.cpp

src/server/graphics/android/android_display_factory.h

src/server/graphics/android/android_framebuffer_window.cpp

src/server/graphics/android/android_framebuffer_window.h

src/server/graphics/android/android_framebuffer_window_query.h

src/server/graphics/android/android_platform.cpp

src/server/graphics/android/android_platform.h

src/server/graphics/android/display_buffer_factory.cpp

src/server/graphics/android/display_buffer_factory.h

src/server/graphics/android/display_device.h

src/server/graphics/android/display_resource_factory.h

src/server/graphics/android/fb_device.cpp

src/server/graphics/android/fb_device.h

src/server/graphics/android/hwc10_device.cpp

src/server/graphics/android/hwc10_device.h

src/server/graphics/android/hwc11_device.cpp

src/server/graphics/android/hwc11_device.h

src/server/graphics/android/hwc_common_device.cpp

src/server/graphics/android/hwc_common_device.h

src/server/graphics/android/resource_factory.cpp

src/server/graphics/android/resource_factory.h

src/server/graphics/android/server_render_window.cpp

src/server/graphics/android/server_render_window.h

src/server/graphics/default_configuration.cpp

src/server/graphics/default_display_configuration_policy.cpp

src/server/graphics/default_display_configuration_policy.h

src/server/graphics/gbm/native_gbm_platform.cpp

src/server/graphics/nested/host_connection.cpp

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_platform.cpp

src/server/graphics/nested/nested_platform.h

src/server/logging/CMakeLists.txt

src/server/logging/connector_report.cpp

src/server/logging/default_configuration.cpp

src/server/logging/display_report.cpp

src/server/logging/session_mediator_report.cpp

src/server/logging/surfaces_report.cpp

src/server/logging/surfaces_report.h

src/server/lttng/CMakeLists.txt

src/server/surfaces/CMakeLists.txt

src/server/surfaces/default_configuration.cpp

src/server/surfaces/surface.cpp

src/server/surfaces/surface_allocator.cpp

src/server/surfaces/surface_allocator.h

src/server/surfaces/surface_controller.cpp

src/server/surfaces/surface_stack.cpp

src/server/surfaces/surface_stack.h

src/server/surfaces/surfaces_report.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library_drm.cpp

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/integration-tests/compositor/test_buffer_stream.cpp

tests/integration-tests/compositor/test_swapping_swappers.cpp

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

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

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

tests/integration-tests/shell/test_session.cpp

tests/integration-tests/shell/test_session_manager.cpp

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_error_reporting.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir-stress/src/client.h

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/compositor/test_buffer_stream.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_rendering_operator.cpp

tests/unit-tests/compositor/test_switching_bundle.cpp

tests/unit-tests/frontend/stress_protobuf_communicator.cpp

tests/unit-tests/frontend/test_global_event_sender.cpp

tests/unit-tests/frontend/test_protobuf_reports_errors.cpp

tests/unit-tests/frontend/test_protobuf_sends_fds.cpp

tests/unit-tests/frontend/test_protobuf_surface_apis.cpp

tests/unit-tests/frontend/test_published_socket_connector.cpp

tests/unit-tests/frontend/test_resource_cache.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/frontend/test_session_mediator_android.cpp

tests/unit-tests/frontend/test_session_mediator_gbm.cpp

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

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

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

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

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

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

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

tests/unit-tests/graphics/android/test_hwc11_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_resource_factory.cpp

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

tests/unit-tests/graphics/gbm/test_gbm_display.cpp

tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp

tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp

tests/unit-tests/graphics/gbm/test_native_gbm_platform.cpp

tests/unit-tests/graphics/test_default_display_configuration_policy.cpp

tests/unit-tests/graphics/test_display.cpp

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

tests/unit-tests/logging/test_display_report.cpp

tests/unit-tests/options/test_program_option.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/shell/test_surface.cpp

tests/unit-tests/surfaces/test_surface.cpp

tests/unit-tests/surfaces/test_surface_allocator.cpp

tests/unit-tests/surfaces/test_surface_controller.cpp

tests/unit-tests/surfaces/test_surface_stack.cpp

tools/setup-partial-armhf-chroot.sh

Older »