← Back to branch summary

~alan-griffiths/mir/fix-1667645

~alan-griffiths/mir/fix-1667645

Viewing all changes in revision 4023.5.4.

Committer: Daniel van Vugt
Date: 2017-02-15 07:38:33 UTC
mfrom: (4033 development-branch)
mto: This revision was merged to the branch mainline in revision 4035.
Revision ID: daniel.van.vugt@canonical.com-20170215073833-exmyu9xjlkmzc4vy

Merge latest trunk

files added:
include/renderers/gl/mir/renderer/gl/texture_target.h

files renamed:
debian/mir-platform-graphics-android12.install => debian/mir-platform-graphics-android13.install

debian/mir-platform-graphics-mesa-kms12.install => debian/mir-platform-graphics-mesa-kms13.install

debian/mir-platform-graphics-mesa-x12.install => debian/mir-platform-graphics-mesa-x13.install

playground/mir_demo_client_chain_jumping_buffers.c => examples/chain_jumping_buffers.c

playground/mir_demo_client_prerendered_frames.c => examples/prerendered_frames.c

playground/render_surface.cpp => examples/render_surface.cpp

files modified:
debian/control

examples/CMakeLists.txt

include/client/mir/event_printer.h

include/platform/mir/graphics/display.h

include/test/mir/test/doubles/null_display.h

include/test/mir_test_framework/any_surface.h

playground/CMakeLists.txt

src/client/event_printer.cpp

src/client/logging/rpc_report.cpp

src/platform/symbols.map

src/platforms/CMakeLists.txt

src/platforms/android/server/buffer.cpp

src/platforms/android/server/buffer.h

src/platforms/android/server/display.cpp

src/platforms/android/server/display.h

src/platforms/eglstream-kms/server/display.cpp

src/platforms/eglstream-kms/server/display.h

src/platforms/mesa/server/gbm_buffer.cpp

src/platforms/mesa/server/gbm_buffer.h

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

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

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

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

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

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

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

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

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

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

src/server/compositor/screencast_display_buffer.cpp

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/buffer.cpp

src/server/graphics/nested/cursor.cpp

src/server/graphics/nested/display.cpp

src/server/graphics/nested/display.h

src/server/graphics/nested/host_connection.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/mir_client_host_connection.h

src/server/graphics/nested/platform.cpp

src/utils/out.c

tests/acceptance-tests/test_confined_pointer.cpp

tests/acceptance-tests/test_nested_input.cpp

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

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

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

tests/mir_test_framework/any_surface.cpp

tests/mir_test_framework/stubbed_graphics_platform.cpp

tests/privileged-tests/test_input_events.cpp

tests/unit-tests/compositor/test_screencast_display_buffer.cpp

tests/unit-tests/platforms/mesa/kms/mock_kms_output.h

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

tests/unit-tests/platforms/nested/test_nested_cursor.cpp

Show diffs side-by-side

added added

removed removed

debian/mir-platform-graphics-android13.install

debian/mir-platform-graphics-mesa-kms13.install

debian/mir-platform-graphics-mesa-x13.install

examples/CMakeLists.txt

examples/chain_jumping_buffers.c

examples/prerendered_frames.c

include/client/mir/event_printer.h

include/platform/mir/graphics/display.h

include/renderers/gl/mir/renderer/gl/texture_target.h

include/test/mir/test/doubles/null_display.h

include/test/mir_test_framework/any_surface.h

playground/CMakeLists.txt

src/client/event_printer.cpp

src/client/logging/rpc_report.cpp

src/platform/symbols.map

src/platforms/CMakeLists.txt

src/platforms/android/server/buffer.cpp

src/platforms/android/server/buffer.h

src/platforms/android/server/display.cpp

src/platforms/android/server/display.h

src/platforms/eglstream-kms/server/display.cpp

src/platforms/eglstream-kms/server/display.h

src/platforms/mesa/server/gbm_buffer.cpp

src/platforms/mesa/server/gbm_buffer.h

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

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

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

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

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

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

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

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

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

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

src/server/compositor/screencast_display_buffer.cpp

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/buffer.cpp

src/server/graphics/nested/cursor.cpp

src/server/graphics/nested/display.cpp

src/server/graphics/nested/display.h

src/server/graphics/nested/host_connection.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/mir_client_host_connection.h

src/server/graphics/nested/platform.cpp

src/utils/out.c

tests/acceptance-tests/test_confined_pointer.cpp

tests/acceptance-tests/test_nested_input.cpp

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

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

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

tests/mir_test_framework/any_surface.cpp

tests/mir_test_framework/stubbed_graphics_platform.cpp

tests/privileged-tests/test_input_events.cpp

tests/unit-tests/compositor/test_screencast_display_buffer.cpp

tests/unit-tests/platforms/mesa/kms/mock_kms_output.h

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

tests/unit-tests/platforms/nested/test_nested_cursor.cpp

Older »