← Back to branch summary

~vanvugt/mir/double

~vanvugt/mir/double

Viewing all changes in revision 1785.

Committer: Daniel van Vugt
Date: 2014-10-29 06:26:23 UTC
mfrom: (1608.120.258 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20141029062623-nzqokzk83lb8xn80

Merge latest development-branch and fix a conflict.

files added:
benchmarks/frame-uniformity

benchmarks/frame-uniformity/CMakeLists.txt

benchmarks/frame-uniformity/README.txt

benchmarks/frame-uniformity/frame_uniformity_test.cpp

benchmarks/frame-uniformity/frame_uniformity_test.h

benchmarks/frame-uniformity/main.cpp

benchmarks/frame-uniformity/touch_measuring_client.cpp

benchmarks/frame-uniformity/touch_measuring_client.h

benchmarks/frame-uniformity/touch_producing_server.cpp

benchmarks/frame-uniformity/touch_producing_server.h

benchmarks/frame-uniformity/touch_samples.cpp

benchmarks/frame-uniformity/touch_samples.h

benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp

benchmarks/frame-uniformity/vsync_simulating_graphics_platform.h

debian/libmirclient-debug-extension-dev.install

debian/libmirclient-debug-extension1.install

debian/libmirprotobuf0.install

include/client/mir_toolkit/debug

include/server/mir/scene/coordinate_translator.h

src/client/mir_debug_api.cpp

src/client/mirclient-debug-extension.pc.in

src/client/symbols-debug.map

src/include/server/mir/frontend/unsupported_feature_exception.h

src/server/frontend/unsupported_coordinate_translator.cpp

src/server/frontend/unsupported_coordinate_translator.h

src/server/scene/default_coordinate_translator.cpp

src/server/scene/default_coordinate_translator.h

tests/acceptance-tests/test_debug_api.cpp

tests/include/mir_test_doubles/mock_coordinate_translator.h

tests/include/mir_test_doubles/stub_android_native_buffer.h

tests/include/mir_test_framework/headless_test.h

tests/include/mir_test_framework/temporary_environment_value.h

tests/mir_test_framework/headless_test.cpp

tests/mir_test_framework/stubbed_graphics_platform.cpp

tests/mir_test_framework/stubbed_graphics_platform.h

tests/mir_test_framework/temporary_environment_value.cpp

files renamed:
include/client/mir_toolkit/mir_client_library_debug.h => include/client/mir_toolkit/debug/surface.h

src/include/server/mir/compositor/display_buffer_compositor.h => include/server/mir/compositor/display_buffer_compositor.h

src/include/server/mir/compositor/display_buffer_compositor_factory.h => include/server/mir/compositor/display_buffer_compositor_factory.h

files modified:
benchmarks/CMakeLists.txt

client-ABI-sha1sums

debian/control

debian/libmirclient-dev.install

debian/mir-test-tools.install

debian/rules

examples/progressbar.c

include/platform/mir/options/configuration.h

include/server/mir/default_server_configuration.h

include/server/mir/scene/surface.h

include/server/mir/server.h

platform-ABI-sha1sums

playground/demo-shell/demo_compositor.cpp

playground/demo-shell/demo_compositor.h

playground/demo-shell/demo_shell.cpp

playground/render_surfaces.cpp

server-ABI-sha1sums

src/client/CMakeLists.txt

src/client/android/CMakeLists.txt

src/client/android/buffer.cpp

src/client/android/buffer.h

src/client/client_buffer.h

src/client/mesa/CMakeLists.txt

src/client/mesa/client_buffer.cpp

src/client/mesa/client_buffer.h

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/mirclient.pc.in

src/client/rpc/mir_basic_rpc_channel.cpp

src/client/rpc/mir_basic_rpc_channel.h

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/rpc/mir_protobuf_rpc_channel.h

src/client/rpc/stream_socket_transport.cpp

src/client/rpc/stream_socket_transport.h

src/client/rpc/stream_transport.h

src/common/fd/fd_socket_transmission.cpp

src/common/protobuf/CMakeLists.txt

src/common/protobuf/mir_protobuf.proto

src/common/symbols.map

src/include/common/mir/graphics/android/native_buffer.h

src/platform/graphics/CMakeLists.txt

src/platform/graphics/android/CMakeLists.txt

src/platform/graphics/mesa/CMakeLists.txt

src/platform/options/default_configuration.cpp

src/platform/symbols.map

src/server/compositor/compositing_screencast.cpp

src/server/compositor/compositing_screencast.h

src/server/compositor/default_configuration.cpp

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/default_display_buffer_compositor.h

src/server/compositor/default_display_buffer_compositor_factory.cpp

src/server/compositor/default_display_buffer_compositor_factory.h

src/server/compositor/multi_threaded_compositor.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/default_configuration.cpp

src/server/frontend/default_ipc_factory.cpp

src/server/frontend/default_ipc_factory.h

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/frontend/socket_messenger.cpp

src/server/scene/CMakeLists.txt

src/server/scene/default_configuration.cpp

src/server/server.cpp

src/server/symbols.map

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/server_configuration_wrapping.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/test_client_surfaces.cpp

tests/acceptance-tests/test_custom_input_dispatcher.cpp

tests/include/mir_test_doubles/mock_android_native_buffer.h

tests/include/mir_test_doubles/mock_surface.h

tests/include/mir_test_doubles/null_client_buffer.h

tests/include/mir_test_doubles/null_display_buffer_compositor_factory.h

tests/include/mir_test_doubles/stub_buffer.h

tests/include/mir_test_doubles/stub_buffer_allocator.h

tests/include/mir_test_doubles/stub_renderable.h

tests/include/mir_test_doubles/stub_scene_element.h

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/compositor/test_buffer_stream.cpp

tests/integration-tests/test_exchange_buffer.cpp

tests/integration-tests/test_protobuf.cpp

tests/integration-tests/test_server_shutdown.cpp

tests/integration-tests/test_stale_frames.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/mir_test_framework/testing_client_options.cpp

tests/mir_test_framework/using_stub_client_platform.cpp

tests/unit-tests/client/android/test_android_native_window.cpp

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

tests/unit-tests/client/android/test_client_surface_interpreter.cpp

tests/unit-tests/client/mesa/test_client_buffer.cpp

tests/unit-tests/client/mesa/test_native_surface.cpp

tests/unit-tests/client/test_aging_buffer.cpp

tests/unit-tests/client/test_client_buffer_depository.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_protobuf_rpc_channel.cpp

tests/unit-tests/client/test_stream_transport.cpp

tests/unit-tests/compositor/test_compositing_screencast.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/examples/test_demo_compositor.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/frontend/test_session_mediator_android.cpp

tests/unit-tests/frontend/test_session_mediator_mesa.cpp

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

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

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

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

Show diffs side-by-side

added added

removed removed

benchmarks/CMakeLists.txt

benchmarks/frame-uniformity/

benchmarks/frame-uniformity/CMakeLists.txt

benchmarks/frame-uniformity/README.txt

benchmarks/frame-uniformity/frame_uniformity_test.cpp

benchmarks/frame-uniformity/frame_uniformity_test.h

benchmarks/frame-uniformity/main.cpp

benchmarks/frame-uniformity/touch_measuring_client.cpp

benchmarks/frame-uniformity/touch_measuring_client.h

benchmarks/frame-uniformity/touch_producing_server.cpp

benchmarks/frame-uniformity/touch_producing_server.h

benchmarks/frame-uniformity/touch_samples.cpp

benchmarks/frame-uniformity/touch_samples.h

benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp

benchmarks/frame-uniformity/vsync_simulating_graphics_platform.h

client-ABI-sha1sums

debian/libmirclient-debug-extension-dev.install

debian/libmirclient-debug-extension1.install

debian/libmirclient-dev.install

debian/libmirprotobuf0.install

debian/mir-test-tools.install

examples/progressbar.c

include/client/mir_toolkit/debug/

include/client/mir_toolkit/debug/surface.h

include/platform/mir/options/configuration.h

include/server/mir/compositor/display_buffer_compositor.h

include/server/mir/default_server_configuration.h

include/server/mir/scene/coordinate_translator.h

include/server/mir/scene/surface.h

include/server/mir/server.h

platform-ABI-sha1sums

playground/demo-shell/demo_compositor.cpp

playground/demo-shell/demo_compositor.h

playground/demo-shell/demo_shell.cpp

playground/render_surfaces.cpp

server-ABI-sha1sums

src/client/CMakeLists.txt

src/client/android/CMakeLists.txt

src/client/android/buffer.cpp

src/client/android/buffer.h

src/client/client_buffer.h

src/client/mesa/CMakeLists.txt

src/client/mesa/client_buffer.cpp

src/client/mesa/client_buffer.h

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_debug_api.cpp

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/mirclient-debug-extension.pc.in

src/client/mirclient.pc.in

src/client/rpc/mir_basic_rpc_channel.cpp

src/client/rpc/mir_basic_rpc_channel.h

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/rpc/mir_protobuf_rpc_channel.h

src/client/rpc/stream_socket_transport.cpp

src/client/rpc/stream_socket_transport.h

src/client/rpc/stream_transport.h

src/client/symbols-debug.map

src/common/fd/fd_socket_transmission.cpp

src/common/protobuf/CMakeLists.txt

src/common/protobuf/mir_protobuf.proto

src/common/symbols.map

src/include/common/mir/graphics/android/native_buffer.h

src/include/server/mir/frontend/unsupported_feature_exception.h

src/platform/graphics/CMakeLists.txt

src/platform/graphics/android/CMakeLists.txt

src/platform/graphics/mesa/CMakeLists.txt

src/platform/options/default_configuration.cpp

src/platform/symbols.map

src/server/compositor/compositing_screencast.cpp

src/server/compositor/compositing_screencast.h

src/server/compositor/default_configuration.cpp

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/default_display_buffer_compositor.h

src/server/compositor/default_display_buffer_compositor_factory.cpp

src/server/compositor/default_display_buffer_compositor_factory.h

src/server/compositor/multi_threaded_compositor.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/default_configuration.cpp

src/server/frontend/default_ipc_factory.cpp

src/server/frontend/default_ipc_factory.h

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/frontend/socket_messenger.cpp

src/server/frontend/unsupported_coordinate_translator.cpp

src/server/frontend/unsupported_coordinate_translator.h

src/server/scene/CMakeLists.txt

src/server/scene/default_configuration.cpp

src/server/scene/default_coordinate_translator.cpp

src/server/scene/default_coordinate_translator.h

src/server/server.cpp

src/server/symbols.map

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/server_configuration_wrapping.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/test_client_surfaces.cpp

tests/acceptance-tests/test_custom_input_dispatcher.cpp

tests/acceptance-tests/test_debug_api.cpp

tests/include/mir_test_doubles/mock_android_native_buffer.h

tests/include/mir_test_doubles/mock_coordinate_translator.h

tests/include/mir_test_doubles/mock_surface.h

tests/include/mir_test_doubles/null_client_buffer.h

tests/include/mir_test_doubles/null_display_buffer_compositor_factory.h

tests/include/mir_test_doubles/stub_android_native_buffer.h

tests/include/mir_test_doubles/stub_buffer.h

tests/include/mir_test_doubles/stub_buffer_allocator.h

tests/include/mir_test_doubles/stub_renderable.h

tests/include/mir_test_doubles/stub_scene_element.h

tests/include/mir_test_framework/headless_test.h

tests/include/mir_test_framework/temporary_environment_value.h

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/compositor/test_buffer_stream.cpp

tests/integration-tests/test_exchange_buffer.cpp

tests/integration-tests/test_protobuf.cpp

tests/integration-tests/test_server_shutdown.cpp

tests/integration-tests/test_stale_frames.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/headless_test.cpp

tests/mir_test_framework/stubbed_graphics_platform.cpp

tests/mir_test_framework/stubbed_graphics_platform.h

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/mir_test_framework/temporary_environment_value.cpp

tests/mir_test_framework/testing_client_options.cpp

tests/mir_test_framework/using_stub_client_platform.cpp

tests/unit-tests/client/android/test_android_native_window.cpp

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

tests/unit-tests/client/android/test_client_surface_interpreter.cpp

tests/unit-tests/client/mesa/test_client_buffer.cpp

tests/unit-tests/client/mesa/test_native_surface.cpp

tests/unit-tests/client/test_aging_buffer.cpp

tests/unit-tests/client/test_client_buffer_depository.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_protobuf_rpc_channel.cpp

tests/unit-tests/client/test_stream_transport.cpp

tests/unit-tests/compositor/test_compositing_screencast.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/examples/test_demo_compositor.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/frontend/test_session_mediator_android.cpp

tests/unit-tests/frontend/test_session_mediator_mesa.cpp

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

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

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

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

Older »