← Back to branch summary

~kdub/mir/fix-1663062-step2

~kdub/mir/fix-1663062-step2

Viewing all changes in revision 4030.

Committer: Kevin DuBois
Date: 2017-02-14 17:50:37 UTC
mfrom: (4023.2.8 development-branch)
Revision ID: kevin.dubois@canonical.com-20170214175037-kbhn11p8853u96o7

merge in mir

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

files renamed:
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:
examples/CMakeLists.txt

include/client/mir/event_printer.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/android/server/buffer.cpp

src/platforms/android/server/buffer.h

src/platforms/mesa/server/gbm_buffer.cpp

src/platforms/mesa/server/gbm_buffer.h

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

src/server/compositor/screencast_display_buffer.cpp

src/server/graphics/nested/buffer.cpp

src/utils/out.c

tests/acceptance-tests/test_confined_pointer.cpp

tests/acceptance-tests/test_nested_input.cpp

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

tests/mir_test_framework/any_surface.cpp

tests/privileged-tests/test_input_events.cpp

tests/unit-tests/compositor/test_screencast_display_buffer.cpp

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

Show diffs side-by-side

added added

removed removed

examples/CMakeLists.txt

examples/chain_jumping_buffers.c

examples/prerendered_frames.c

include/client/mir/event_printer.h

include/renderers/gl/mir/renderer/gl/texture_target.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/android/server/buffer.cpp

src/platforms/android/server/buffer.h

src/platforms/mesa/server/gbm_buffer.cpp

src/platforms/mesa/server/gbm_buffer.h

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

src/server/compositor/screencast_display_buffer.cpp

src/server/graphics/nested/buffer.cpp

src/utils/out.c

tests/acceptance-tests/test_confined_pointer.cpp

tests/acceptance-tests/test_nested_input.cpp

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

tests/mir_test_framework/any_surface.cpp

tests/privileged-tests/test_input_events.cpp

tests/unit-tests/compositor/test_screencast_display_buffer.cpp

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

Older »