← Back to branch summary

~kdub/mir/mali-client-render-support

~kdub/mir/mali-client-render-support

Viewing all changes in revision 1078.

Committer: Kevin DuBois
Date: 2013-10-28 16:35:51 UTC
mfrom: (1062.1.104 development-branch)
Revision ID: kevin.dubois@canonical.com-20131028163551-anfzjjmprq9d6rrh

merge in dev branch

files added:
benchmarks/android-input

benchmarks/android-input/CMakeLists.txt

benchmarks/android-input/input_reader_perf.cpp

benchmarks/android-input/ntrig_input_events.h

include/platform/mir/graphics/nested_context.h

include/server/mir/default_configuration_options.h

include/server/mir/default_server_status_listener.h

include/server/mir/server_status_listener.h

include/server/mir/surfaces/surfaces_report.h

include/shared/mir/raii

include/shared/mir/raii.h

include/test/mir_test_doubles/mock_server_status_listener.h

src/server/compositor/default_configuration.cpp

src/server/compositor/occlusion.cpp

src/server/compositor/occlusion.h

src/server/default_configuration_options.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

tests/unit-tests/compositor/test_occlusion.cpp

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

tests/unit-tests/test_raii.cpp

files removed:
include/server/mir/default_pause_resume_listener.h

include/server/mir/graphics/nested

include/server/mir/pause_resume_listener.h

include/test/mir_test_doubles/mock_hwc_interface.h

include/test/mir_test_doubles/mock_pause_resume_listener.h

src/server/graphics/android/android_display_allocator.cpp

src/server/graphics/android/android_display_allocator.h

src/server/graphics/android/android_hwc_factory.cpp

src/server/graphics/android/android_hwc_factory.h

src/server/graphics/android/display_allocator.h

src/server/graphics/android/gpu_android_display_buffer_factory.h

src/server/graphics/android/hwc_device.h

src/server/graphics/android/hwc_factory.h

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

files renamed:
debian/libmirclient3.install => debian/libmirclient4.install

debian/libmirserver7.install => debian/libmirserver9.install

include/server/mir/surfaces/buffer_stream.h => include/server/mir/compositor/buffer_stream.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/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

src/server/graphics/android/gpu_hwc_android_display_buffer_factory.cpp => src/server/graphics/android/display_buffer_factory.cpp

src/server/graphics/android/hwc_android_display_buffer_factory.h => src/server/graphics/android/display_buffer_factory.h

src/server/graphics/android/framebuffer_factory.h => src/server/graphics/android/display_resource_factory.h

src/server/graphics/android/default_framebuffer_factory.cpp => src/server/graphics/android/resource_factory.cpp

src/server/graphics/android/default_framebuffer_factory.h => src/server/graphics/android/resource_factory.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/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

files modified:
CMakeLists.txt

benchmarks/CMakeLists.txt

debian/changelog

debian/control

doc/component_reports.md

examples/demo_client_display_config.c

examples/render_surfaces.cpp

examples/render_to_fb.cpp

examples/server_configuration.cpp

include/client/mir_toolkit/mir_client_library_drm.h

include/platform/mir/graphics/native_platform.h

include/server/mir/compositor/default_display_buffer_compositor_factory.h

include/server/mir/compositor/scene.h

include/server/mir/default_server_configuration.h

include/server/mir/server_configuration.h

include/server/mir/surfaces/buffer_stream_factory.h

include/server/mir/surfaces/surface.h

include/server/mir/surfaces/surface_controller.h

include/shared/mir/geometry/rectangle.h

include/shared/mir_toolkit/event.h

include/test/mir_test/draw/android_graphics.h

include/test/mir_test_doubles/mock_buffer_stream.h

include/test/mir_test_doubles/mock_display_support_provider.h

include/test/mir_test_doubles/mock_gl.h

include/test/mir_test_doubles/mock_surface_renderer.h

include/test/mir_test_doubles/stub_buffer_stream.h

include/test/mir_test_doubles/stub_display_support_provider.h

include/test/mir_test_doubles/stub_surface_builder.h

src/client/CMakeLists.txt

src/client/logging/rpc_report.cpp

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/rpc/mir_socket_rpc_channel.cpp

src/client/rpc/mir_socket_rpc_channel.h

src/platform/graphics/CMakeLists.txt

src/server/CMakeLists.txt

src/server/compositor/CMakeLists.txt

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/rendering_operator.cpp

src/server/compositor/switching_bundle.cpp

src/server/default_server_configuration.cpp

src/server/display_server.cpp

src/server/frontend/default_configuration.cpp

src/server/frontend/session_mediator.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_buffer_factory.h

src/server/graphics/android/android_display_factory.cpp

src/server/graphics/android/android_display_factory.h

src/server/graphics/android/android_platform.cpp

src/server/graphics/android/android_platform.h

src/server/graphics/android/display_support_provider.h

src/server/graphics/android/fb_device.cpp

src/server/graphics/android/fb_device.h

src/server/graphics/android/hwc10_device.h

src/server/graphics/android/hwc11_device.h

src/server/graphics/android/hwc_common_device.h

src/server/graphics/android/hwc_layerlist.cpp

src/server/graphics/gbm/native_gbm_platform.cpp

src/server/graphics/gbm/native_gbm_platform.h

src/server/graphics/nested/host_connection.cpp

src/server/graphics/nested/nested_display.cpp

src/server/graphics/nested/nested_platform.cpp

src/server/logging/CMakeLists.txt

src/server/logging/connector_report.cpp

src/server/run_mir.cpp

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

src/shared/geometry/rectangle.cpp

src/shared/input/android/android_input_lexicon.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_server_disconnect.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/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_server_main_loop_events.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir_test_doubles/mock_gl.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/compositor/CMakeLists.txt

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/draw/test_draw_patterns.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/geometry/test-rectangle.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_fb_device.cpp

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

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

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

tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.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/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/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

Show diffs side-by-side

added added

removed removed

benchmarks/CMakeLists.txt

benchmarks/android-input/

benchmarks/android-input/CMakeLists.txt

benchmarks/android-input/input_reader_perf.cpp

benchmarks/android-input/ntrig_input_events.h

debian/changelog

debian/libmirclient4.install

debian/libmirserver9.install

doc/component_reports.md

examples/demo_client_display_config.c

examples/render_surfaces.cpp

examples/render_to_fb.cpp

examples/server_configuration.cpp

include/client/mir_toolkit/mir_client_library_drm.h

include/platform/mir/graphics/native_platform.h

include/platform/mir/graphics/nested_context.h

include/server/mir/compositor/buffer_stream.h

include/server/mir/compositor/default_display_buffer_compositor_factory.h

include/server/mir/compositor/scene.h

include/server/mir/default_configuration_options.h

include/server/mir/default_pause_resume_listener.h

include/server/mir/default_server_configuration.h

include/server/mir/default_server_status_listener.h

include/server/mir/graphics/nested/

include/server/mir/pause_resume_listener.h

include/server/mir/server_configuration.h

include/server/mir/server_status_listener.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/shared/mir/geometry/rectangle.h

include/shared/mir/raii.h

include/shared/mir/raii/

include/shared/mir_toolkit/event.h

include/test/mir_test/draw/android_graphics.h

include/test/mir_test_doubles/mock_buffer_stream.h

include/test/mir_test_doubles/mock_display_support_provider.h

include/test/mir_test_doubles/mock_gl.h

include/test/mir_test_doubles/mock_hwc_interface.h

include/test/mir_test_doubles/mock_pause_resume_listener.h

include/test/mir_test_doubles/mock_server_status_listener.h

include/test/mir_test_doubles/mock_surface_renderer.h

include/test/mir_test_doubles/stub_buffer_stream.h

include/test/mir_test_doubles/stub_display_support_provider.h

include/test/mir_test_doubles/stub_surface_builder.h

src/client/CMakeLists.txt

src/client/logging/rpc_report.cpp

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/rpc/mir_socket_rpc_channel.cpp

src/client/rpc/mir_socket_rpc_channel.h

src/platform/graphics/CMakeLists.txt

src/server/CMakeLists.txt

src/server/compositor/CMakeLists.txt

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/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/default_configuration_options.cpp

src/server/default_server_configuration.cpp

src/server/display_server.cpp

src/server/frontend/default_configuration.cpp

src/server/frontend/session_mediator.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_allocator.cpp

src/server/graphics/android/android_display_allocator.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_hwc_factory.cpp

src/server/graphics/android/android_hwc_factory.h

src/server/graphics/android/android_platform.cpp

src/server/graphics/android/android_platform.h

src/server/graphics/android/display_allocator.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/display_support_provider.h

src/server/graphics/android/fb_device.cpp

src/server/graphics/android/fb_device.h

src/server/graphics/android/gpu_android_display_buffer_factory.h

src/server/graphics/android/hwc10_device.h

src/server/graphics/android/hwc11_device.h

src/server/graphics/android/hwc_common_device.h

src/server/graphics/android/hwc_device.h

src/server/graphics/android/hwc_factory.h

src/server/graphics/android/hwc_layerlist.cpp

src/server/graphics/android/resource_factory.cpp

src/server/graphics/android/resource_factory.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/gbm/native_gbm_platform.h

src/server/graphics/nested/host_connection.cpp

src/server/graphics/nested/nested_display.cpp

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/surfaces_report.cpp

src/server/logging/surfaces_report.h

src/server/run_mir.cpp

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

src/shared/geometry/rectangle.cpp

src/shared/input/android/android_input_lexicon.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_server_disconnect.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/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_server_main_loop_events.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir_test_doubles/mock_gl.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/compositor/CMakeLists.txt

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

tests/unit-tests/compositor/test_rendering_operator.cpp

tests/unit-tests/compositor/test_switching_bundle.cpp

tests/unit-tests/draw/test_draw_patterns.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/geometry/test-rectangle.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_fb_device.cpp

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

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

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

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

tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.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/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

tests/unit-tests/test_raii.cpp

Older »