← Back to branch summary

~vanvugt/mir/managed-surface

~vanvugt/mir/managed-surface

Viewing all changes in revision 2188.

Committer: Daniel van Vugt
Date: 2014-12-17 06:58:23 UTC
mfrom: (2131.5.18 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20141217065823-p73b1h0zh3otej2i

Merge latest trunk

files added:
src/platforms

src/platforms/CMakeLists.txt

files renamed:
src/platform/graphics/android/ => src/platforms/android/

src/platform/graphics/mesa/ => src/platforms/mesa/

src/platform/graphics/symbols.map => src/platforms/symbols.map

files modified:
3rd_party/android-input/android/CMakeLists.txt

benchmarks/frame-uniformity/CMakeLists.txt

src/CMakeLists.txt

src/platform/CMakeLists.txt

src/platform/graphics/CMakeLists.txt

tests/include/mir_test_doubles/mock_alloc_adaptor.h

tests/include/mir_test_doubles/mock_display_device.h

tests/include/mir_test_doubles/mock_framebuffer_bundle.h

tests/include/mir_test_doubles/mock_hwc_device_wrapper.h

tests/include/mir_test_doubles/mock_hwc_layerlist.h

tests/include/mir_test_doubles/mock_hwc_report.h

tests/include/mir_test_doubles/mock_hwc_vsync_coordinator.h

tests/include/mir_test_doubles/mock_interpreter_resource_cache.h

tests/include/mir_test_doubles/mock_renderable_list_compositor.h

tests/include/mir_test_doubles/mock_swapping_gl_context.h

tests/include/mir_test_doubles/mock_virtual_terminal.h

tests/include/mir_test_doubles/null_video_devices.h

tests/include/mir_test_doubles/null_virtual_terminal.h

tests/include/mir_test_doubles/stub_display_builder.h

tests/include/mir_test_doubles/stub_gbm_native_buffer.h

tests/include/mir_test_doubles/stub_renderable_list_compositor.h

tests/include/mir_test_doubles/stub_swapping_gl_context.h

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

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

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

tests/mir_test_doubles/platform_factory.cpp

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

tests/unit-tests/graphics/android/test_hwc_layers.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_interpreter_buffer_cache.cpp

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

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

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

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

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

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

tests/unit-tests/graphics/mesa/mock_kms_output.h

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Show diffs side-by-side

added added

removed removed

3rd_party/android-input/android/CMakeLists.txt

benchmarks/frame-uniformity/CMakeLists.txt

src/CMakeLists.txt

src/platform/CMakeLists.txt

src/platform/graphics/CMakeLists.txt

src/platforms/CMakeLists.txt

tests/include/mir_test_doubles/mock_alloc_adaptor.h

tests/include/mir_test_doubles/mock_display_device.h

tests/include/mir_test_doubles/mock_framebuffer_bundle.h

tests/include/mir_test_doubles/mock_hwc_device_wrapper.h

tests/include/mir_test_doubles/mock_hwc_layerlist.h

tests/include/mir_test_doubles/mock_hwc_report.h

tests/include/mir_test_doubles/mock_hwc_vsync_coordinator.h

tests/include/mir_test_doubles/mock_interpreter_resource_cache.h

tests/include/mir_test_doubles/mock_renderable_list_compositor.h

tests/include/mir_test_doubles/mock_swapping_gl_context.h

tests/include/mir_test_doubles/mock_virtual_terminal.h

tests/include/mir_test_doubles/null_video_devices.h

tests/include/mir_test_doubles/null_virtual_terminal.h

tests/include/mir_test_doubles/stub_display_builder.h

tests/include/mir_test_doubles/stub_gbm_native_buffer.h

tests/include/mir_test_doubles/stub_renderable_list_compositor.h

tests/include/mir_test_doubles/stub_swapping_gl_context.h

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

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

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

tests/mir_test_doubles/platform_factory.cpp

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

tests/unit-tests/graphics/android/test_hwc_layers.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_interpreter_buffer_cache.cpp

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

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

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

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

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

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

tests/unit-tests/graphics/mesa/mock_kms_output.h

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Older »