Viewing all changes in revision 2094.7.8.
- Committer: Daniel van Vugt
- Date: 2015-02-22 07:46:25 UTC
- mfrom: (2332 development-branch)
- mto: This revision was merged to the branch mainline in revision 2673.
- Revision ID: daniel.van.vugt@canonical.com-20150222074625-8t23m2sif3dc0j3t
Merge latest trunk and fix conflicts.
- files added:
- benchmarks/benchmark_multiplexing_dispatchable.cpp
- include/common/mir/dispatch
- include/common/mir/events
- include/common/mir/frontend
- include/common/mir_toolkit/events
- include/common/mir_toolkit/events/input
- src/common/dispatch
- src/common/events
- src/include/platform/mir/options
- src/platforms
- src/platforms/android/server
- src/platforms/common
- src/platforms/common/client
- src/platforms/common/client/mir
- src/platforms/common/server
- src/platforms/mesa/include
- src/platforms/mesa/include/mir_toolkit
- src/platforms/mesa/server
- tests/acceptance-tests/throwback
- tests/unit-tests/dispatch
- files removed:
- client-ABI-sha1sums
- playground/demo-inprocess-surface-client
- files renamed:
- debian/libmirplatform4.install => debian/libmirplatform7.install
- debian/libmirserver27.install => debian/libmirserver29.install
- debian/libmirclient8driver-android.install => debian/mir-client-platform-android.install
- debian/libmirclient8driver-mesa.install => debian/mir-client-platform-mesa.install
- playground/buffer_render_target.cpp => examples/buffer_render_target.cpp
- playground/buffer_render_target.h => examples/buffer_render_target.h
- playground/image_renderer.cpp => examples/image_renderer.cpp
- playground/image_renderer.h => examples/image_renderer.h
- playground/render_surfaces.cpp => examples/render_surfaces.cpp
- examples/basic_server.cpp => examples/server_example.cpp
- examples/example_display_configuration_policy.cpp => examples/server_example_display_configuration_policy.cpp
- examples/example_display_configuration_policy.h => examples/server_example_display_configuration_policy.h
- playground/demo-shell/fullscreen_placement_strategy.cpp => examples/server_example_fullscreen_placement_strategy.cpp
- playground/demo-shell/fullscreen_placement_strategy.h => examples/server_example_fullscreen_placement_strategy.h
- examples/example_input_event_filter.cpp => examples/server_example_input_event_filter.cpp
- examples/example_input_event_filter.h => examples/server_example_input_event_filter.h
- examples/minimal_server.cpp => examples/server_minimal.cpp
- include/server/mir/frontend/surface_id.h => include/common/mir/frontend/surface_id.h
- include/common/mir_toolkit/event.h => include/common/mir_toolkit/events/event.h
- src/client/client_buffer.h => src/include/client/mir/client_buffer.h
- src/client/client_buffer_factory.h => src/include/client/mir/client_buffer_factory.h
- src/client/client_context.h => src/include/client/mir/client_context.h
- src/client/client_platform.h => src/include/client/mir/client_platform.h
- src/client/client_platform_factory.h => src/include/client/mir/client_platform_factory.h
- src/client/egl_native_display_container.h => src/include/client/mir/egl_native_display_container.h
- src/client/mir_client_surface.h => src/include/client/mir/egl_native_surface.h
- src/client/egl_native_window_factory.h => src/include/client/mir/egl_native_window_factory.h
- include/platform/mir/options/configuration.h => src/include/platform/mir/options/configuration.h
- include/platform/mir/options/default_configuration.h => src/include/platform/mir/options/default_configuration.h
- include/platform/mir/options/program_option.h => src/include/platform/mir/options/program_option.h
- include/server/mir/compositor/scene_element.h => src/include/server/mir/compositor/scene_element.h
- include/server/mir/default_server_configuration.h => src/include/server/mir/default_server_configuration.h
- include/server/mir/display_server.h => src/include/server/mir/display_server.h
- include/server/mir/emergency_cleanup.h => src/include/server/mir/emergency_cleanup.h
- include/server/mir/frontend/display_changer.h => src/include/server/mir/frontend/display_changer.h
- include/server/mir/frontend/event_sink.h => src/include/server/mir/frontend/event_sink.h
- include/server/mir/frontend/screencast.h => src/include/server/mir/frontend/screencast.h
- include/server/mir/frontend/shell.h => src/include/server/mir/frontend/shell.h
- include/server/mir/run_mir.h => src/include/server/mir/run_mir.h
- include/server/mir/server_configuration.h => src/include/server/mir/server_configuration.h
- src/platform/graphics/android/ => src/platforms/android/
- src/client/android/ => src/platforms/android/client/
- src/client/android/client_surface_interpreter.cpp => src/platforms/android/client/egl_native_surface_interpreter.cpp
- src/client/android/client_surface_interpreter.h => src/platforms/android/client/egl_native_surface_interpreter.h
- src/platform/graphics/android/CMakeLists.txt => src/platforms/android/server/CMakeLists.txt
- src/platform/graphics/android/android_alloc_adaptor.cpp => src/platforms/android/server/android_alloc_adaptor.cpp
- src/platform/graphics/android/android_alloc_adaptor.h => src/platforms/android/server/android_alloc_adaptor.h
- src/platform/graphics/android/android_buffer_allocator.cpp => src/platforms/android/server/android_buffer_allocator.cpp
- src/platform/graphics/android/android_format_conversion-inl.h => src/platforms/android/server/android_format_conversion-inl.h
- src/platform/graphics/android/android_graphic_buffer_allocator.h => src/platforms/android/server/android_graphic_buffer_allocator.h
- src/platform/graphics/android/buffer.cpp => src/platforms/android/server/buffer.cpp
- src/platform/graphics/android/buffer.h => src/platforms/android/server/buffer.h
- src/platform/graphics/android/buffer_usage.h => src/platforms/android/server/buffer_usage.h
- src/platform/graphics/android/configurable_display_buffer.h => src/platforms/android/server/configurable_display_buffer.h
- src/platform/graphics/android/device_quirks.cpp => src/platforms/android/server/device_quirks.cpp
- src/platform/graphics/android/device_quirks.h => src/platforms/android/server/device_quirks.h
- src/platform/graphics/android/display.cpp => src/platforms/android/server/display.cpp
- src/platform/graphics/android/display.h => src/platforms/android/server/display.h
- src/platform/graphics/android/display_buffer.cpp => src/platforms/android/server/display_buffer.cpp
- src/platform/graphics/android/display_buffer.h => src/platforms/android/server/display_buffer.h
- src/platform/graphics/android/display_builder.h => src/platforms/android/server/display_component_factory.h
- src/platform/graphics/android/display_configuration.cpp => src/platforms/android/server/display_configuration.cpp
- src/platform/graphics/android/display_configuration.h => src/platforms/android/server/display_configuration.h
- src/platform/graphics/android/display_device.h => src/platforms/android/server/display_device.h
- src/platform/graphics/android/display_resource_factory.h => src/platforms/android/server/display_resource_factory.h
- src/platform/graphics/android/fb_device.cpp => src/platforms/android/server/fb_device.cpp
- src/platform/graphics/android/fb_device.h => src/platforms/android/server/fb_device.h
- src/platform/graphics/android/framebuffer_bundle.h => src/platforms/android/server/framebuffer_bundle.h
- src/platform/graphics/android/framebuffers.cpp => src/platforms/android/server/framebuffers.cpp
- src/platform/graphics/android/framebuffers.h => src/platforms/android/server/framebuffers.h
- src/platform/graphics/android/gl_context.cpp => src/platforms/android/server/gl_context.cpp
- src/platform/graphics/android/gl_context.h => src/platforms/android/server/gl_context.h
- src/platform/graphics/android/graphic_alloc_adaptor.h => src/platforms/android/server/graphic_alloc_adaptor.h
- src/platform/graphics/android/graphic_buffer_allocator.h => src/platforms/android/server/graphic_buffer_allocator.h
- src/platform/graphics/android/output_builder.cpp => src/platforms/android/server/hal_component_factory.cpp
- src/platform/graphics/android/output_builder.h => src/platforms/android/server/hal_component_factory.h
- src/platform/graphics/android/hwc_device.cpp => src/platforms/android/server/hwc_device.cpp
- src/platform/graphics/android/hwc_device.h => src/platforms/android/server/hwc_device.h
- src/platform/graphics/android/hwc_fallback_gl_renderer.cpp => src/platforms/android/server/hwc_fallback_gl_renderer.cpp
- src/platform/graphics/android/hwc_fallback_gl_renderer.h => src/platforms/android/server/hwc_fallback_gl_renderer.h
- src/platform/graphics/android/hwc_fb_device.cpp => src/platforms/android/server/hwc_fb_device.cpp
- src/platform/graphics/android/hwc_fb_device.h => src/platforms/android/server/hwc_fb_device.h
- src/platform/graphics/android/hwc_layerlist.cpp => src/platforms/android/server/hwc_layerlist.cpp
- src/platform/graphics/android/hwc_layerlist.h => src/platforms/android/server/hwc_layerlist.h
- src/platform/graphics/android/hwc_layers.cpp => src/platforms/android/server/hwc_layers.cpp
- src/platform/graphics/android/hwc_layers.h => src/platforms/android/server/hwc_layers.h
- src/platform/graphics/android/hwc_loggers.cpp => src/platforms/android/server/hwc_loggers.cpp
- src/platform/graphics/android/hwc_loggers.h => src/platforms/android/server/hwc_loggers.h
- src/platform/graphics/android/hwc_logger.h => src/platforms/android/server/hwc_report.h
- src/platform/graphics/android/hwc_wrapper.h => src/platforms/android/server/hwc_wrapper.h
- src/platform/graphics/android/interpreter_cache.cpp => src/platforms/android/server/interpreter_cache.cpp
- src/platform/graphics/android/interpreter_cache.h => src/platforms/android/server/interpreter_cache.h
- src/platform/graphics/android/interpreter_resource_cache.h => src/platforms/android/server/interpreter_resource_cache.h
- src/platform/graphics/android/ipc_operations.cpp => src/platforms/android/server/ipc_operations.cpp
- src/platform/graphics/android/ipc_operations.h => src/platforms/android/server/ipc_operations.h
- src/platform/graphics/android/overlay_optimization.h => src/platforms/android/server/overlay_optimization.h
- src/platform/graphics/android/platform.cpp => src/platforms/android/server/platform.cpp
- src/platform/graphics/android/platform.h => src/platforms/android/server/platform.h
- src/platform/graphics/android/real_hwc_wrapper.cpp => src/platforms/android/server/real_hwc_wrapper.cpp
- src/platform/graphics/android/real_hwc_wrapper.h => src/platforms/android/server/real_hwc_wrapper.h
- src/platform/graphics/android/resource_factory.cpp => src/platforms/android/server/resource_factory.cpp
- src/platform/graphics/android/resource_factory.h => src/platforms/android/server/resource_factory.h
- src/platform/graphics/android/server_render_window.cpp => src/platforms/android/server/server_render_window.cpp
- src/platform/graphics/android/server_render_window.h => src/platforms/android/server/server_render_window.h
- src/platform/graphics/android/swapping_gl_context.h => src/platforms/android/server/swapping_gl_context.h
- src/client/aging_buffer.cpp => src/platforms/common/client/mir/aging_buffer.cpp
- src/client/aging_buffer.h => src/platforms/common/client/mir/aging_buffer.h
- src/platform/graphics/symbols.map => src/platforms/common/server/symbols.map
- src/platform/graphics/mesa/ => src/platforms/mesa/
- src/client/mesa/ => src/platforms/mesa/client/
- include/common/mir_toolkit/mesa/ => src/platforms/mesa/include/mir_toolkit/mesa/
- src/platform/graphics/mesa/CMakeLists.txt => src/platforms/mesa/server/CMakeLists.txt
- src/platform/graphics/mesa/anonymous_shm_file.cpp => src/platforms/mesa/server/anonymous_shm_file.cpp
- src/platform/graphics/mesa/anonymous_shm_file.h => src/platforms/mesa/server/anonymous_shm_file.h
- src/platform/graphics/mesa/buffer_allocator.cpp => src/platforms/mesa/server/buffer_allocator.cpp
- src/platform/graphics/mesa/buffer_allocator.h => src/platforms/mesa/server/buffer_allocator.h
- src/platform/graphics/mesa/buffer_texture_binder.h => src/platforms/mesa/server/buffer_texture_binder.h
- src/platform/graphics/mesa/bypass.cpp => src/platforms/mesa/server/bypass.cpp
- src/platform/graphics/mesa/bypass.h => src/platforms/mesa/server/bypass.h
- src/platform/graphics/mesa/cursor.cpp => src/platforms/mesa/server/cursor.cpp
- src/platform/graphics/mesa/cursor.h => src/platforms/mesa/server/cursor.h
- src/platform/graphics/mesa/display.cpp => src/platforms/mesa/server/display.cpp
- src/platform/graphics/mesa/display.h => src/platforms/mesa/server/display.h
- src/platform/graphics/mesa/display_buffer.cpp => src/platforms/mesa/server/display_buffer.cpp
- src/platform/graphics/mesa/display_buffer.h => src/platforms/mesa/server/display_buffer.h
- src/platform/graphics/mesa/display_helpers.cpp => src/platforms/mesa/server/display_helpers.cpp
- src/platform/graphics/mesa/display_helpers.h => src/platforms/mesa/server/display_helpers.h
- src/platform/graphics/mesa/drm_authentication.h => src/platforms/mesa/server/drm_authentication.h
- src/platform/graphics/mesa/drm_close_threadsafe.cpp => src/platforms/mesa/server/drm_close_threadsafe.cpp
- src/platform/graphics/mesa/drm_close_threadsafe.h => src/platforms/mesa/server/drm_close_threadsafe.h
- src/platform/graphics/mesa/drm_mode_resources.cpp => src/platforms/mesa/server/drm_mode_resources.cpp
- src/platform/graphics/mesa/drm_mode_resources.h => src/platforms/mesa/server/drm_mode_resources.h
- src/platform/graphics/mesa/gbm_buffer.cpp => src/platforms/mesa/server/gbm_buffer.cpp
- src/platform/graphics/mesa/gbm_buffer.h => src/platforms/mesa/server/gbm_buffer.h
- src/platform/graphics/mesa/native_platform.cpp => src/platforms/mesa/server/guest_platform.cpp
- src/platform/graphics/mesa/native_platform.h => src/platforms/mesa/server/guest_platform.h
- src/platform/graphics/mesa/ipc_operations.cpp => src/platforms/mesa/server/ipc_operations.cpp
- src/platform/graphics/mesa/ipc_operations.h => src/platforms/mesa/server/ipc_operations.h
- src/platform/graphics/mesa/kms_display_configuration.h => src/platforms/mesa/server/kms_display_configuration.h
- src/platform/graphics/mesa/kms_output.h => src/platforms/mesa/server/kms_output.h
- src/platform/graphics/mesa/kms_output_container.h => src/platforms/mesa/server/kms_output_container.h
- src/platform/graphics/mesa/kms_page_flipper.cpp => src/platforms/mesa/server/kms_page_flipper.cpp
- src/platform/graphics/mesa/kms_page_flipper.h => src/platforms/mesa/server/kms_page_flipper.h
- src/platform/graphics/mesa/linux_virtual_terminal.cpp => src/platforms/mesa/server/linux_virtual_terminal.cpp
- src/platform/graphics/mesa/linux_virtual_terminal.h => src/platforms/mesa/server/linux_virtual_terminal.h
- src/platform/graphics/mesa/nested_authentication.cpp => src/platforms/mesa/server/nested_authentication.cpp
- src/platform/graphics/mesa/nested_authentication.h => src/platforms/mesa/server/nested_authentication.h
- src/platform/graphics/mesa/page_flipper.h => src/platforms/mesa/server/page_flipper.h
- src/platform/graphics/mesa/platform.cpp => src/platforms/mesa/server/platform.cpp
- src/platform/graphics/mesa/platform.h => src/platforms/mesa/server/platform.h
- src/platform/graphics/mesa/real_kms_display_configuration.cpp => src/platforms/mesa/server/real_kms_display_configuration.cpp
- src/platform/graphics/mesa/real_kms_display_configuration.h => src/platforms/mesa/server/real_kms_display_configuration.h
- src/platform/graphics/mesa/real_kms_output.cpp => src/platforms/mesa/server/real_kms_output.cpp
- src/platform/graphics/mesa/real_kms_output.h => src/platforms/mesa/server/real_kms_output.h
- src/platform/graphics/mesa/real_kms_output_container.cpp => src/platforms/mesa/server/real_kms_output_container.cpp
- src/platform/graphics/mesa/real_kms_output_container.h => src/platforms/mesa/server/real_kms_output_container.h
- src/platform/graphics/mesa/shm_buffer.cpp => src/platforms/mesa/server/shm_buffer.cpp
- src/platform/graphics/mesa/shm_buffer.h => src/platforms/mesa/server/shm_buffer.h
- src/platform/graphics/mesa/shm_file.h => src/platforms/mesa/server/shm_file.h
- src/platform/graphics/mesa/virtual_terminal.h => src/platforms/mesa/server/virtual_terminal.h
- tests/acceptance-tests/clients.cpp => tests/acceptance-tests/throwback/clients.cpp
- tests/acceptance-tests/clients.h => tests/acceptance-tests/throwback/clients.h
- tests/acceptance-tests/test_client_cursor_api.cpp => tests/acceptance-tests/throwback/test_client_cursor_api.cpp
- tests/acceptance-tests/test_client_input.cpp => tests/acceptance-tests/throwback/test_client_input.cpp
- tests/acceptance-tests/test_custom_input_dispatcher.cpp => tests/acceptance-tests/throwback/test_custom_input_dispatcher.cpp
- tests/acceptance-tests/test_focus_selection.cpp => tests/acceptance-tests/throwback/test_focus_selection.cpp
- tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp => tests/acceptance-tests/throwback/test_shell_control_of_surface_configuration.cpp
- tests/acceptance-tests/test_touchspot_visualization.cpp => tests/acceptance-tests/throwback/test_touchspot_visualization.cpp
- tests/include/mir_test_doubles/mock_client_surface.h => tests/include/mir_test_doubles/mock_egl_native_surface.h
- tests/integration-tests/test_session_manager.cpp => tests/integration-tests/test_default_shell.cpp
- tests/acceptance-tests/test_large_messages.cpp => tests/integration-tests/test_large_messages.cpp
- tests/unit-tests/client/android/test_client_surface_interpreter.cpp => tests/unit-tests/client/android/test_egl_native_surface_interpreter.cpp
- tests/unit-tests/graphics/mesa/test_native_platform.cpp => tests/unit-tests/graphics/mesa/test_guest_platform.cpp
- files modified:
- 3rd_party/android-deps/std/Condition.h
expand all
collapse all
added
removed
