← Back to branch summary

~raof/mir/fully-constructed-surfaces

~raof/mir/fully-constructed-surfaces

Viewing all changes in revision 3868.

Committer: Christopher James Halse Rogers
Date: 2016-12-07 01:28:48 UTC
mfrom: (3862.1.6 development-branch)
Revision ID: christopher.halse.rogers@canonical.com-20161207012848-qd7u9qbczq9hb0yl

Merge trunk, resolving conflicts

files added:
include/client/mir_toolkit/extensions/mesa_drm_auth.h

tests/include/mir/test/doubles/mock_mesa_auth_extensions.h

files modified:
cmake/FindGtestGmock.cmake

cmake/LinuxCrossCompile.cmake

cross-compile-chroot.sh

examples/server_example_canonical_window_manager.cpp

include/client/mir_toolkit/extensions/set_gbm_device.h

playground/demo-shell/window_manager.cpp

playground/mir_demo_client_chain_jumping_buffers.c

playground/mir_demo_client_prerendered_frames.c

src/client/error_render_surface.cpp

src/client/error_render_surface.h

src/client/error_stream.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_render_surface.h

src/client/mir_render_surface_api.cpp

src/client/render_surface.cpp

src/client/render_surface.h

src/client/symbols.map

src/include/client/mir/client_context.h

src/include/client/mir_toolkit/mir_render_surface.h

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

src/platforms/mesa/client/client_platform.cpp

src/platforms/mesa/client/client_platform.h

src/platforms/mesa/server/kms/CMakeLists.txt

src/platforms/mesa/server/kms/guest_platform.cpp

src/platforms/mesa/server/kms/nested_authentication.cpp

src/platforms/mesa/server/kms/nested_authentication.h

src/platforms/mesa/server/x11/graphics/display.cpp

src/platforms/mesa/server/x11/graphics/display.h

src/platforms/mesa/server/x11/graphics/display_configuration.cpp

src/platforms/mesa/server/x11/graphics/display_configuration.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/mir_client_host_connection.h

src/server/shell/canonical_window_manager.cpp

tests/acceptance-tests/staging/test_render_surface.cpp

tests/include/mir/test/doubles/mock_client_context.h

tests/include/mir/test/doubles/mock_nested_context.h

tests/include/mir/test/doubles/stub_host_connection.h

tests/unit-tests/client/test_mir_render_surface.cpp

tests/unit-tests/platforms/mesa/client/test_client_platform.cpp

tests/unit-tests/platforms/mesa/kms/test_guest_platform.cpp

tests/unit-tests/platforms/mesa/kms/test_nested_authentication.cpp

tests/unit-tests/platforms/mesa/x11/test_display.cpp

Show diffs side-by-side

added added

removed removed

cmake/FindGtestGmock.cmake

cmake/LinuxCrossCompile.cmake

cross-compile-chroot.sh

examples/server_example_canonical_window_manager.cpp

include/client/mir_toolkit/extensions/mesa_drm_auth.h

include/client/mir_toolkit/extensions/set_gbm_device.h

playground/demo-shell/window_manager.cpp

playground/mir_demo_client_chain_jumping_buffers.c

playground/mir_demo_client_prerendered_frames.c

src/client/error_render_surface.cpp

src/client/error_render_surface.h

src/client/error_stream.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_render_surface.h

src/client/mir_render_surface_api.cpp

src/client/render_surface.cpp

src/client/render_surface.h

src/client/symbols.map

src/include/client/mir/client_context.h

src/include/client/mir_toolkit/mir_render_surface.h

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

src/platforms/mesa/client/client_platform.cpp

src/platforms/mesa/client/client_platform.h

src/platforms/mesa/server/kms/CMakeLists.txt

src/platforms/mesa/server/kms/guest_platform.cpp

src/platforms/mesa/server/kms/nested_authentication.cpp

src/platforms/mesa/server/kms/nested_authentication.h

src/platforms/mesa/server/x11/graphics/display.cpp

src/platforms/mesa/server/x11/graphics/display.h

src/platforms/mesa/server/x11/graphics/display_configuration.cpp

src/platforms/mesa/server/x11/graphics/display_configuration.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/mir_client_host_connection.h

src/server/shell/canonical_window_manager.cpp

tests/acceptance-tests/staging/test_render_surface.cpp

tests/include/mir/test/doubles/mock_client_context.h

tests/include/mir/test/doubles/mock_mesa_auth_extensions.h

tests/include/mir/test/doubles/mock_nested_context.h

tests/include/mir/test/doubles/stub_host_connection.h

tests/unit-tests/client/test_mir_render_surface.cpp

tests/unit-tests/platforms/mesa/client/test_client_platform.cpp

tests/unit-tests/platforms/mesa/kms/test_guest_platform.cpp

tests/unit-tests/platforms/mesa/kms/test_nested_authentication.cpp

tests/unit-tests/platforms/mesa/x11/test_display.cpp

Older »