~ubuntu-branches/ubuntu/vivid/mir/vivid

« back to all changes in this revision

Viewing changes to src/server/graphics/nested/nested_platform.cpp

Committer: Package Import Robot
Author(s): Ubuntu daily release
Date: 2014-02-04 14:49:07 UTC
mto: This revision was merged to the branch mainline in revision 61.
Revision ID: package-import@ubuntu.com-20140204144907-o3ruhix0ey26lchl

Tags: upstream-0.1.4+14.04.20140204

Import upstream version 0.1.4+14.04.20140204

files added:
.clang-format

examples/basic_server_configuration.cpp

examples/basic_server_configuration.h

examples/pixel_format_selector.cpp

examples/pixel_format_selector.h

examples/translucent_server.cpp

examples/translucent_server_configuration.cpp

examples/translucent_server_configuration.h

include/client/mir

include/client/mir/client

include/client/mir/client/private.h

include/client/mir_toolkit/mir_screencast.h

include/platform/mir/graphics/pixel_format_utils.h

include/platform/mir/graphics/renderable.h

include/platform/mir/udev

include/platform/mir/udev/wrapper.h

include/server/mir/compositor/compositor_report.h

include/server/mir/frontend/connected_sessions.h

include/server/mir/frontend/fd_sets.h

include/server/mir/frontend/message_processor.h

include/server/mir/frontend/protobuf_message_sender.h

include/server/mir/frontend/protobuf_session_creator.h

include/server/mir/frontend/template_protobuf_message_processor.h

include/server/mir/time/clock.h

include/shared/mir/logging/input_timestamp.h

include/test/mir_test_doubles/mock_compositor_report.h

include/test/mir_test_doubles/mock_renderable.h

include/test/mir_test_doubles/mock_udev_device.h

include/test/mir_test_doubles/null_client_buffer.h

include/test/mir_test_doubles/stub_renderable.h

include/test/mir_test_framework/using_stub_client_platform.h

src/client/api_impl.h

src/client/api_impl_types.h

src/client/egl_native_window_factory.h

src/client/mir_screencast.cpp

src/client/mir_screencast.h

src/client/mir_screencast_api.cpp

src/client/private.cpp

src/platform/graphics/android/hwc_device.cpp

src/platform/graphics/android/hwc_device.h

src/platform/graphics/android/hwc_fb_device.cpp

src/platform/graphics/android/hwc_fb_device.h

src/platform/graphics/android/hwc_layers.cpp

src/platform/graphics/android/hwc_layers.h

src/platform/graphics/pixel_format_utils.cpp

src/platform/udev_wrapper.cpp

src/server/compositor/null_compositor_report.cpp

src/server/frontend/protobuf_responder.cpp

src/server/frontend/protobuf_responder.h

src/server/logging/compositor_report.cpp

src/server/logging/compositor_report.h

src/shared/logging/input_timestamp.cpp

src/utils

src/utils/CMakeLists.txt

src/utils/out.c

src/utils/ping.c

tests/acceptance-tests/test_client_screencast.cpp

tests/acceptance-tests/test_protobuf.cpp

tests/acceptance-tests/test_protobuf.proto

tests/mir_test_framework/using_stub_client_platform.cpp

tests/unit-tests/client/test_mir_screencast.cpp

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

tests/unit-tests/graphics/android/hwc_struct_helpers.h

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

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

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

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

tests/unit-tests/graphics/test_pixel_format_utils.cpp

tests/unit-tests/logging/test_compositor_report.cpp

tests/unit-tests/test_udev_wrapper.cpp

files removed:
3rd_party/android-deps/androidfw

3rd_party/android-deps/cutils/native_handle.h

3rd_party/android-deps/hardware

3rd_party/android-deps/hardware/fb.h

3rd_party/android-deps/hardware/gralloc.h

3rd_party/android-deps/hardware/hardware.h

3rd_party/android-deps/hardware/hwcomposer.h

3rd_party/android-deps/hardware/hwcomposer_defs.h

3rd_party/android-deps/hardware/hwcomposer_v0.h

3rd_party/android-deps/pixelflinger

3rd_party/android-deps/pixelflinger/format.h

3rd_party/android-deps/pixelflinger/pixelflinger.h

3rd_party/android-deps/sync

3rd_party/android-deps/sync/sync.h

3rd_party/android-deps/sys

3rd_party/android-deps/sys/limits.h

3rd_party/android-deps/system

3rd_party/android-deps/system/graphics.h

3rd_party/android-deps/system/window.h

include/server/mir/time/time_source.h

src/platform/graphics/android/hwc10_device.cpp

src/platform/graphics/android/hwc10_device.h

src/platform/graphics/android/hwc11_device.cpp

src/platform/graphics/android/hwc11_device.h

src/platform/graphics/mesa/udev_wrapper.cpp

src/platform/graphics/mesa/udev_wrapper.h

src/server/frontend/connected_sessions.h

src/server/frontend/fd_sets.h

src/server/frontend/message_processor.h

src/server/frontend/null_message_processor.cpp

src/server/frontend/protobuf_session_creator.h

tests/unit-tests/graphics/android/hwc_struct_helper-inl.h

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

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

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

files modified:
3rd_party/android-input/android/frameworks/base/services/input/InputEventPrinter.h

3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp

3rd_party/android-input/android/frameworks/base/services/input/InputReader.h

CMakeLists.txt

benchmarks/CMakeLists.txt

cmake/FindLibHardware.cmake

cmake/LinuxCrossCompile.cmake

cmake/MirCommon.cmake

cross-compile-chroot.sh

doc/building_source_for_android.md

doc/mainpage.md

doc/using_mir_on_pc.md

examples/CMakeLists.txt

examples/basic.c

examples/basic_server.cpp

examples/demo-shell/window_manager.cpp

examples/eglapp.c

examples/flicker.c

examples/multiwin.c

examples/render_surfaces.cpp

examples/scroll.cpp

examples/server_configuration.cpp

guides/cppguide.xml

include/platform/mir/graphics/display_buffer.h

include/platform/mir/graphics/display_configuration.h

include/platform/mir/options/option.h

include/platform/mir/options/program_option.h

include/server/mir/default_configuration_options.h

include/server/mir/default_server_configuration.h

include/server/mir/logging/message_processor_report.h

include/server/mir/shell/surface.h

include/server/mir/time/high_resolution_clock.h

include/shared/mir_toolkit/client_types.h

include/shared/mir_toolkit/common.h

include/test/mir_test_doubles/mock_android_native_buffer.h

include/test/mir_test_doubles/mock_client_surface.h

include/test/mir_test_doubles/mock_display_buffer.h

include/test/mir_test_doubles/mock_display_device.h

include/test/mir_test_doubles/mock_gl.h

include/test/mir_test_doubles/mock_hwc_composer_device_1.h

include/test/mir_test_doubles/mock_surface_renderer.h

include/test/mir_test_doubles/null_display_buffer.h

include/test/mir_test_doubles/null_display_configuration.h

include/test/mir_test_doubles/stub_display_configuration.h

include/test/mir_test_doubles/stub_display_device.h

include/test/mir_test_doubles/stub_ipc_factory.h

include/test/mir_test_framework/in_process_server.h

include/test/mir_test_framework/testing_client_configuration.h

src/CMakeLists.txt

src/client/CMakeLists.txt

src/client/android/client_surface_interpreter.cpp

src/client/client_buffer_depository.h

src/client/client_platform.h

src/client/connection_configuration.h

src/client/default_connection_configuration.cpp

src/client/default_connection_configuration.h

src/client/display_configuration.cpp

src/client/logging/input_receiver_report.cpp

src/client/mesa/client_buffer.cpp

src/client/mesa/native_surface.cpp

src/client/mir_client_library.cpp

src/client/mir_client_surface.h

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/rpc/make_rpc_channel.h

src/client/rpc/make_socket_rpc_channel.cpp

src/client/rpc/mir_basic_rpc_channel.cpp

src/client/rpc/mir_basic_rpc_channel.h

src/client/rpc/mir_socket_rpc_channel.cpp

src/client/rpc/mir_socket_rpc_channel.h

src/platform/CMakeLists.txt

src/platform/graphics/CMakeLists.txt

src/platform/graphics/android/CMakeLists.txt

src/platform/graphics/android/android_display.cpp

src/platform/graphics/android/android_display_configuration.cpp

src/platform/graphics/android/android_display_configuration.h

src/platform/graphics/android/buffer.cpp

src/platform/graphics/android/buffer.h

src/platform/graphics/android/display_buffer.cpp

src/platform/graphics/android/display_buffer.h

src/platform/graphics/android/display_device.h

src/platform/graphics/android/display_resource_factory.h

src/platform/graphics/android/fb_device.cpp

src/platform/graphics/android/fb_device.h

src/platform/graphics/android/framebuffers.cpp

src/platform/graphics/android/hwc_layerlist.cpp

src/platform/graphics/android/hwc_layerlist.h

src/platform/graphics/android/output_builder.cpp

src/platform/graphics/android/resource_factory.cpp

src/platform/graphics/android/resource_factory.h

src/platform/graphics/display_configuration.cpp

src/platform/graphics/mesa/CMakeLists.txt

src/platform/graphics/mesa/cursor.cpp

src/platform/graphics/mesa/display.cpp

src/platform/graphics/mesa/display.h

src/platform/graphics/mesa/display_buffer.cpp

src/platform/graphics/mesa/display_buffer.h

src/platform/graphics/mesa/display_helpers.cpp

src/platform/graphics/mesa/display_helpers.h

src/platform/graphics/mesa/overlapping_output_grouping.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_display_configuration.h

src/server/CMakeLists.txt

src/server/compositor/CMakeLists.txt

src/server/compositor/bypass.cpp

src/server/compositor/default_configuration.cpp

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/default_display_buffer_compositor.h

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

src/server/compositor/multi_threaded_compositor.h

src/server/compositor/renderer.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/CMakeLists.txt

src/server/frontend/default_configuration.cpp

src/server/frontend/event_sender.cpp

src/server/frontend/message_sender.h

src/server/frontend/protobuf_buffer_packer.cpp

src/server/frontend/protobuf_ipc_factory.h

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_message_processor.h

src/server/frontend/protobuf_session_creator.cpp

src/server/frontend/published_socket_connector.cpp

src/server/frontend/published_socket_connector.h

src/server/frontend/session_mediator.cpp

src/server/frontend/socket_messenger.cpp

src/server/frontend/socket_session.cpp

src/server/frontend/socket_session.h

src/server/frontend/surface.cpp

src/server/graphics/default_configuration.cpp

src/server/graphics/default_display_configuration_policy.cpp

src/server/graphics/nested/nested_display.cpp

src/server/graphics/nested/nested_display.h

src/server/graphics/nested/nested_display_configuration.cpp

src/server/graphics/nested/nested_display_configuration.h

src/server/graphics/nested/nested_output.cpp

src/server/graphics/nested/nested_output.h

src/server/graphics/nested/nested_platform.cpp

src/server/graphics/nested/nested_platform.h

src/server/graphics/offscreen/display.cpp

src/server/graphics/offscreen/display_buffer.cpp

src/server/graphics/offscreen/display_buffer.h

src/server/graphics/offscreen/display_configuration.cpp

src/server/graphics/offscreen/display_configuration.h

src/server/input/CMakeLists.txt

src/server/input/default_configuration.cpp

src/server/logging/CMakeLists.txt

src/server/logging/default_configuration.cpp

src/server/logging/input_report.cpp

src/server/logging/message_processor_report.cpp

src/server/options/program_option.cpp

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/default_configuration.cpp

src/server/scene/mediating_display_changer.cpp

src/server/scene/surface_impl.cpp

src/server/scene/surface_impl.h

src/server/shell/graphics_display_layout.cpp

src/shared/graphics/android/CMakeLists.txt

src/shared/input/CMakeLists.txt

src/shared/logging/CMakeLists.txt

src/shared/protobuf/mir_protobuf.proto

src/shared/protobuf/mir_protobuf_wire.proto

tests/CMakeLists.txt

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_focus_notification.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/test_client_render.cpp

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

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

tests/integration-tests/test_session.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/mir_test/display_config_matchers.cpp

tests/mir_test_doubles/mock_gl.cpp

tests/mir_test_doubles/test_protobuf_socket_server.cpp

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/in_process_server.cpp

tests/mir_test_framework/process.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/mir_test_framework/testing_process_manager.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/android_input/input_reader.cpp

tests/unit-tests/client/CMakeLists.txt

tests/unit-tests/client/android/test_client_surface_interpreter.cpp

tests/unit-tests/client/mesa/test_client_buffer.cpp

tests/unit-tests/client/mesa/test_native_surface.cpp

tests/unit-tests/client/test_client_display_conf.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/compositor/test_bypass.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_switching_bundle.cpp

tests/unit-tests/frontend/test_event_sender.cpp

tests/unit-tests/frontend/test_published_socket_connector.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/frontend/test_socket_session.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_buffer_tex_bind.cpp

tests/unit-tests/graphics/android/test_fb_simple_swapper.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_hwc_layerlist.cpp

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

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

tests/unit-tests/graphics/mesa/test_cursor.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_overlapping_output_grouping.cpp

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

tests/unit-tests/graphics/offscreen/test_offscreen_display.cpp

tests/unit-tests/graphics/test_default_display_configuration_policy.cpp

tests/unit-tests/graphics/test_display_configuration.cpp

tests/unit-tests/logging/CMakeLists.txt

tests/unit-tests/logging/message_processor_report.cpp

tests/unit-tests/options/test_program_option.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tools/setup-partial-armhf-chroot.sh

Show diffs side-by-side

added added

removed removed

src/server/graphics/nested/nested_platform.cpp

113

return native_platform->create_buffer_allocator(buffer_initializer);

114

}

115

116

std::shared_ptr<mg::Display> mgn::NestedPlatform::create_display(std::shared_ptr<mg::DisplayConfigurationPolicy> const& /*initial_conf_policy*/)

116

std::shared_ptr<mg::Display> mgn::NestedPlatform::create_display(std::shared_ptr<mg::DisplayConfigurationPolicy> const& conf_policy)

117

{

118

return std::make_shared<mgn::NestedDisplay>(connection, event_handler, display_report);

118

return std::make_shared<mgn::NestedDisplay>(connection, event_handler, display_report, conf_policy);

119

}

120

121

std::shared_ptr<mg::PlatformIPCPackage> mgn::NestedPlatform::get_ipc_package()

Older »