← Back to branch summary

~vanvugt/mir/nested-subpixel-arrangement

~vanvugt/mir/nested-subpixel-arrangement

« back to all changes in this revision

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

Committer: Daniel van Vugt
Date: 2017-02-28 08:53:57 UTC
mfrom: (4041.1.15 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20170228085357-tmgbgq5o4ecbxzkr

Merge latest trunk

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

include/platform/mir/input/touchscreen_settings.h

files modified:
cmake/Doxygen.cmake

doc/footer.html.in

examples/animated_cursor_demo_client.c

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/mir_cursor_configuration.h

include/client/mir_toolkit/mir_input_device.h

include/client/mir_toolkit/mir_window.h

include/client/mir_toolkit/rs/mir_render_surface.h

include/common/mir/input/mir_keyboard_config.h

include/platform/mir/input/input_device.h

include/server/mir/frontend/buffer_stream.h

include/server/mir/input/device.h

include/server/mir/input/input_dispatcher.h

include/server/mir/scene/session.h

include/test/mir/test/doubles/stub_input_device.h

include/test/mir/test/doubles/stub_session.h

playground/egldiamond_render_surface.c

src/client/connection_surface_map.cpp

src/client/connection_surface_map.h

src/client/cursor_configuration.h

src/client/mir_cursor_api.cpp

src/client/mir_input_device_api.cpp

src/client/mir_render_surface_api.cpp

src/client/mir_surface.cpp

src/client/mir_surface_api.cpp

src/client/symbols.map

src/common/input/mir_input_config.cpp

src/common/input/mir_keyboard_config.cpp

src/common/symbols.map

src/cookie/authority.cpp

src/cookie/format.h

src/include/cookie/mir/cookie/blob.h

src/include/server/mir/compositor/buffer_stream.h

src/platform/options/default_configuration.cpp

src/platforms/common/server/shm_buffer.cpp

src/platforms/evdev/libinput_device.cpp

src/platforms/evdev/libinput_device.h

src/platforms/mesa/server/kms/display_buffer.cpp

src/platforms/mesa/server/kms/display_buffer.h

src/platforms/mesa/server/x11/input/input_device.cpp

src/platforms/mesa/server/x11/input/input_device.h

src/server/CMakeLists.txt

src/server/compositor/multi_monitor_arbiter.cpp

src/server/compositor/stream.cpp

src/server/compositor/stream.h

src/server/frontend/session_mediator.cpp

src/server/graphics/nested/CMakeLists.txt

src/server/graphics/nested/buffer.cpp

src/server/graphics/nested/input_platform.cpp

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/platform.cpp

src/server/input/config_changer.cpp

src/server/input/default_device.cpp

src/server/input/default_device.h

src/server/scene/application_session.cpp

src/server/scene/application_session.h

src/server/scene/session_manager.cpp

tests/acceptance-tests/test_client_cursor_api.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_surfaces.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/include/mir/test/doubles/mock_buffer_stream.h

tests/include/mir/test/doubles/mock_input_device.h

tests/include/mir/test/doubles/mock_scene_session.h

tests/include/mir/test/doubles/stub_buffer.h

tests/include/mir/test/doubles/stub_buffer_stream.h

tests/mir_test_doubles/mock_input_device.cpp

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/fake_input_device_impl.h

tests/mir_test_framework/stub_session.cpp

tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp

tests/unit-tests/input/test_config_changer.cpp

tests/unit-tests/input/test_default_device.cpp

tests/unit-tests/input/test_key_repeat_dispatcher.cpp

tests/unit-tests/platforms/mesa/kms/test_display.cpp

tests/unit-tests/platforms/nested/test_buffer.cpp

Show diffs side-by-side

added added

removed removed

src/server/graphics/nested/platform.cpp

75

75

76

76

std::shared_ptr<mg::Buffer> alloc_buffer(mg::BufferProperties const& properties) override

77

77

{

78

if (passthrough_candidate(properties.size, properties.usage))

79

return std::make_shared<mgn::Buffer>(connection, properties);

80

else

81

return guest_allocator->alloc_buffer(properties);

78

return guest_allocator->alloc_buffer(properties);

82

79

}

83

80

84

81

std::shared_ptr<mg::Buffer> alloc_buffer(

Older »