lp:~andreas-pokorny/mir/add-pixel-format-to-display-configuration
Created by
Andreas Pokorny
on
2014-01-02
and last modified on
2014-01-10
- Get this branch:
- bzr branch lp:~andreas-pokorny/mir/add-pixel-format-to-display-configuration
Only
Andreas Pokorny
can upload to this branch. If you are
Andreas Pokorny
please log in for upload directions.
Branch merges
Propose for merging
- PS Jenkins bot (community): Approve (continuous-integration) on 2014-01-10
- Daniel van Vugt: Approve on 2014-01-10
- Alan Griffiths: Abstain on 2014-01-09
- Robert Carr (community): Approve on 2014-01-02
-
Diff: 1838 lines (+481/-326)40 files modifieddebian/control (+2/-2)
debian/libmirclient5.install (+1/-1)
examples/demo-shell/window_manager.cpp (+2/-1)
examples/server_configuration.cpp (+8/-4)
include/platform/mir/graphics/display_configuration.h (+5/-4)
include/shared/mir_toolkit/client_types.h (+1/-1)
include/test/mir_test_doubles/null_display_configuration.h (+7/-7)
include/test/mir_test_doubles/stub_display_configuration.h (+6/-5)
src/client/CMakeLists.txt (+1/-1)
src/client/display_configuration.cpp (+1/-1)
src/platform/graphics/android/android_display_configuration.cpp (+9/-3)
src/platform/graphics/android/android_display_configuration.h (+4/-3)
src/platform/graphics/mesa/real_kms_display_configuration.cpp (+21/-5)
src/platform/graphics/mesa/real_kms_display_configuration.h (+4/-4)
src/server/frontend/protobuf_buffer_packer.cpp (+1/-1)
src/server/frontend/session_mediator.cpp (+4/-1)
src/server/graphics/default_display_configuration_policy.cpp (+53/-14)
src/server/graphics/nested/nested_display.cpp (+42/-57)
src/server/graphics/nested/nested_display.h (+6/-5)
src/server/graphics/nested/nested_display_configuration.cpp (+24/-5)
src/server/graphics/nested/nested_display_configuration.h (+3/-3)
src/server/graphics/nested/nested_output.cpp (+3/-2)
src/server/graphics/nested/nested_output.h (+2/-1)
src/server/graphics/nested/nested_platform.cpp (+2/-2)
src/server/graphics/nested/nested_platform.h (+5/-5)
src/server/graphics/offscreen/display_configuration.cpp (+4/-2)
src/server/graphics/offscreen/display_configuration.h (+4/-4)
src/server/scene/mediating_display_changer.cpp (+1/-0)
tests/acceptance-tests/test_client_library.cpp (+1/-1)
tests/mir_test/display_config_matchers.cpp (+5/-5)
tests/mir_test_framework/stubbed_server_configuration.cpp (+1/-1)
tests/unit-tests/frontend/test_session_mediator.cpp (+7/-3)
tests/unit-tests/graphics/android/test_android_fb.cpp (+22/-22)
tests/unit-tests/graphics/mesa/test_cursor.cpp (+7/-7)
tests/unit-tests/graphics/mesa/test_display_configuration.cpp (+7/-7)
tests/unit-tests/graphics/mesa/test_display_multi_monitor.cpp (+16/-6)
tests/unit-tests/graphics/mesa/test_overlapping_output_grouping.cpp (+2/-2)
tests/unit-tests/graphics/nested/test_nested_display_configuration.cpp (+27/-11)
tests/unit-tests/graphics/test_default_display_configuration_policy.cpp (+159/-116)
tests/unit-tests/graphics/test_display_configuration.cpp (+1/-1)
- Mir development team: Pending requested 2014-01-02
-
Diff: 2751 lines (+957/-452)58 files modifiedbenchmarks/CMakeLists.txt (+3/-1)
doc/building_source_for_android.md (+21/-32)
examples/demo-shell/window_manager.cpp (+2/-1)
examples/server_configuration.cpp (+8/-4)
include/platform/mir/graphics/display_configuration.h (+3/-3)
include/platform/mir/graphics/pixel_format_utils.h (+50/-0)
include/platform/mir/graphics/platform.h (+1/-1)
include/shared/mir/logging/input_timestamp.h (+35/-0)
include/shared/mir_toolkit/client_types.h (+1/-1)
include/test/mir_test_doubles/mock_surface_renderer.h (+2/-1)
include/test/mir_test_doubles/null_display_configuration.h (+1/-1)
include/test/mir_test_doubles/stub_display_configuration.h (+6/-5)
src/client/display_configuration.cpp (+1/-1)
src/client/logging/input_receiver_report.cpp (+3/-2)
src/platform/graphics/CMakeLists.txt (+1/-0)
src/platform/graphics/android/android_display_configuration.cpp (+4/-2)
src/platform/graphics/android/android_display_configuration.h (+1/-1)
src/platform/graphics/mesa/real_kms_display_configuration.cpp (+64/-40)
src/platform/graphics/mesa/real_kms_display_configuration.h (+2/-2)
src/platform/graphics/pixel_format_utils.cpp (+71/-0)
src/server/compositor/default_display_buffer_compositor.cpp (+2/-1)
src/server/compositor/gl_renderer.cpp (+28/-33)
src/server/compositor/gl_renderer.h (+12/-22)
src/server/compositor/renderer.h (+2/-1)
src/server/frontend/protobuf_buffer_packer.cpp (+1/-1)
src/server/frontend/session_mediator.cpp (+3/-1)
src/server/graphics/default_display_configuration_policy.cpp (+54/-19)
src/server/graphics/nested/nested_display.cpp (+42/-57)
src/server/graphics/nested/nested_display.h (+6/-5)
src/server/graphics/nested/nested_display_configuration.cpp (+35/-10)
src/server/graphics/nested/nested_display_configuration.h (+1/-1)
src/server/graphics/nested/nested_output.cpp (+3/-2)
src/server/graphics/nested/nested_output.h (+2/-1)
src/server/graphics/nested/nested_platform.cpp (+2/-2)
src/server/graphics/nested/nested_platform.h (+5/-5)
src/server/graphics/offscreen/display_configuration.cpp (+4/-2)
src/server/graphics/offscreen/display_configuration.h (+4/-4)
src/server/logging/input_report.cpp (+4/-3)
src/server/scene/mediating_display_changer.cpp (+1/-0)
src/shared/logging/CMakeLists.txt (+1/-0)
src/shared/logging/input_timestamp.cpp (+41/-0)
tests/acceptance-tests/test_server_shutdown.cpp (+5/-1)
tests/integration-tests/test_session.cpp (+4/-1)
tests/integration-tests/test_surface_first_frame_sync.cpp (+5/-1)
tests/mir_test/display_config_matchers.cpp (+2/-2)
tests/mir_test_framework/stubbed_server_configuration.cpp (+6/-2)
tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp (+63/-2)
tests/unit-tests/frontend/test_session_mediator.cpp (+7/-3)
tests/unit-tests/graphics/CMakeLists.txt (+1/-0)
tests/unit-tests/graphics/android/test_android_fb.cpp (+22/-22)
tests/unit-tests/graphics/mesa/test_cursor.cpp (+7/-7)
tests/unit-tests/graphics/mesa/test_display_configuration.cpp (+7/-7)
tests/unit-tests/graphics/mesa/test_display_multi_monitor.cpp (+16/-6)
tests/unit-tests/graphics/mesa/test_overlapping_output_grouping.cpp (+2/-2)
tests/unit-tests/graphics/nested/test_nested_display_configuration.cpp (+27/-11)
tests/unit-tests/graphics/test_default_display_configuration_policy.cpp (+159/-116)
tests/unit-tests/graphics/test_display_configuration.cpp (+1/-1)
tests/unit-tests/graphics/test_pixel_format_utils.cpp (+90/-0)
Related source package recipes
Related bugs
Related blueprints
Branch information
Recent revisions
- 1313. By Andreas Pokorny on 2014-01-09
-
more reasonable opaque format selection, and turned chnage into a real API change for the client_types
- 1308. By Andreas Pokorny on 2014-01-02
-
Provide opaque pixel formats to clients
Up to now only transparent pixel formats were advertized in the DisplayOutput structure
on android. Since with that MP the available formats are scanned for opaque and transparent
ones and then used in nested_display the format array must be more complete. - 1307. By Andreas Pokorny on 2014-01-02
-
Adds a mir pixel format parameter to DisplayConfigur
ation:: configure_ output So within DisplayConfigur
ationPolicy the format can be specified for each output.
The pixel format parameter is still ignored by android and also mesa to some degree,
which only validates it. It is supported by nested display. The default configuration
policy implementation tries to select an opaque format though. - 1305. By Andreas Pokorny on 2014-01-02
-
Renamed valid_format to valid_mir_
pixel_format
added missing include guard.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:mir/0.1
