← Back to branch summary

~alan-griffiths/mir/discussion-migrate-demo-shell

~alan-griffiths/mir/discussion-migrate-demo-shell

Viewing all changes in revision 2139.

Committer: Alan Griffiths
Date: 2014-12-10 11:42:01 UTC
mfrom: (2131.1.9 mir4)
Revision ID: alan@octopull.co.uk-20141210114201-thtluhr4seop8w2e

merge lp:mir

files added:
examples/server_example_input_filter.cpp

examples/server_example_input_filter.h

examples/server_example_log_options.cpp

examples/server_example_log_options.h

tests/include/mir_test_doubles/mock_hwc_report.h

tests/include/mir_test_framework/any_surface.h

tests/mir_test_framework/any_surface.cpp

files removed:
src/platform/graphics/mesa/internal_native_display.cpp

src/platform/graphics/mesa/internal_native_display.h

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

files renamed:
examples/basic_server.cpp => examples/server_example.cpp

examples/example_display_configuration_policy.cpp => examples/server_example_display_configuration_policy.cpp

examples/example_display_configuration_policy.h => examples/server_example_display_configuration_policy.h

examples/demo-shell/fullscreen_placement_strategy.cpp => examples/server_example_fullscreen_placement_strategy.cpp

examples/demo-shell/fullscreen_placement_strategy.h => examples/server_example_fullscreen_placement_strategy.h

examples/example_input_event_filter.cpp => examples/server_example_input_event_filter.cpp

examples/example_input_event_filter.h => examples/server_example_input_event_filter.h

examples/minimal_server.cpp => examples/server_minimal.cpp

src/platform/graphics/android/hwc_logger.h => src/platform/graphics/android/hwc_report.h

files modified:
examples/CMakeLists.txt

examples/demo-shell/CMakeLists.txt

examples/demo-shell/demo_shell.cpp

examples/render_surfaces.cpp

src/include/platform/mir/graphics/display_report.h

src/platform/graphics/android/hwc_loggers.cpp

src/platform/graphics/android/hwc_loggers.h

src/platform/graphics/android/output_builder.cpp

src/platform/graphics/android/output_builder.h

src/platform/graphics/android/platform.cpp

src/platform/graphics/android/real_hwc_wrapper.cpp

src/platform/graphics/android/real_hwc_wrapper.h

src/platform/graphics/mesa/CMakeLists.txt

src/platform/graphics/mesa/native_platform.cpp

src/platform/graphics/mesa/native_platform.h

src/platform/graphics/mesa/platform.cpp

src/platform/graphics/mesa/platform.h

src/server/report/logging/display_report.cpp

src/server/report/logging/display_report.h

src/server/report/null/display_report.cpp

src/server/report/null/display_report.h

tests/acceptance-tests/clients.cpp

tests/acceptance-tests/test_client_cursor_api.cpp

tests/acceptance-tests/test_client_focus_notification.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_library_errors.cpp

tests/acceptance-tests/test_client_library_old.cpp

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/test_client_surface_visibility.cpp

tests/acceptance-tests/test_client_surfaces.cpp

tests/acceptance-tests/test_client_with_custom_display_config_deadlock.cpp

tests/acceptance-tests/test_debug_api.cpp

tests/acceptance-tests/test_server_without_active_outputs.cpp

tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/acceptance-tests/test_unresponsive_client.cpp

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

tests/mir_test_framework/CMakeLists.txt

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

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

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

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

Show diffs side-by-side

added added

removed removed

examples/CMakeLists.txt

examples/demo-shell/CMakeLists.txt

examples/demo-shell/demo_shell.cpp

examples/render_surfaces.cpp

examples/server_example.cpp

examples/server_example_display_configuration_policy.cpp

examples/server_example_fullscreen_placement_strategy.cpp

examples/server_example_fullscreen_placement_strategy.h

examples/server_example_input_event_filter.cpp

examples/server_example_input_filter.cpp

examples/server_example_input_filter.h

examples/server_example_log_options.cpp

examples/server_example_log_options.h

examples/server_minimal.cpp

src/include/platform/mir/graphics/display_report.h

src/platform/graphics/android/hwc_loggers.cpp

src/platform/graphics/android/hwc_loggers.h

src/platform/graphics/android/hwc_report.h

src/platform/graphics/android/output_builder.cpp

src/platform/graphics/android/output_builder.h

src/platform/graphics/android/platform.cpp

src/platform/graphics/android/real_hwc_wrapper.cpp

src/platform/graphics/android/real_hwc_wrapper.h

src/platform/graphics/mesa/CMakeLists.txt

src/platform/graphics/mesa/internal_native_display.cpp

src/platform/graphics/mesa/internal_native_display.h

src/platform/graphics/mesa/native_platform.cpp

src/platform/graphics/mesa/native_platform.h

src/platform/graphics/mesa/platform.cpp

src/platform/graphics/mesa/platform.h

src/server/report/logging/display_report.cpp

src/server/report/logging/display_report.h

src/server/report/null/display_report.cpp

src/server/report/null/display_report.h

tests/acceptance-tests/clients.cpp

tests/acceptance-tests/test_client_cursor_api.cpp

tests/acceptance-tests/test_client_focus_notification.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_library_errors.cpp

tests/acceptance-tests/test_client_library_old.cpp

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/test_client_surface_visibility.cpp

tests/acceptance-tests/test_client_surfaces.cpp

tests/acceptance-tests/test_client_with_custom_display_config_deadlock.cpp

tests/acceptance-tests/test_debug_api.cpp

tests/acceptance-tests/test_server_without_active_outputs.cpp

tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/acceptance-tests/test_unresponsive_client.cpp

tests/include/mir_test_doubles/mock_hwc_report.h

tests/include/mir_test_framework/any_surface.h

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

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/any_surface.cpp

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

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

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

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

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

Older »