Mir

Merge lp://qastaging/~vanvugt/mir/one-PixelFormat-type into lp://qastaging/mir

Proposed by Daniel van Vugt
Status: Merged
Merged at revision: 1267
Proposed branch: lp://qastaging/~vanvugt/mir/one-PixelFormat-type
Merge into: lp://qastaging/mir
Diff against target: 3281 lines (+355/-434)
135 files modified
debian/control (+2/-2)
debian/libmirserver12.install (+1/-1)
examples/demo-inprocess-surface-client/inprocess_egl_client.cpp (+1/-1)
examples/eglapp.c (+1/-18)
include/platform/mir/graphics/buffer.h (+2/-2)
include/platform/mir/graphics/buffer_properties.h (+4/-4)
include/platform/mir/graphics/display_configuration.h (+1/-2)
include/platform/mir/graphics/graphic_buffer_allocator.h (+1/-1)
include/server/mir/compositor/buffer_stream.h (+2/-2)
include/server/mir/frontend/surface.h (+1/-2)
include/server/mir/shell/surface_creation_parameters.h (+3/-3)
include/shared/mir/geometry/pixel_format.h (+0/-54)
include/shared/mir_toolkit/client_types.h (+0/-20)
include/shared/mir_toolkit/common.h (+24/-0)
include/test/mir_test/draw/draw_pattern_checkered-inl.h (+3/-4)
include/test/mir_test_doubles/mock_alloc_adaptor.h (+1/-1)
include/test/mir_test_doubles/mock_buffer.h (+2/-2)
include/test/mir_test_doubles/mock_buffer_stream.h (+1/-1)
include/test/mir_test_doubles/mock_framebuffer_bundle.h (+1/-1)
include/test/mir_test_doubles/mock_frontend_surface.h (+1/-1)
include/test/mir_test_doubles/mock_surface.h (+1/-1)
include/test/mir_test_doubles/stub_buffer.h (+3/-3)
include/test/mir_test_doubles/stub_buffer_allocator.h (+1/-1)
include/test/mir_test_doubles/stub_buffer_stream.h (+2/-2)
include/test/mir_test_doubles/stub_display_builder.h (+2/-2)
include/test/mir_test_doubles/stub_display_configuration.h (+6/-6)
src/client/android/android_client_buffer.cpp (+3/-3)
src/client/android/android_client_buffer.h (+3/-3)
src/client/android/android_client_buffer_factory.cpp (+1/-1)
src/client/android/android_client_buffer_factory.h (+2/-2)
src/client/android/android_registrar_gralloc.h (+1/-1)
src/client/client_buffer.h (+2/-3)
src/client/client_buffer_depository.cpp (+1/-1)
src/client/client_buffer_depository.h (+2/-2)
src/client/client_buffer_factory.h (+2/-2)
src/client/gbm/gbm_client_buffer.cpp (+3/-3)
src/client/gbm/gbm_client_buffer.h (+3/-3)
src/client/gbm/gbm_client_buffer_factory.cpp (+1/-1)
src/client/gbm/gbm_client_buffer_factory.h (+1/-1)
src/client/mir_surface.cpp (+3/-3)
src/client/mir_surface.h (+1/-2)
src/platform/graphics/android/android_alloc_adaptor.cpp (+1/-1)
src/platform/graphics/android/android_alloc_adaptor.h (+1/-1)
src/platform/graphics/android/android_buffer_allocator.cpp (+6/-6)
src/platform/graphics/android/android_display_configuration.cpp (+1/-1)
src/platform/graphics/android/android_format_conversion-inl.h (+15/-15)
src/platform/graphics/android/android_graphic_buffer_allocator.h (+2/-2)
src/platform/graphics/android/buffer.cpp (+2/-2)
src/platform/graphics/android/buffer.h (+1/-1)
src/platform/graphics/android/display_builder.h (+2/-2)
src/platform/graphics/android/framebuffer_bundle.h (+2/-2)
src/platform/graphics/android/framebuffers.cpp (+4/-4)
src/platform/graphics/android/framebuffers.h (+2/-2)
src/platform/graphics/android/gl_context.cpp (+2/-3)
src/platform/graphics/android/gl_context.h (+2/-2)
src/platform/graphics/android/graphic_alloc_adaptor.h (+2/-2)
src/platform/graphics/android/graphic_buffer_allocator.h (+2/-2)
src/platform/graphics/android/hwc11_device.h (+2/-2)
src/platform/graphics/android/internal_client_window.cpp (+1/-1)
src/platform/graphics/android/internal_client_window.h (+1/-1)
src/platform/graphics/android/output_builder.cpp (+1/-1)
src/platform/graphics/android/output_builder.h (+1/-1)
src/platform/graphics/android/server_render_window.h (+1/-1)
src/platform/graphics/gbm/buffer_allocator.cpp (+6/-6)
src/platform/graphics/gbm/buffer_allocator.h (+2/-2)
src/platform/graphics/gbm/gbm_buffer.cpp (+9/-9)
src/platform/graphics/gbm/gbm_buffer.h (+3/-3)
src/platform/graphics/gbm/real_kms_display_configuration.cpp (+2/-2)
src/platform/graphics/gbm/shm_buffer.cpp (+3/-3)
src/platform/graphics/gbm/shm_buffer.h (+4/-4)
src/server/CMakeLists.txt (+1/-1)
src/server/compositor/buffer_stream_surfaces.cpp (+1/-1)
src/server/compositor/buffer_stream_surfaces.h (+1/-1)
src/server/compositor/temporary_buffers.cpp (+1/-1)
src/server/compositor/temporary_buffers.h (+1/-1)
src/server/frontend/session_mediator.cpp (+2/-2)
src/server/frontend/session_mediator.h (+3/-3)
src/server/graphics/nested/nested_display_configuration.cpp (+2/-2)
src/server/graphics/offscreen/display_configuration.cpp (+1/-1)
src/server/scene/basic_surface.h (+2/-2)
src/server/scene/surface.cpp (+1/-1)
src/server/scene/surface.h (+1/-1)
src/server/scene/surface_allocator.cpp (+6/-0)
src/server/scene/surface_impl.cpp (+1/-1)
src/server/scene/surface_impl.h (+1/-1)
src/server/shell/surface_creation_parameters.cpp (+2/-2)
tests/acceptance-tests/test_surfaceloop.cpp (+1/-1)
tests/draw/android_graphics.cpp (+2/-2)
tests/draw/patterns.cpp (+3/-4)
tests/integration-tests/client/test_client_render.cpp (+5/-5)
tests/integration-tests/compositor/test_buffer_stream.cpp (+1/-1)
tests/integration-tests/compositor/test_swapping_swappers.cpp (+1/-1)
tests/integration-tests/graphics/android/test_buffer_integration.cpp (+2/-2)
tests/integration-tests/graphics/android/test_internal_client.cpp (+1/-1)
tests/integration-tests/graphics/gbm/test_buffer_integration.cpp (+2/-2)
tests/integration-tests/test_display_info.cpp (+8/-8)
tests/integration-tests/test_surfaceloop.cpp (+1/-1)
tests/integration-tests/test_swapinterval.cpp (+1/-1)
tests/mir_test/display_config_matchers.cpp (+4/-5)
tests/mir_test_framework/testing_client_options.cpp (+3/-3)
tests/mir_test_framework/testing_server_options.cpp (+1/-1)
tests/unit-tests/client/android/test_client_android_buffer.cpp (+3/-3)
tests/unit-tests/client/android/test_client_surface_interpreter.cpp (+1/-1)
tests/unit-tests/client/gbm/test_gbm_client_buffer.cpp (+2/-2)
tests/unit-tests/client/gbm/test_native_surface.cpp (+1/-1)
tests/unit-tests/client/test_aging_buffer.cpp (+1/-1)
tests/unit-tests/client/test_android_client_buffer_factory.cpp (+2/-2)
tests/unit-tests/client/test_client_buffer_depository.cpp (+5/-5)
tests/unit-tests/client/test_client_mir_surface.cpp (+8/-8)
tests/unit-tests/client/test_mir_connection.cpp (+1/-1)
tests/unit-tests/compositor/test_buffer_stream.cpp (+2/-2)
tests/unit-tests/compositor/test_switching_bundle.cpp (+2/-2)
tests/unit-tests/compositor/test_temporary_buffers.cpp (+3/-3)
tests/unit-tests/frontend/test_session_mediator.cpp (+7/-7)
tests/unit-tests/frontend/test_session_mediator_android.cpp (+2/-2)
tests/unit-tests/frontend/test_session_mediator_gbm.cpp (+2/-2)
tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp (+3/-3)
tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp (+6/-6)
tests/unit-tests/graphics/android/test_buffer.cpp (+4/-4)
tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp (+2/-2)
tests/unit-tests/graphics/android/test_fb_simple_swapper.cpp (+5/-5)
tests/unit-tests/graphics/android/test_hwc10_device.cpp (+2/-2)
tests/unit-tests/graphics/android/test_output_builder.cpp (+1/-1)
tests/unit-tests/graphics/android/test_pixel_format.cpp (+9/-10)
tests/unit-tests/graphics/android/test_server_interpreter.cpp (+2/-2)
tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp (+2/-2)
tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp (+12/-12)
tests/unit-tests/graphics/gbm/test_internal_native_display.cpp (+0/-9)
tests/unit-tests/graphics/gbm/test_shm_buffer.cpp (+4/-4)
tests/unit-tests/graphics/test_buffer_properties.cpp (+6/-6)
tests/unit-tests/graphics/test_default_display_configuration_policy.cpp (+3/-3)
tests/unit-tests/graphics/test_display_configuration.cpp (+1/-1)
tests/unit-tests/graphics/test_graphics_platform.cpp (+1/-1)
tests/unit-tests/scene/test_surface.cpp (+7/-7)
tests/unit-tests/scene/test_surface_impl.cpp (+1/-1)
To merge this branch: bzr merge lp://qastaging/~vanvugt/mir/one-PixelFormat-type
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Robert Carr (community) Approve
Alexandros Frantzis (community) Approve
Alan Griffiths Approve
Review via email: mp+196852@code.qastaging.launchpad.net

Commit message

Unify redundant PixelFormat typedefs into one: MirPixelFormat (LP: #1110115)

Description of the change

It's not a high priority change, but it had to happen eventually. And being a clear ABI+API break, we should do it ASAP.

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

ok

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Needs resync with development-branch.

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Fixed. Try again.

Revision history for this message
Robert Carr (robertcarr) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches