~andreas-pokorny/mir/input-registrar-observer

« back to all changes in this revision

Viewing changes to src/platform/graphics/android/android_platform.cpp

Committer: Andreas Pokorny
Date: 2014-04-29 10:42:00 UTC
mfrom: (1545.1.4 input-rework-2)
Revision ID: andreas.pokorny@canonical.com-20140429104200-biuoeltnr1e7swu8

merged devel

files added:
include/platform/mir/graphics/gl_program_factory.h

include/server/mir/frontend/session_credentials.h

include/test/mir_test_doubles/null_event_filter.h

include/test/mir_test_doubles/stub_gl_program_factory.h

include/test/mir_test_doubles/stub_host_connection.h

include/test/mir_test_doubles/stub_input_targets.h

src/platform/graphics/android/overlay_gl_compositor.cpp

src/platform/graphics/android/overlay_gl_compositor.h

src/server/frontend/session_credentials.cpp

src/server/graphics/program_factory.cpp

src/server/graphics/program_factory.h

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

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

tests/unit-tests/graphics/nested/mir_display_configuration_builder.h

tests/unit-tests/graphics/test_program_factory.cpp

files renamed:
include/server/mir/compositor/gl_program.h => include/platform/mir/graphics/gl_program.h

include/server/mir/frontend/session_creator.h => include/server/mir/frontend/connection_creator.h

include/server/mir/frontend/connected_sessions.h => include/server/mir/frontend/connections.h

include/server/mir/frontend/protobuf_session_creator.h => include/server/mir/frontend/protobuf_connection_creator.h

src/server/frontend/protobuf_session_creator.cpp => src/server/frontend/protobuf_connection_creator.cpp

src/server/frontend/socket_session.cpp => src/server/frontend/socket_connection.cpp

src/server/frontend/socket_session.h => src/server/frontend/socket_connection.h

src/server/compositor/gl_program.cpp => src/server/graphics/gl_program.cpp

tests/unit-tests/frontend/test_socket_session.cpp => tests/unit-tests/frontend/test_socket_connection.cpp

files modified:
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/render_overlays.cpp

include/platform/mir/graphics/display_configuration.h

include/platform/mir/graphics/platform.h

include/server/mir/compositor/gl_renderer.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/session_authorizer.h

include/server/mir/input/input_targets.h

include/server/mir/input/surface.h

include/test/mir_test_doubles/mock_gl.h

include/test/mir_test_doubles/mock_input_surface.h

include/test/mir_test_doubles/null_platform.h

include/test/mir_test_doubles/stub_display_builder.h

include/test/mir_test_doubles/stub_ipc_factory.h

include/test/mir_test_doubles/stub_session_authorizer.h

src/platform/graphics/android/CMakeLists.txt

src/platform/graphics/android/android_display.cpp

src/platform/graphics/android/android_display.h

src/platform/graphics/android/android_platform.cpp

src/platform/graphics/android/android_platform.h

src/platform/graphics/android/display_buffer.cpp

src/platform/graphics/android/display_buffer.h

src/platform/graphics/android/display_builder.h

src/platform/graphics/android/framebuffers.cpp

src/platform/graphics/android/output_builder.cpp

src/platform/graphics/android/output_builder.h

src/platform/graphics/display_configuration.cpp

src/platform/graphics/mesa/buffer_allocator.cpp

src/platform/graphics/mesa/buffer_allocator.h

src/platform/graphics/mesa/display_buffer.cpp

src/platform/graphics/mesa/native_platform.cpp

src/platform/graphics/mesa/platform.cpp

src/platform/graphics/mesa/platform.h

src/platform/graphics/mesa/real_kms_display_configuration.cpp

src/platform/graphics/mesa/real_kms_output.cpp

src/server/compositor/CMakeLists.txt

src/server/compositor/default_configuration.cpp

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

src/server/frontend/CMakeLists.txt

src/server/frontend/default_configuration.cpp

src/server/frontend/message_receiver.h

src/server/frontend/protobuf_ipc_factory.h

src/server/frontend/published_socket_connector.cpp

src/server/frontend/published_socket_connector.h

src/server/frontend/socket_messenger.cpp

src/server/frontend/socket_messenger.h

src/server/graphics/CMakeLists.txt

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/nested_platform.cpp

src/server/graphics/nested/nested_platform.h

src/server/input/android/android_input_target_enumerator.cpp

src/server/scene/surface_stack.cpp

src/server/scene/surface_stack.h

tests/acceptance-tests/test_client_authorization.cpp

tests/acceptance-tests/test_client_screencast.cpp

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_protobuf.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

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

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

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/input/test_nested_input.cpp

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/mir_test_doubles/mock_egl.cpp

tests/mir_test_doubles/mock_gl.cpp

tests/mir_test_doubles/test_protobuf_socket_server.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/test_published_socket_connector.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/CMakeLists.txt

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

tests/unit-tests/graphics/test_display.cpp

tests/unit-tests/graphics/test_graphics_platform.cpp

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

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

Show diffs side-by-side

added added

removed removed

src/platform/graphics/android/android_platform.cpp

}

std::shared_ptr<mg::Display> mga::AndroidPlatform::create_display(

std::shared_ptr<graphics::DisplayConfigurationPolicy> const&,

std::shared_ptr<mg::DisplayConfigurationPolicy> const&,

std::shared_ptr<mg::GLProgramFactory> const& gl_program_factory,

std::shared_ptr<mg::GLConfig> const& gl_config)

{

return std::make_shared<mga::AndroidDisplay>(

display_builder, gl_config, display_report);

display_builder, gl_program_factory, gl_config, display_report);

}

std::shared_ptr<mg::PlatformIPCPackage> mga::AndroidPlatform::get_ipc_package()

Older »