~ubuntu-branches/ubuntu/utopic/mir/utopic-proposed

« back to all changes in this revision

Viewing changes to src/platform/graphics/mesa/display.cpp

Committer: Package Import Robot
Author(s): Ubuntu daily release
Date: 2014-03-10 19:28:46 UTC
mto: This revision was merged to the branch mainline in revision 63.
Revision ID: package-import@ubuntu.com-20140310192846-rq9qm3ec26yrelo2

Tags: upstream-0.1.6+14.04.20140310

Import upstream version 0.1.6+14.04.20140310

files added:
examples/render_overlays.cpp

include/platform/mir/abnormal_exit.h

include/platform/mir/options/configuration.h

include/platform/mir/options/default_configuration.h

include/server/mir/report

include/server/mir/report/legacy_input_report.h

include/server/mir/report/logging

include/shared/mir/report

include/shared/mir/report/lttng

include/shared/mir/report/lttng/mir_tracepoint.h

include/shared/mir/report/lttng/tracepoint_provider.h

include/shared/mir/shared_library.h

include/test/mir_test/draw/graphics_region_factory.h

include/test/mir_test_doubles/mock_renderer.h

include/test/mir_test_doubles/stub_renderer.h

src/client/android/CMakeLists.txt

src/client/android/client_platform_factory.cpp

src/client/android/client_platform_factory.h

src/client/lttng/input_receiver_report.cpp

src/client/lttng/input_receiver_report.h

src/client/lttng/input_receiver_report_tp.h

src/client/lttng/tracepoints.c

src/client/mesa/CMakeLists.txt

src/client/mesa/client_platform_factory.cpp

src/client/mesa/client_platform_factory.h

src/platform/graphics/android/configurable_display_buffer.h

src/platform/options

src/platform/options/CMakeLists.txt

src/platform/options/default_configuration.cpp

src/platform/options/program_option.cpp

src/server/compositor/compositing_screencast.cpp

src/server/compositor/compositing_screencast.h

src/server/compositor/screencast_display_buffer.cpp

src/server/compositor/screencast_display_buffer.h

src/server/report

src/server/report/CMakeLists.txt

src/server/report/default_server_configuration.cpp

src/server/report/logging

src/server/report/logging/CMakeLists.txt

src/server/report/logging/compositor_report.cpp

src/server/report/logging/compositor_report.h

src/server/report/logging/connector_report.cpp

src/server/report/logging/connector_report.h

src/server/report/logging/display_report.cpp

src/server/report/logging/display_report.h

src/server/report/logging/input_report.cpp

src/server/report/logging/input_report.h

src/server/report/logging/logging_report_factory.cpp

src/server/report/logging/message_processor_report.cpp

src/server/report/logging/message_processor_report.h

src/server/report/logging/scene_report.cpp

src/server/report/logging/scene_report.h

src/server/report/logging/session_mediator_report.cpp

src/server/report/logging/session_mediator_report.h

src/server/report/logging_report_factory.h

src/server/report/lttng

src/server/report/lttng/CMakeLists.txt

src/server/report/lttng/compositor_report.cpp

src/server/report/lttng/compositor_report.h

src/server/report/lttng/compositor_report_tp.h

src/server/report/lttng/connector_report.cpp

src/server/report/lttng/connector_report.h

src/server/report/lttng/connector_report_tp.h

src/server/report/lttng/display_report.cpp

src/server/report/lttng/display_report.h

src/server/report/lttng/display_report_tp.h

src/server/report/lttng/input_report.cpp

src/server/report/lttng/input_report.h

src/server/report/lttng/input_report_tp.h

src/server/report/lttng/lttng_report_factory.cpp

src/server/report/lttng/lttng_utils.h

src/server/report/lttng/lttng_utils_pop.h

src/server/report/lttng/message_processor_report.cpp

src/server/report/lttng/message_processor_report.h

src/server/report/lttng/message_processor_report_tp.h

src/server/report/lttng/scene_report.cpp

src/server/report/lttng/scene_report.h

src/server/report/lttng/scene_report_tp.h

src/server/report/lttng/server_tracepoint_provider.cpp

src/server/report/lttng/server_tracepoint_provider.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/lttng/tracepoints.c

src/server/report/lttng_report_factory.h

src/server/report/null

src/server/report/null/CMakeLists.txt

src/server/report/null/compositor_report.cpp

src/server/report/null/compositor_report.h

src/server/report/null/connector_report.cpp

src/server/report/null/connector_report.h

src/server/report/null/display_report.cpp

src/server/report/null/display_report.h

src/server/report/null/input_report.cpp

src/server/report/null/input_report.h

src/server/report/null/message_processor_report.cpp

src/server/report/null/message_processor_report.h

src/server/report/null/null_report_factory.cpp

src/server/report/null/scene_report.cpp

src/server/report/null/scene_report.h

src/server/report/null/session_mediator_report.cpp

src/server/report/null/session_mediator_report.h

src/server/report/null_report_factory.h

src/server/report/report_factory.h

src/shared/report

src/shared/report/lttng

src/shared/report/lttng/CMakeLists.txt

src/shared/report/lttng/tracepoint_provider.cpp

src/shared/sharedlibrary

src/shared/sharedlibrary/CMakeLists.txt

src/shared/sharedlibrary/shared_library.cpp

tests/draw/android_graphics_region_factory.cpp

tests/draw/mesa_graphics_region_factory.cpp

tests/unit-tests/compositor/test_compositing_screencast.cpp

tests/unit-tests/compositor/test_screencast_display_buffer.cpp

tests/unit-tests/graphics/mesa/mock_kms_output.h

tests/unit-tests/graphics/mesa/test_drm_helper.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tools/valgrind_suppressions_armhf

files removed:
include/platform/mir/graphics/null_display_report.h

include/server/mir/abnormal_exit.h

include/server/mir/default_configuration_options.h

include/server/mir/frontend/null_message_processor_report.h

include/server/mir/input/null_input_report.h

include/server/mir/logging/input_report.h

include/server/mir/logging/message_processor_report.h

include/server/mir/lttng

include/server/mir/lttng/input_report.h

include/server/mir/lttng/message_processor_report.h

include/server/mir/lttng/server_tracepoint_provider.h

include/server/mir/shared_library.h

include/shared/mir/lttng

include/shared/mir/lttng/mir_tracepoint.h

include/shared/mir/lttng/tracepoint_provider.h

include/test/mir_test/draw/android_graphics.h

include/test/mir_test_doubles/mock_surface_renderer.h

src/client/lttng/rpc_report_tp.c

src/client/native_client_platform_factory.h

src/platform/graphics/null_display_report.cpp

src/server/compositor/null_compositor_report.cpp

src/server/default_configuration_options.cpp

src/server/frontend/null_message_processor_report.cpp

src/server/frontend/null_session_mediator_report.cpp

src/server/frontend/session_mediator_android.cpp

src/server/frontend/session_mediator_mesa.cpp

src/server/input/null_input_report.cpp

src/server/logging/compositor_report.cpp

src/server/logging/compositor_report.h

src/server/logging/connector_report.cpp

src/server/logging/connector_report.h

src/server/logging/display_report.cpp

src/server/logging/display_report.h

src/server/logging/input_report.cpp

src/server/logging/message_processor_report.cpp

src/server/logging/session_mediator_report.cpp

src/server/logging/session_mediator_report.h

src/server/lttng

src/server/lttng/CMakeLists.txt

src/server/lttng/input_report.cpp

src/server/lttng/input_report_tp.c

src/server/lttng/input_report_tp.h

src/server/lttng/message_processor_report.cpp

src/server/lttng/message_processor_report_tp.c

src/server/lttng/message_processor_report_tp.h

src/server/lttng/server_tracepoint_provider.cpp

src/server/options

src/server/options/CMakeLists.txt

src/server/options/program_option.cpp

src/server/scene/scene_report.cpp

src/server/scene/scene_report.h

src/server/scene/surface_data.cpp

src/server/scene/surface_data.h

src/server/shared_library.cpp

src/shared/lttng

src/shared/lttng/CMakeLists.txt

src/shared/lttng/tracepoint_provider.cpp

tests/draw/android_graphics.cpp

tests/unit-tests/scene/test_surface_data.cpp

files modified:
CMakeLists.txt

cmake/FindXKBCOMMON.cmake

cmake/MirCommon.cmake

cmake/src/mir/mir_discover_gtest_tests.cpp

cross-compile-chroot.sh

doc/component_reports.md

examples/CMakeLists.txt

examples/basic_server_configuration.cpp

examples/demo-shell/demo_shell.cpp

examples/render_surfaces.cpp

examples/render_to_fb.cpp

examples/scroll.cpp

examples/server_configuration.cpp

examples/server_configuration.h

guides/cppguide.xml

include/platform/mir/graphics/drm_authenticator.h

include/platform/mir/udev/wrapper.h

include/server/mir/compositor/compositor_report.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/connector_report.h

include/server/mir/frontend/session_mediator_report.h

include/server/mir/input/surface.h

include/server/mir/scene/scene_report.h

include/test/mir_test/draw/patterns.h

include/test/mir_test_doubles/mock_display_device.h

include/test/mir_test_doubles/mock_drm.h

include/test/mir_test_doubles/mock_gl.h

include/test/mir_test_doubles/mock_hwc_composer_device_1.h

include/test/mir_test_doubles/mock_input_surface.h

include/test/mir_test_doubles/stub_display_builder.h

include/test/mir_test_doubles/stub_display_configuration.h

include/test/mir_test_doubles/stub_surface_builder.h

include/test/mir_test_framework/udev_environment.h

src/client/CMakeLists.txt

src/client/android/android_client_platform.cpp

src/client/client_platform_factory.h

src/client/default_connection_configuration.cpp

src/client/lttng/CMakeLists.txt

src/client/lttng/client_tracepoint_provider.h

src/client/lttng/rpc_report.cpp

src/client/mesa/client_platform.cpp

src/client/mesa/native_surface.cpp

src/client/mesa/native_surface.h

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_screencast_api.cpp

src/platform/CMakeLists.txt

src/platform/graphics/CMakeLists.txt

src/platform/graphics/android/CMakeLists.txt

src/platform/graphics/android/android_display.cpp

src/platform/graphics/android/android_display.h

src/platform/graphics/android/android_display_configuration.cpp

src/platform/graphics/android/android_display_configuration.h

src/platform/graphics/android/android_platform.cpp

src/platform/graphics/android/display_buffer.cpp

src/platform/graphics/android/display_buffer.h

src/platform/graphics/android/display_builder.h

src/platform/graphics/android/display_device.h

src/platform/graphics/android/fb_device.cpp

src/platform/graphics/android/fb_device.h

src/platform/graphics/android/hwc_common_device.cpp

src/platform/graphics/android/hwc_common_device.h

src/platform/graphics/android/hwc_device.cpp

src/platform/graphics/android/hwc_device.h

src/platform/graphics/android/hwc_fb_device.cpp

src/platform/graphics/android/hwc_fb_device.h

src/platform/graphics/android/hwc_layerlist.cpp

src/platform/graphics/android/hwc_layerlist.h

src/platform/graphics/android/hwc_layers.cpp

src/platform/graphics/android/hwc_layers.h

src/platform/graphics/android/output_builder.cpp

src/platform/graphics/android/output_builder.h

src/platform/graphics/mesa/CMakeLists.txt

src/platform/graphics/mesa/display.cpp

src/platform/graphics/mesa/display_buffer.cpp

src/platform/graphics/mesa/display_buffer.h

src/platform/graphics/mesa/display_helpers.cpp

src/platform/graphics/mesa/platform.cpp

src/platform/graphics/mesa/platform.h

src/platform/udev_wrapper.cpp

src/server/CMakeLists.txt

src/server/compositor/CMakeLists.txt

src/server/compositor/default_configuration.cpp

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/gl_renderer.cpp

src/server/compositor/gl_renderer.h

src/server/compositor/gl_renderer_factory.cpp

src/server/compositor/gl_renderer_factory.h

src/server/compositor/multi_threaded_compositor.cpp

src/server/compositor/renderer.h

src/server/compositor/switching_bundle.cpp

src/server/compositor/switching_bundle.h

src/server/default_server_configuration.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/default_configuration.cpp

src/server/frontend/published_socket_connector.cpp

src/server/frontend/published_socket_connector.h

src/server/frontend/session_mediator.cpp

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/nested_display.cpp

src/server/input/CMakeLists.txt

src/server/input/android/android_input_window_handle.cpp

src/server/input/default_configuration.cpp

src/server/logging/CMakeLists.txt

src/server/logging/default_configuration.cpp

src/server/scene/CMakeLists.txt

src/server/scene/application_session.cpp

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/default_configuration.cpp

src/server/scene/mutable_surface_state.h

src/server/scene/session_manager.cpp

src/server/scene/surface_allocator.cpp

src/server/scene/surface_impl.cpp

src/server/scene/surface_stack.cpp

src/shared/CMakeLists.txt

src/shared/graphics/android/CMakeLists.txt

src/utils/screencast.cpp

tests/CMakeLists.txt

tests/acceptance-tests/test_client_authorization.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/draw/CMakeLists.txt

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/CMakeLists.txt

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/compositor/test_swapping_swappers.cpp

tests/integration-tests/frontend/test_application_mediator_report.cpp

tests/integration-tests/graphics/android/test_buffer_integration.cpp

tests/integration-tests/graphics/android/test_display_integration.cpp

tests/integration-tests/graphics/android/test_internal_client.cpp

tests/integration-tests/graphics/mesa/test_buffer_integration.cpp

tests/integration-tests/input/CMakeLists.txt

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/mir_test_doubles/CMakeLists.txt

tests/mir_test_doubles/mock_drm.cpp

tests/mir_test_doubles/mock_gl.cpp

tests/mir_test_doubles/test_protobuf_socket_server.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/mir_test_framework/testing_client_options.cpp

tests/mir_test_framework/udev_environment.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/android_input/input_reader.cpp

tests/unit-tests/client/CMakeLists.txt

tests/unit-tests/client/android/test_android_client_platform.cpp

tests/unit-tests/client/mesa/test_client_platform.cpp

tests/unit-tests/client/mesa/test_native_surface.cpp

tests/unit-tests/client/test_client_platform.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/compositor/CMakeLists.txt

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/compositor/test_rendering_operator.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/test_published_socket_connector.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/frontend/test_session_mediator_android.cpp

tests/unit-tests/frontend/test_session_mediator_mesa.cpp

tests/unit-tests/graphics/CMakeLists.txt

tests/unit-tests/graphics/android/test_android_fb.cpp

tests/unit-tests/graphics/android/test_android_platform.cpp

tests/unit-tests/graphics/android/test_fb_device.cpp

tests/unit-tests/graphics/android/test_hwc_common_device.cpp

tests/unit-tests/graphics/android/test_hwc_device.cpp

tests/unit-tests/graphics/android/test_hwc_display.cpp

tests/unit-tests/graphics/android/test_hwc_layerlist.cpp

tests/unit-tests/graphics/android/test_hwc_layers.cpp

tests/unit-tests/graphics/android/test_output_builder.cpp

tests/unit-tests/graphics/mesa/CMakeLists.txt

tests/unit-tests/graphics/mesa/test_buffer_allocator.cpp

tests/unit-tests/graphics/mesa/test_cursor.cpp

tests/unit-tests/graphics/mesa/test_display.cpp

tests/unit-tests/graphics/mesa/test_display_buffer.cpp

tests/unit-tests/graphics/mesa/test_display_configuration.cpp

tests/unit-tests/graphics/mesa/test_display_multi_monitor.cpp

tests/unit-tests/graphics/mesa/test_gbm_buffer.cpp

tests/unit-tests/graphics/mesa/test_internal_client.cpp

tests/unit-tests/graphics/mesa/test_kms_page_flipper.cpp

tests/unit-tests/graphics/mesa/test_linux_virtual_terminal.cpp

tests/unit-tests/graphics/mesa/test_platform.cpp

tests/unit-tests/graphics/offscreen/test_offscreen_display.cpp

tests/unit-tests/graphics/test_display.cpp

tests/unit-tests/graphics/test_graphics_platform.cpp

tests/unit-tests/input/android/test_android_input_registrar.cpp

tests/unit-tests/input/android/test_android_input_window_handle.cpp

tests/unit-tests/logging/message_processor_report.cpp

tests/unit-tests/logging/test_compositor_report.cpp

tests/unit-tests/logging/test_display_report.cpp

tests/unit-tests/logging/test_legacy_input_report.cpp

tests/unit-tests/scene/CMakeLists.txt

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/scene/test_surface_stack.cpp

tests/unit-tests/test_udev_wrapper.cpp

tools/install_on_android.sh

tools/setup-partial-armhf-chroot.sh

Show diffs side-by-side

added added

removed removed

src/platform/graphics/mesa/display.cpp

134

auto const& kms_conf = dynamic_cast<RealKMSDisplayConfiguration const&>(conf);

135

std::vector<std::unique_ptr<DisplayBuffer>> display_buffers_new;

136

137

138

* Notice for a little while here we will have duplicate

139

* DisplayBuffers attached to each output, and the display_buffers_new

140

* will take over the outputs before the old display_buffers are

141

* destroyed. So to avoid page flipping confusion in-between, make

142

* sure we wait for all pending page flips to finish before the

143

* display_buffers_new are created and take control of the outputs.

144

145

for (auto& db : display_buffers)

146

db->wait_for_page_flip();

147

137

148

/* Reset the state of all outputs */

138

149

kms_conf.for_each_output([&](DisplayConfigurationOutput const& conf_output)

139

150

{

Older »