lp://qastaging/~kdub/mir/dedupe-android-glcontexts
Created by
Kevin DuBois
and last modified
Only
Kevin DuBois
can upload to this branch. If you are
Kevin DuBois
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Alexandros Frantzis (community): Approve
- Daniel van Vugt: Approve
- PS Jenkins bot (community): Approve (continuous-integration)
-
Diff: 819 lines (+291/-204)15 files modifiedinclude/test/mir_test_doubles/stub_display_buffer_factory.h (+1/-1)
src/server/graphics/android/CMakeLists.txt (+1/-0)
src/server/graphics/android/android_display.cpp (+6/-141)
src/server/graphics/android/android_display.h (+2/-7)
src/server/graphics/android/android_display_buffer_factory.h (+2/-1)
src/server/graphics/android/display_buffer.cpp (+7/-25)
src/server/graphics/android/display_buffer.h (+3/-5)
src/server/graphics/android/display_buffer_factory.cpp (+2/-2)
src/server/graphics/android/display_buffer_factory.h (+1/-1)
src/server/graphics/android/display_device.h (+2/-0)
src/server/graphics/android/gl_context.cpp (+155/-0)
src/server/graphics/android/gl_context.h (+78/-0)
tests/unit-tests/graphics/android/test_android_fb.cpp (+3/-0)
tests/unit-tests/graphics/android/test_display_buffer_factory.cpp (+6/-5)
tests/unit-tests/graphics/android/test_hwc_display.cpp (+22/-16)
- Mir development team: Pending requested
-
Diff: 19563 lines (+7702/-3268) (has conflicts)249 files modified3rd_party/android-input/android/CMakeLists.txt (+1/-0)
3rd_party/android-input/android/frameworks/base/include/androidfw/Input.h (+5/-2)
3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h (+10/-7)
3rd_party/android-input/android/frameworks/base/include/androidfw/IntSet.h (+104/-0)
3rd_party/android-input/android/frameworks/base/include/androidfw/VelocityControl.h (+2/-0)
3rd_party/android-input/android/frameworks/base/include/androidfw/VelocityTracker.h (+24/-22)
3rd_party/android-input/android/frameworks/base/services/input/InputDevice.cpp (+6/-3)
3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp (+40/-33)
3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.h (+6/-6)
3rd_party/android-input/android/frameworks/base/services/input/InputEventPrinter.h (+138/-0)
3rd_party/android-input/android/frameworks/base/services/input/InputListener.h (+1/-1)
3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp (+409/-354)
3rd_party/android-input/android/frameworks/base/services/input/InputReader.h (+68/-40)
3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp (+8/-8)
3rd_party/android-input/android/frameworks/base/services/input/IntSet.cpp (+123/-0)
3rd_party/android-input/android/frameworks/base/services/input/PointerController.cpp (+5/-8)
3rd_party/android-input/android/frameworks/base/services/input/PointerController.h (+2/-5)
3rd_party/android-input/android/frameworks/base/services/input/VelocityControl.cpp (+2/-2)
3rd_party/android-input/android/frameworks/base/services/input/VelocityTracker.cpp (+80/-83)
debian/changelog (+130/-0)
debian/control (+8/-0)
debian/libmirserver11.install (+4/-0)
doc/Doxyfile.in (+192/-82)
doc/component_reports.md (+1/-0)
examples/CMakeLists.txt (+1/-0)
examples/buffer_render_target.cpp (+3/-1)
examples/buffer_render_target.h (+1/-0)
examples/demo-inprocess-surface-client/inprocess_egl_client.cpp (+5/-1)
examples/demo-shell/demo_shell.cpp (+3/-0)
examples/demo_input_filter.cpp (+25/-3)
examples/render_surfaces.cpp (+19/-17)
include/platform/mir/graphics/buffer_ipc_packer.h (+2/-0)
include/server/mir/compositor/buffer_stream.h (+1/-0)
include/server/mir/compositor/scene.h (+1/-1)
include/server/mir/default_server_configuration.h (+21/-7)
include/server/mir/frontend/shell.h (+2/-2)
include/server/mir/frontend/surface.h (+4/-21)
include/server/mir/shell/session_manager.h (+1/-12)
include/server/mir/shell/surface.h (+21/-68)
include/server/mir/shell/surface_controller.h (+2/-2)
include/server/mir/surfaces/surfaces_report.h (+63/-0)
include/shared/mir/geometry/dimensions.h (+1/-0)
include/shared/mir/geometry/displacement.h (+2/-6)
include/shared/mir/geometry/point.h (+2/-7)
include/shared/mir/geometry/rectangle.h (+2/-7)
include/shared/mir/geometry/size.h (+2/-7)
include/shared/mir/graphics/android/mir_native_window.h (+2/-0)
include/shared/mir/input/input_platform.h (+3/-1)
include/shared/mir/input/input_receiver_report.h (+48/-0)
include/shared/mir/input/null_input_receiver_report.h (+46/-0)
include/shared/mir_toolkit/mir_native_buffer.h (+6/-2)
include/test/mir_test/client_event_matchers.h (+119/-0)
include/test/mir_test/draw/draw_pattern_checkered-inl.h (+10/-5)
include/test/mir_test_doubles/mock_buffer_packer.h (+1/-0)
include/test/mir_test_doubles/mock_buffer_stream.h (+1/-0)
include/test/mir_test_doubles/mock_display_device.h (+1/-2)
include/test/mir_test_doubles/mock_egl.h (+17/-0)
include/test/mir_test_doubles/mock_framebuffer_bundle.h (+50/-0)
include/test/mir_test_doubles/mock_frontend_surface.h (+1/-1)
include/test/mir_test_doubles/mock_hwc_composer_device_1.h (+28/-4)
include/test/mir_test_doubles/mock_surface.h (+4/-4)
include/test/mir_test_doubles/mock_surface_controller.h (+1/-1)
include/test/mir_test_doubles/mock_surface_state.h (+1/-0)
include/test/mir_test_doubles/stub_buffer_stream.h (+4/-0)
include/test/mir_test_doubles/stub_display_buffer_factory.h (+75/-0)
include/test/mir_test_doubles/stub_display_configuration.h (+11/-4)
include/test/mir_test_doubles/stub_display_device.h (+13/-1)
include/test/mir_test_doubles/stub_surface.h (+1/-1)
include/test/mir_test_doubles/stub_surface_builder.h (+16/-3)
include/test/mir_test_doubles/stub_surface_controller.h (+1/-1)
include/test/mir_test_framework/input_testing_server_configuration.h (+2/-10)
src/client/CMakeLists.txt (+1/-0)
src/client/android/android_client_buffer.cpp (+2/-0)
src/client/android/android_client_buffer_factory.cpp (+7/-1)
src/client/android/client_surface_interpreter.cpp (+1/-1)
src/client/default_connection_configuration.cpp (+20/-2)
src/client/default_connection_configuration.h (+9/-0)
src/client/gbm/gbm_client_buffer_factory.cpp (+6/-1)
src/client/logging/input_receiver_report.cpp (+125/-0)
src/client/logging/input_receiver_report.h (+54/-0)
src/client/mir_client_library.cpp (+1/-1)
src/client/mir_connection.cpp (+6/-8)
src/client/mir_connection.h (+2/-2)
src/client/mir_surface.cpp (+14/-3)
src/server/CMakeLists.txt (+5/-0)
src/server/compositor/buffer_stream_surfaces.cpp (+5/-0)
src/server/compositor/buffer_stream_surfaces.h (+1/-0)
src/server/frontend/CMakeLists.txt (+0/-1)
src/server/frontend/default_configuration.cpp (+99/-10)
src/server/frontend/protobuf_buffer_packer.cpp (+6/-0)
src/server/frontend/protobuf_buffer_packer.h (+1/-0)
src/server/frontend/published_socket_connector.cpp (+5/-5)
src/server/frontend/published_socket_connector.h (+3/-3)
src/server/frontend/session_mediator.cpp (+66/-32)
src/server/frontend/session_mediator.h (+8/-4)
src/server/frontend/surface.cpp (+1/-16)
src/server/graphics/android/CMakeLists.txt (+3/-1)
src/server/graphics/android/android_buffer_allocator.cpp (+1/-1)
src/server/graphics/android/android_display.cpp (+18/-12)
src/server/graphics/android/android_display.h (+21/-1)
src/server/graphics/android/android_display_buffer_factory.h (+14/-6)
src/server/graphics/android/android_graphic_buffer_allocator.h (+1/-1)
src/server/graphics/android/android_platform.cpp (+36/-1)
src/server/graphics/android/android_platform.h (+15/-0)
src/server/graphics/android/display_buffer.cpp (+62/-0)
src/server/graphics/android/display_buffer.h (+58/-0)
src/server/graphics/android/display_buffer_factory.cpp (+79/-1)
src/server/graphics/android/display_buffer_factory.h (+26/-3)
src/server/graphics/android/display_device.h (+9/-0)
src/server/graphics/android/display_resource_factory.h (+16/-0)
src/server/graphics/android/fb_device.cpp (+18/-13)
src/server/graphics/android/fb_device.h (+5/-1)
src/server/graphics/android/framebuffer_bundle.h (+16/-11)
src/server/graphics/android/framebuffers.cpp (+116/-10)
src/server/graphics/android/framebuffers.h (+18/-13)
src/server/graphics/android/gl_context.cpp (+155/-0)
src/server/graphics/android/gl_context.h (+78/-0)
src/server/graphics/android/graphic_buffer_allocator.h (+1/-1)
src/server/graphics/android/hwc10_device.cpp (+18/-22)
src/server/graphics/android/hwc10_device.h (+28/-4)
src/server/graphics/android/hwc11_device.cpp (+34/-40)
src/server/graphics/android/hwc11_device.h (+22/-2)
src/server/graphics/android/hwc_common_device.cpp (+1/-7)
src/server/graphics/android/hwc_layerlist.cpp (+89/-102)
src/server/graphics/android/hwc_layerlist.h (+38/-59)
src/server/graphics/android/resource_factory.cpp (+67/-2)
src/server/graphics/android/resource_factory.h (+28/-0)
src/server/graphics/android/server_render_window.cpp (+13/-4)
src/server/graphics/android/server_render_window.h (+12/-0)
src/server/graphics/gbm/gbm_buffer.cpp (+4/-0)
src/server/graphics/gbm/gbm_platform.cpp (+1/-0)
src/server/graphics/gbm/linux_virtual_terminal.cpp (+11/-1)
src/server/graphics/nested/nested_display.cpp (+25/-3)
src/server/input/android/dummy_android_pointer_controller.h (+2/-4)
src/server/logging/default_configuration.cpp (+91/-0)
src/server/logging/display_report.cpp (+3/-2)
src/server/shell/CMakeLists.txt (+1/-3)
src/server/shell/default_configuration.cpp (+219/-0)
src/server/shell/default_session_container.cpp (+27/-0)
src/server/shell/default_session_container.h (+3/-1)
src/server/shell/focus_sequence.h (+0/-51)
src/server/shell/global_event_sender.cpp (+9/-5)
src/server/shell/global_event_sender.h (+7/-9)
src/server/shell/mediating_display_changer.cpp (+5/-0)
src/server/shell/session_container.h (+4/-0)
src/server/shell/session_manager.cpp (+7/-7)
src/server/surfaces/CMakeLists.txt (+7/-1)
src/server/surfaces/basic_surface.h (+47/-3)
src/server/surfaces/default_configuration.cpp (+140/-0)
src/server/surfaces/mutable_surface_state.h (+1/-0)
src/server/surfaces/surface.cpp (+21/-1)
src/server/surfaces/surface.h (+81/-0)
src/server/surfaces/surface_allocator.cpp (+2/-2)
src/server/surfaces/surface_allocator.h (+1/-1)
src/server/surfaces/surface_builder.h (+11/-8)
src/server/surfaces/surface_controller.cpp (+8/-3)
src/server/surfaces/surface_controller.h (+11/-2)
src/server/surfaces/surface_data.cpp (+10/-0)
src/server/surfaces/surface_data.h (+1/-0)
src/server/surfaces/surface_factory.h (+2/-2)
src/server/surfaces/surface_impl.cpp (+47/-29)
src/server/surfaces/surface_impl.h (+114/-0)
src/server/surfaces/surface_source.cpp (+9/-4)
src/server/surfaces/surface_source.h (+13/-9)
src/server/surfaces/surface_stack.cpp (+14/-7)
src/server/surfaces/surface_stack.h (+9/-5)
src/server/surfaces/surface_stack_model.h (+4/-4)
src/server/surfaces/surfaces_report.cpp (+129/-0)
src/server/surfaces/surfaces_report.h (+59/-0)
src/shared/geometry/CMakeLists.txt (+1/-0)
src/shared/geometry/ostream.cpp (+60/-0)
src/shared/geometry/rectangles.cpp (+0/-9)
src/shared/graphics/android/mir_native_window.cpp (+22/-9)
src/shared/input/android/android_input_platform.cpp (+11/-3)
src/shared/input/android/android_input_platform.h (+4/-1)
src/shared/input/android/android_input_receiver.cpp (+9/-2)
src/shared/input/android/android_input_receiver.h (+7/-2)
src/shared/protobuf/mir_protobuf.proto (+8/-32)
tests/acceptance-tests/test_client_authorization.cpp (+9/-57)
tests/acceptance-tests/test_client_focus_notification.cpp (+13/-46)
tests/acceptance-tests/test_client_input.cpp (+393/-617)
tests/acceptance-tests/test_client_library.cpp (+75/-0)
tests/acceptance-tests/test_display_configuration.cpp (+6/-16)
tests/acceptance-tests/test_focus_selection.cpp (+13/-51)
tests/acceptance-tests/test_server_shutdown.cpp (+1/-1)
tests/draw/android_graphics.cpp (+2/-1)
tests/draw/patterns.cpp (+12/-10)
tests/integration-tests/client/test_client_render.cpp (+76/-37)
tests/integration-tests/compositor/test_buffer_stream.cpp (+73/-0)
tests/integration-tests/graphics/android/test_display_integration.cpp (+58/-10)
tests/integration-tests/graphics/android/test_internal_client.cpp (+21/-4)
tests/integration-tests/graphics/gbm/test_buffer_integration.cpp (+5/-9)
tests/integration-tests/shell/test_session.cpp (+6/-12)
tests/integration-tests/shell/test_session_manager.cpp (+9/-4)
tests/integration-tests/test_display_info.cpp (+20/-16)
tests/integration-tests/test_drm_auth_magic.cpp (+2/-17)
tests/integration-tests/test_surfaceloop.cpp (+9/-20)
tests/integration-tests/test_swapinterval.cpp (+1/-0)
tests/mir_test_doubles/mock_egl.cpp (+1/-1)
tests/mir_test_framework/input_testing_server_options.cpp (+0/-112)
tests/mir_test_framework/testing_server_options.cpp (+19/-18)
tests/unit-tests/android_input/CMakeLists.txt (+1/-0)
tests/unit-tests/android_input/input_reader.cpp (+156/-98)
tests/unit-tests/android_input/int_set.cpp (+133/-0)
tests/unit-tests/client/android/test_android_native_window.cpp (+21/-3)
tests/unit-tests/client/android/test_client_surface_interpreter.cpp (+16/-0)
tests/unit-tests/client/gbm/test_gbm_client_buffer.cpp (+21/-0)
tests/unit-tests/client/input/test_android_input_receiver.cpp (+8/-5)
tests/unit-tests/client/input/test_android_input_receiver_thread.cpp (+5/-2)
tests/unit-tests/client/test_android_client_buffer_factory.cpp (+5/-5)
tests/unit-tests/client/test_client_mir_surface.cpp (+47/-0)
tests/unit-tests/client/test_mir_connection.cpp (+15/-4)
tests/unit-tests/compositor/test_buffer_stream.cpp (+12/-0)
tests/unit-tests/compositor/test_gl_renderer.cpp (+1/-1)
tests/unit-tests/draw/test_draw_patterns.cpp (+10/-11)
tests/unit-tests/frontend/CMakeLists.txt (+4/-0)
tests/unit-tests/frontend/test_protobuf_buffer_packer.cpp (+3/-0)
tests/unit-tests/frontend/test_session_mediator.cpp (+14/-14)
tests/unit-tests/frontend/test_session_mediator_android.cpp (+4/-18)
tests/unit-tests/frontend/test_session_mediator_gbm.cpp (+4/-19)
tests/unit-tests/graphics/android/CMakeLists.txt (+1/-0)
tests/unit-tests/graphics/android/test_android_fb.cpp (+214/-2)
tests/unit-tests/graphics/android/test_android_platform.cpp (+26/-1)
tests/unit-tests/graphics/android/test_display_buffer_factory.cpp (+215/-0)
tests/unit-tests/graphics/android/test_fb_device.cpp (+58/-15)
tests/unit-tests/graphics/android/test_fb_simple_swapper.cpp (+179/-106)
tests/unit-tests/graphics/android/test_hwc10_device.cpp (+47/-12)
tests/unit-tests/graphics/android/test_hwc11_device.cpp (+87/-34)
tests/unit-tests/graphics/android/test_hwc_device.cpp (+46/-62)
tests/unit-tests/graphics/android/test_hwc_display.cpp (+134/-21)
tests/unit-tests/graphics/android/test_hwc_layerlist.cpp (+118/-136)
tests/unit-tests/graphics/android/test_resource_factory.cpp (+69/-28)
tests/unit-tests/graphics/android/test_server_interpreter.cpp (+47/-14)
tests/unit-tests/graphics/gbm/test_gbm_platform.cpp (+4/-0)
tests/unit-tests/graphics/gbm/test_linux_virtual_terminal.cpp (+58/-5)
tests/unit-tests/graphics/test_display.cpp (+21/-4)
tests/unit-tests/logging/test_display_report.cpp (+2/-1)
tests/unit-tests/shell/CMakeLists.txt (+1/-2)
tests/unit-tests/shell/test_default_focus_mechanism.cpp (+5/-1)
tests/unit-tests/shell/test_global_event_sender.cpp (+7/-2)
tests/unit-tests/shell/test_mediating_display_changer.cpp (+5/-0)
tests/unit-tests/shell/test_session_manager.cpp (+23/-25)
tests/unit-tests/shell/test_the_session_container_implementation.cpp (+39/-30)
tests/unit-tests/surfaces/CMakeLists.txt (+1/-0)
tests/unit-tests/surfaces/test_surface.cpp (+54/-0)
tests/unit-tests/surfaces/test_surface_controller.cpp (+10/-5)
tests/unit-tests/surfaces/test_surface_data.cpp (+18/-0)
tests/unit-tests/surfaces/test_surface_impl.cpp (+46/-30)
tests/unit-tests/surfaces/test_surface_stack.cpp (+2/-2)
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/mir/0.1