← Back to branch summary

~kdub/mir/nested-passthrough

~kdub/mir/nested-passthrough

Viewing all changes in revision 3738.

Committer: Kevin DuBois
Date: 2016-10-04 14:25:28 UTC
mfrom: (3666.37.29 trunk)
Revision ID: kevin.dubois@canonical.com-20161004142528-ysn8lobq0z9z12i8

merge in mir

files added:
src/platforms/mesa/server/x11/graphics/egl_helper.cpp

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

files removed:
src/platforms/mesa/server/x11/graphics/display_group.cpp

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

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

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

files renamed:
tests/integration-tests/test_exchange_buffer.cpp => tests/integration-tests/test_submit_buffer.cpp

files modified:
examples/animated_cursor_demo_client.c

examples/camera.c

examples/client_touch_validator.cpp

examples/cursors_demo_client.c

examples/demo_client_display_config.c

examples/eglapp.c

examples/eglapp.h

examples/eglcounter.cpp

examples/eglflash.c

examples/eglplasma.c

examples/eglstateswitcher.c

examples/egltriangle.c

examples/pointer_confinement.c

examples/scroll.cpp

examples/target.c

examples/tooltip.c

include/server/mir/frontend/session_mediator_report.h

src/client/rpc/mir_display_server.cpp

src/client/rpc/mir_display_server.h

src/client/symbols.map

src/include/common/mir/protobuf/display_server.h

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

src/platforms/mesa/server/x11/graphics/CMakeLists.txt

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

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

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

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

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

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_message_processor.h

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/report/logging/session_mediator_report.cpp

src/server/report/logging/session_mediator_report.h

src/server/report/lttng/session_mediator_report.cpp

src/server/report/lttng/session_mediator_report.h

src/server/report/lttng/session_mediator_report_tp.h

src/server/report/null/session_mediator_report.cpp

src/server/report/null/session_mediator_report.h

src/utils/vanity.c

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_session_mediator_report.cpp

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

tests/include/mir/test/stub_server_tool.h

tests/include/mir/test/test_protobuf_client.h

tests/integration-tests/CMakeLists.txt

tests/mir_test_doubles/mock_x11.cpp

tests/mir_test_doubles/test_protobuf_client.cpp

tests/performance-tests/system_performance_test.cpp

tests/performance-tests/system_performance_test.h

tests/performance-tests/test_compositor.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_protobuf_rpc_channel.cpp

tests/unit-tests/frontend/stress_protobuf_communicator.cpp

tests/unit-tests/frontend/test_protobuf_message_processor.cpp

tests/unit-tests/frontend/test_published_socket_connector.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/test_platform_prober.cpp

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

Show diffs side-by-side

added added

removed removed

examples/animated_cursor_demo_client.c

examples/camera.c

examples/client_touch_validator.cpp

examples/cursors_demo_client.c

examples/demo_client_display_config.c

examples/eglapp.c

examples/eglapp.h

examples/eglcounter.cpp

examples/eglflash.c

examples/eglplasma.c

examples/eglstateswitcher.c

examples/egltriangle.c

examples/pointer_confinement.c

examples/scroll.cpp

examples/target.c

examples/tooltip.c

include/server/mir/frontend/session_mediator_report.h

src/client/rpc/mir_display_server.cpp

src/client/rpc/mir_display_server.h

src/client/symbols.map

src/include/common/mir/protobuf/display_server.h

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

src/platforms/mesa/server/x11/graphics/CMakeLists.txt

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

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

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

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

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

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

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

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

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

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

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

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_message_processor.h

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/report/logging/session_mediator_report.cpp

src/server/report/logging/session_mediator_report.h

src/server/report/lttng/session_mediator_report.cpp

src/server/report/lttng/session_mediator_report.h

src/server/report/lttng/session_mediator_report_tp.h

src/server/report/null/session_mediator_report.cpp

src/server/report/null/session_mediator_report.h

src/utils/vanity.c

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_session_mediator_report.cpp

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

tests/include/mir/test/stub_server_tool.h

tests/include/mir/test/test_protobuf_client.h

tests/integration-tests/CMakeLists.txt

tests/integration-tests/test_submit_buffer.cpp

tests/mir_test_doubles/mock_x11.cpp

tests/mir_test_doubles/test_protobuf_client.cpp

tests/performance-tests/system_performance_test.cpp

tests/performance-tests/system_performance_test.h

tests/performance-tests/test_compositor.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_protobuf_rpc_channel.cpp

tests/unit-tests/frontend/stress_protobuf_communicator.cpp

tests/unit-tests/frontend/test_protobuf_message_processor.cpp

tests/unit-tests/frontend/test_published_socket_connector.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/test_platform_prober.cpp

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

Older »