lp:~kdub/mir/share-occlusion-with-examples
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.
- Alberto Aguirre (community): Disapprove
- Alexandros Frantzis (community): Disapprove
- Alan Griffiths: Disapprove
- PS Jenkins bot (community): Approve (continuous-integration)
-
Diff: 213 lines (+36/-22)5 files modifiedexamples/CMakeLists.txt (+4/-0)
src/server/compositor/default_display_buffer_compositor.cpp (+1/-1)
src/server/compositor/occlusion.cpp (+15/-9)
src/server/compositor/occlusion.h (+5/-1)
tests/unit-tests/compositor/test_occlusion.cpp (+11/-11)
- Mir development team: Pending requested
-
Diff: 13256 lines (+4633/-2359) (has conflicts)235 files modified3rd_party/android-deps/std/Thread.h (+5/-2)
examples/CMakeLists.txt (+4/-0)
examples/buffer_render_target.cpp (+1/-1)
examples/demo-shell/demo_renderer.cpp (+28/-13)
examples/demo-shell/demo_renderer.h (+2/-1)
examples/demo-shell/demo_shell.cpp (+3/-2)
examples/eglcounter.cpp (+3/-2)
examples/eglflash.c (+21/-11)
examples/egltriangle.c (+3/-2)
include/platform/mir/graphics/buffer.h (+2/-1)
include/platform/mir/graphics/buffer_id.h (+1/-1)
include/platform/mir/graphics/display_buffer.h (+6/-4)
include/server/mir/asio_main_loop.h (+2/-0)
include/server/mir/compositor/buffer_stream.h (+3/-1)
include/server/mir/compositor/destination_alpha.h (+36/-0)
include/server/mir/compositor/frame_dropping_policy.h (+69/-0)
include/server/mir/compositor/frame_dropping_policy_factory.h (+57/-0)
include/server/mir/compositor/gl_renderer.h (+8/-2)
include/server/mir/compositor/renderer_factory.h (+3/-1)
include/server/mir/default_server_configuration.h (+3/-0)
include/server/mir/frontend/session_mediator_report.h (+2/-0)
include/server/mir/frontend/surface.h (+4/-10)
include/server/mir/graphics/cursor_images.h (+2/-0)
include/server/mir/scene/null_surface_observer.h (+1/-0)
include/server/mir/scene/surface.h (+4/-0)
include/server/mir/scene/surface_observer.h (+5/-0)
include/server/mir/time/timer.h (+8/-1)
include/shared/mir/thread_name.h (+29/-0)
include/test/mir_test/barrier.h (+61/-0)
include/test/mir_test/current_thread_name.h (+34/-0)
include/test/mir_test/fake_clock.h (+72/-0)
include/test/mir_test/signal.h (+63/-0)
include/test/mir_test_doubles/fake_ipc_factory.h (+10/-8)
include/test/mir_test_doubles/fake_renderable.h (+31/-6)
include/test/mir_test_doubles/mock_buffer.h (+1/-1)
include/test/mir_test_doubles/mock_buffer_stream.h (+2/-1)
include/test/mir_test_doubles/mock_display_buffer.h (+2/-4)
include/test/mir_test_doubles/mock_display_device.h (+2/-3)
include/test/mir_test_doubles/mock_frame_dropping_policy_factory.h (+83/-0)
include/test/mir_test_doubles/mock_frontend_surface.h (+2/-0)
include/test/mir_test_doubles/mock_surface.h (+1/-0)
include/test/mir_test_doubles/mock_swapping_gl_context.h (+1/-0)
include/test/mir_test_doubles/mock_timer.h (+52/-0)
include/test/mir_test_doubles/null_display_buffer.h (+1/-1)
include/test/mir_test_doubles/null_pixel_buffer.h (+43/-0)
include/test/mir_test_doubles/platform_factory.h (+46/-0)
include/test/mir_test_doubles/stub_buffer.h (+9/-3)
include/test/mir_test_doubles/stub_buffer_stream.h (+8/-1)
include/test/mir_test_doubles/stub_display_builder.h (+1/-1)
include/test/mir_test_doubles/stub_frame_dropping_policy_factory.h (+58/-0)
include/test/mir_test_doubles/stub_scene_surface.h (+4/-0)
include/test/mir_test_doubles/stub_swapping_gl_context.h (+5/-0)
include/test/mir_test_framework/input_testing_client_configuration.h (+4/-4)
src/client/logging/input_receiver_report.cpp (+1/-0)
src/client/mir_surface.cpp (+7/-1)
src/client/mir_surface.h (+1/-0)
src/platform/graphics/android/CMakeLists.txt (+1/-1)
src/platform/graphics/android/android_display.cpp (+1/-2)
src/platform/graphics/android/android_display.h (+1/-1)
src/platform/graphics/android/android_platform.cpp (+29/-7)
src/platform/graphics/android/buffer.cpp (+1/-1)
src/platform/graphics/android/buffer.h (+1/-1)
src/platform/graphics/android/display_buffer.cpp (+12/-18)
src/platform/graphics/android/display_buffer.h (+7/-6)
src/platform/graphics/android/display_device.h (+2/-3)
src/platform/graphics/android/fb_device.cpp (+8/-5)
src/platform/graphics/android/fb_device.h (+3/-3)
src/platform/graphics/android/gl_context.cpp (+83/-45)
src/platform/graphics/android/gl_context.h (+45/-28)
src/platform/graphics/android/hwc_device.cpp (+8/-5)
src/platform/graphics/android/hwc_device.h (+4/-3)
src/platform/graphics/android/hwc_fallback_gl_renderer.cpp (+1/-1)
src/platform/graphics/android/hwc_fb_device.cpp (+23/-11)
src/platform/graphics/android/hwc_fb_device.h (+3/-3)
src/platform/graphics/android/hwc_logger.h (+2/-0)
src/platform/graphics/android/hwc_loggers.cpp (+30/-1)
src/platform/graphics/android/hwc_loggers.h (+18/-7)
src/platform/graphics/android/output_builder.cpp (+11/-4)
src/platform/graphics/android/output_builder.h (+4/-1)
src/platform/graphics/android/overlay_optimization.h (+37/-0)
src/platform/graphics/android/resource_factory.cpp (+4/-31)
src/platform/graphics/android/resource_factory.h (+3/-2)
src/platform/graphics/android/swapping_gl_context.h (+47/-0)
src/platform/graphics/mesa/CMakeLists.txt (+1/-0)
src/platform/graphics/mesa/buffer_allocator.cpp (+1/-1)
src/platform/graphics/mesa/buffer_texture_binder.h (+1/-1)
src/platform/graphics/mesa/bypass.cpp (+6/-7)
src/platform/graphics/mesa/bypass.h (+9/-11)
src/platform/graphics/mesa/display_buffer.cpp (+24/-8)
src/platform/graphics/mesa/display_buffer.h (+4/-3)
src/platform/graphics/mesa/gbm_buffer.cpp (+2/-2)
src/platform/graphics/mesa/gbm_buffer.h (+1/-1)
src/platform/graphics/mesa/shm_buffer.cpp (+1/-1)
src/platform/graphics/mesa/shm_buffer.h (+1/-1)
src/server/CMakeLists.txt (+1/-0)
src/server/asio_main_loop.cpp (+20/-6)
src/server/compositor/CMakeLists.txt (+1/-1)
src/server/compositor/buffer_queue.cpp (+54/-3)
src/server/compositor/buffer_queue.h (+6/-1)
src/server/compositor/buffer_stream_factory.cpp (+6/-4)
src/server/compositor/buffer_stream_factory.h (+4/-4)
src/server/compositor/buffer_stream_surfaces.cpp (+7/-6)
src/server/compositor/buffer_stream_surfaces.h (+2/-1)
src/server/compositor/default_configuration.cpp (+15/-1)
src/server/compositor/default_display_buffer_compositor.cpp (+8/-20)
src/server/compositor/default_display_buffer_compositor_factory.cpp (+4/-1)
src/server/compositor/gl_renderer.cpp (+27/-4)
src/server/compositor/gl_renderer_factory.cpp (+5/-2)
src/server/compositor/gl_renderer_factory.h (+2/-1)
src/server/compositor/multi_threaded_compositor.cpp (+57/-136)
src/server/compositor/occlusion.cpp (+15/-9)
src/server/compositor/occlusion.h (+5/-1)
src/server/compositor/recently_used_cache.cpp (+1/-1)
src/server/compositor/screencast_display_buffer.cpp (+6/-6)
src/server/compositor/screencast_display_buffer.h (+2/-2)
src/server/compositor/temporary_buffers.cpp (+2/-2)
src/server/compositor/temporary_buffers.h (+1/-1)
src/server/compositor/timeout_frame_dropping_policy_factory.cpp (+92/-0)
src/server/compositor/timeout_frame_dropping_policy_factory.h (+56/-0)
src/server/frontend/default_configuration.cpp (+2/-1)
src/server/frontend/default_ipc_factory.cpp (+9/-5)
src/server/frontend/default_ipc_factory.h (+8/-4)
src/server/frontend/published_socket_connector.cpp (+2/-0)
src/server/frontend/session_mediator.cpp (+31/-6)
src/server/frontend/session_mediator.h (+5/-3)
src/server/graphics/nested/nested_output.cpp (+7/-6)
src/server/graphics/nested/nested_output.h (+2/-1)
src/server/graphics/offscreen/display_buffer.cpp (+5/-5)
src/server/graphics/offscreen/display_buffer.h (+1/-1)
src/server/input/android/android_input_window_handle.cpp (+1/-0)
src/server/input/android/default_android_input_configuration.cpp (+1/-1)
src/server/input/default_configuration.cpp (+1/-1)
src/server/report/logging/session_mediator_report.cpp (+5/-0)
src/server/report/logging/session_mediator_report.h (+2/-0)
src/server/report/lttng/session_mediator_report.cpp (+1/-0)
src/server/report/lttng/session_mediator_report.h (+1/-0)
src/server/report/lttng/session_mediator_report_tp.h (+1/-0)
src/server/report/null/session_mediator_report.cpp (+4/-0)
src/server/report/null/session_mediator_report.h (+2/-0)
src/server/scene/basic_surface.cpp (+43/-12)
src/server/scene/basic_surface.h (+6/-0)
src/server/scene/default_configuration.cpp (+1/-0)
src/server/scene/gl_pixel_buffer.cpp (+1/-1)
src/server/scene/legacy_surface_change_notification.cpp (+6/-0)
src/server/scene/legacy_surface_change_notification.h (+1/-0)
src/server/scene/null_surface_observer.cpp (+2/-0)
src/server/scene/surface_allocator.cpp (+3/-0)
src/server/scene/surface_allocator.h (+6/-0)
src/server/scene/threaded_snapshot_strategy.cpp (+2/-0)
src/shared/CMakeLists.txt (+1/-0)
src/shared/threadname/CMakeLists.txt (+23/-0)
src/shared/threadname/thread_name.cpp (+32/-0)
tests/acceptance-tests/CMakeLists.txt (+1/-0)
tests/acceptance-tests/test_client_cursor_api.cpp (+76/-2)
tests/acceptance-tests/test_client_input.cpp (+26/-32)
tests/acceptance-tests/test_client_library.cpp (+752/-0)
tests/acceptance-tests/test_client_library_drm.cpp (+16/-33)
tests/acceptance-tests/test_client_library_old.cpp (+0/-951)
tests/acceptance-tests/test_client_surface_swap_buffers.cpp (+8/-13)
tests/acceptance-tests/test_nested_mir.cpp (+1/-0)
tests/acceptance-tests/test_server_shutdown.cpp (+1/-1)
tests/acceptance-tests/test_trust_session_helper.cpp (+7/-4)
tests/integration-tests/compositor/test_buffer_stream.cpp (+49/-16)
tests/integration-tests/compositor/test_swapping_swappers.cpp (+3/-1)
tests/integration-tests/frontend/test_application_mediator_report.cpp (+1/-0)
tests/integration-tests/graphics/android/test_buffer_integration.cpp (+4/-1)
tests/integration-tests/graphics/android/test_display_integration.cpp (+4/-2)
tests/integration-tests/graphics/android/test_internal_client.cpp (+3/-2)
tests/integration-tests/graphics/mesa/test_buffer_integration.cpp (+3/-3)
tests/integration-tests/test_session.cpp (+4/-10)
tests/integration-tests/test_surface_first_frame_sync.cpp (+2/-1)
tests/integration-tests/test_surface_stack_with_compositor.cpp (+6/-15)
tests/integration-tests/test_swapinterval.cpp (+9/-2)
tests/mir_test/CMakeLists.txt (+3/-0)
tests/mir_test/current_thread_name.cpp (+34/-0)
tests/mir_test/fake_clock.cpp (+53/-0)
tests/mir_test/signal.cpp (+46/-0)
tests/mir_test_doubles/CMakeLists.txt (+3/-0)
tests/mir_test_doubles/mock_frame_dropping_policy_factory.cpp (+70/-0)
tests/mir_test_doubles/mock_timer.cpp (+149/-0)
tests/mir_test_doubles/platform_factory.cpp (+57/-0)
tests/mir_test_framework/input_testing_client_configuration.cpp (+6/-10)
tests/mir_test_framework/stubbed_server_configuration.cpp (+1/-1)
tests/performance-tests/test_glmark2-es2-mir.cpp (+4/-4)
tests/unit-tests/CMakeLists.txt (+1/-0)
tests/unit-tests/compositor/CMakeLists.txt (+1/-1)
tests/unit-tests/compositor/test_buffer_queue.cpp (+142/-49)
tests/unit-tests/compositor/test_buffer_stream.cpp (+4/-2)
tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp (+41/-162)
tests/unit-tests/compositor/test_gl_renderer.cpp (+39/-6)
tests/unit-tests/compositor/test_gl_texture_cache.cpp (+4/-4)
tests/unit-tests/compositor/test_multi_threaded_compositor.cpp (+69/-80)
tests/unit-tests/compositor/test_occlusion.cpp (+16/-16)
tests/unit-tests/compositor/test_screencast_display_buffer.cpp (+11/-1)
tests/unit-tests/compositor/test_temporary_buffers.cpp (+3/-3)
tests/unit-tests/compositor/test_timeout_frame_dropping_policy.cpp (+186/-0)
tests/unit-tests/frontend/CMakeLists.txt (+1/-0)
tests/unit-tests/frontend/test_basic_connector.cpp (+57/-0)
tests/unit-tests/frontend/test_session_mediator.cpp (+5/-4)
tests/unit-tests/frontend/test_session_mediator_android.cpp (+1/-2)
tests/unit-tests/frontend/test_session_mediator_mesa.cpp (+1/-2)
tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp (+33/-33)
tests/unit-tests/graphics/android/test_fb_device.cpp (+6/-4)
tests/unit-tests/graphics/android/test_hwc_device.cpp (+18/-30)
tests/unit-tests/graphics/android/test_hwc_display.cpp (+46/-39)
tests/unit-tests/graphics/android/test_hwc_fb_device.cpp (+9/-4)
tests/unit-tests/graphics/android/test_hwc_logger.cpp (+17/-1)
tests/unit-tests/graphics/android/test_hwc_wrapper.cpp (+1/-0)
tests/unit-tests/graphics/android/test_output_builder.cpp (+10/-7)
tests/unit-tests/graphics/android/test_resource_factory.cpp (+10/-5)
tests/unit-tests/graphics/mesa/CMakeLists.txt (+1/-0)
tests/unit-tests/graphics/mesa/test_buffer_allocator.cpp (+2/-7)
tests/unit-tests/graphics/mesa/test_bypass.cpp (+41/-41)
tests/unit-tests/graphics/mesa/test_display.cpp (+2/-4)
tests/unit-tests/graphics/mesa/test_display_buffer.cpp (+85/-51)
tests/unit-tests/graphics/mesa/test_display_configuration.cpp (+3/-8)
tests/unit-tests/graphics/mesa/test_display_multi_monitor.cpp (+4/-10)
tests/unit-tests/graphics/mesa/test_gbm_buffer.cpp (+8/-14)
tests/unit-tests/graphics/mesa/test_linux_virtual_terminal.cpp (+1/-0)
tests/unit-tests/graphics/mesa/test_platform.cpp (+2/-8)
tests/unit-tests/graphics/mesa/test_shm_buffer.cpp (+1/-1)
tests/unit-tests/graphics/nested/CMakeLists.txt (+1/-0)
tests/unit-tests/graphics/nested/test_nested_display_buffer.cpp (+82/-0)
tests/unit-tests/graphics/test_display.cpp (+3/-15)
tests/unit-tests/graphics/test_graphics_platform.cpp (+2/-13)
tests/unit-tests/graphics/test_program_factory.cpp (+6/-5)
tests/unit-tests/scene/test_basic_surface.cpp (+25/-9)
tests/unit-tests/scene/test_gl_pixel_buffer.cpp (+2/-2)
tests/unit-tests/scene/test_session_manager.cpp (+2/-0)
tests/unit-tests/scene/test_surface.cpp (+24/-6)
tests/unit-tests/scene/test_surface_impl.cpp (+15/-2)
tests/unit-tests/scene/test_surface_stack.cpp (+7/-0)
tests/unit-tests/scene/test_threaded_snapshot_strategy.cpp (+41/-6)
tests/unit-tests/test_asio_main_loop.cpp (+62/-23)
tests/unit-tests/test_thread_name.cpp (+100/-0)
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:mir/ubuntu