~kdub/mir/mali-client-render-support

« back to all changes in this revision

Viewing changes to src/server/graphics/android/hwc_common_device.h

Committer: Kevin DuBois
Date: 2013-11-05 21:44:14 UTC
mfrom: (1062.1.137 dev)
Revision ID: kevin.dubois@canonical.com-20131105214414-d32r52joqrs8tsmo

merge dev branch

files added:
3rd_party/android-input/android/frameworks/base/include/androidfw/IntSet.h

3rd_party/android-input/android/frameworks/base/services/input/InputEventPrinter.h

3rd_party/android-input/android/frameworks/base/services/input/IntSet.cpp

include/test/mir_test_doubles/stub_driver_interpreter.h

src/server/input/default_configuration.cpp

src/server/shell/default_configuration.cpp

tests/unit-tests/android_input/int_set.cpp

files removed:
include/test/mir_test_doubles/mock_android_framebuffer_window.h

src/server/graphics/android/android_display_factory.cpp

src/server/graphics/android/android_display_factory.h

src/server/graphics/android/android_framebuffer_window.cpp

src/server/graphics/android/android_framebuffer_window.h

src/server/graphics/android/android_framebuffer_window_query.h

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

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

files renamed:
debian/libmirserver9.install => debian/libmirserver11.install

include/test/mir_test_doubles/mock_display_support_provider.h => include/test/mir_test_doubles/mock_display_device.h

include/test/mir_test_doubles/stub_display_support_provider.h => include/test/mir_test_doubles/stub_display_device.h

include/server/mir/compositor/default_display_buffer_compositor_factory.h => src/server/compositor/default_display_buffer_compositor_factory.h

include/server/mir/frontend/global_event_sender.h => src/server/frontend/global_event_sender.h

include/server/mir/frontend/protobuf_ipc_factory.h => src/server/frontend/protobuf_ipc_factory.h

include/server/mir/frontend/resource_cache.h => src/server/frontend/resource_cache.h

include/server/mir/frontend/session_mediator.h => src/server/frontend/session_mediator.h

src/server/shell/unauthorized_display_changer.cpp => src/server/frontend/unauthorized_display_changer.cpp

include/server/mir/shell/unauthorized_display_changer.h => src/server/frontend/unauthorized_display_changer.h

src/server/graphics/android/display_support_provider.h => src/server/graphics/android/display_device.h

include/server/mir/input/display_input_region.h => src/server/input/display_input_region.h

include/server/mir/input/event_filter_chain.h => src/server/input/event_filter_chain.h

include/server/mir/input/nested_input_configuration.h => src/server/input/nested_input_configuration.h

include/server/mir/input/nested_input_relay.h => src/server/input/nested_input_relay.h

include/server/mir/input/null_input_configuration.h => src/server/input/null_input_configuration.h

include/server/mir/logging/connector_report.h => src/server/logging/connector_report.h

include/server/mir/logging/display_report.h => src/server/logging/display_report.h

include/server/mir/logging/session_mediator_report.h => src/server/logging/session_mediator_report.h

include/server/mir/shell/broadcasting_session_event_sink.h => src/server/shell/broadcasting_session_event_sink.h

include/server/mir/shell/consuming_placement_strategy.h => src/server/shell/consuming_placement_strategy.h

include/server/mir/shell/default_focus_mechanism.h => src/server/shell/default_focus_mechanism.h

include/server/mir/shell/default_session_container.h => src/server/shell/default_session_container.h

include/server/mir/shell/focus_sequence.h => src/server/shell/focus_sequence.h

include/server/mir/shell/focus_setter.h => src/server/shell/focus_setter.h

include/server/mir/shell/gl_pixel_buffer.h => src/server/shell/gl_pixel_buffer.h

include/server/mir/shell/graphics_display_layout.h => src/server/shell/graphics_display_layout.h

include/server/mir/shell/mediating_display_changer.h => src/server/shell/mediating_display_changer.h

include/server/mir/shell/organising_surface_factory.h => src/server/shell/organising_surface_factory.h

include/server/mir/shell/pixel_buffer.h => src/server/shell/pixel_buffer.h

include/server/mir/shell/registration_order_focus_sequence.h => src/server/shell/registration_order_focus_sequence.h

include/server/mir/shell/session_event_handler_register.h => src/server/shell/session_event_handler_register.h

include/server/mir/shell/session_event_sink.h => src/server/shell/session_event_sink.h

include/server/mir/shell/snapshot_strategy.h => src/server/shell/snapshot_strategy.h

include/server/mir/shell/surface_source.h => src/server/shell/surface_source.h

include/server/mir/shell/threaded_snapshot_strategy.h => src/server/shell/threaded_snapshot_strategy.h

tests/unit-tests/shell/test_unauthorized_display_changer.cpp => tests/unit-tests/frontend/test_unauthorized_display_changer.cpp

tests/unit-tests/graphics/android/test_framebuffer_factory.cpp => tests/unit-tests/graphics/android/test_resource_factory.cpp

files modified:
3rd_party/android-input/android/CMakeLists.txt

3rd_party/android-input/android/frameworks/base/include/androidfw/Input.h

3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h

3rd_party/android-input/android/frameworks/base/include/androidfw/VelocityControl.h

3rd_party/android-input/android/frameworks/base/include/androidfw/VelocityTracker.h

3rd_party/android-input/android/frameworks/base/services/input/InputDevice.cpp

3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp

3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.h

3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp

3rd_party/android-input/android/frameworks/base/services/input/InputReader.h

3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp

3rd_party/android-input/android/frameworks/base/services/input/PointerController.cpp

3rd_party/android-input/android/frameworks/base/services/input/PointerController.h

3rd_party/android-input/android/frameworks/base/services/input/VelocityControl.cpp

3rd_party/android-input/android/frameworks/base/services/input/VelocityTracker.cpp

CMakeLists.txt

debian/changelog

debian/control

debian/rules *

doc/building_source_for_android.md

doc/installing_prebuilt_on_pc.md

doc/using_mir_on_pc.md

examples/demo-inprocess-surface-client/demo_inprocess_surface_client.cpp

examples/demo-inprocess-surface-client/inprocess_egl_client.cpp

examples/demo-inprocess-surface-client/inprocess_egl_client.h

examples/demo-shell/demo_shell.cpp

examples/demo-shell/window_manager.cpp

examples/demo-shell/window_manager.h

examples/demo_input_filter.cpp

examples/image_renderer.cpp

examples/render_surfaces.cpp

include/platform/mir/graphics/nested_context.h

include/server/mir/compositor/scene.h

include/server/mir/default_configuration_options.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/surface.h

include/server/mir/shell/application_session.h

include/server/mir/shell/focus_controller.h

include/server/mir/shell/session.h

include/server/mir/shell/session_manager.h

include/server/mir/shell/surface.h

include/server/mir/surfaces/surface.h

include/test/mir_test_doubles/mock_buffer_bundle.h

include/test/mir_test_doubles/mock_focus_setter.h

include/test/mir_test_doubles/mock_frontend_surface.h

include/test/mir_test_doubles/mock_shell_session.h

include/test/mir_test_doubles/null_session_event_sink.h

include/test/mir_test_doubles/null_snapshot_strategy.h

include/test/mir_test_doubles/stub_buffer_allocator.h

include/test/mir_test_doubles/stub_ipc_factory.h

include/test/mir_test_doubles/stub_shell_session.h

include/test/mir_test_doubles/stub_surface.h

src/client/lttng/CMakeLists.txt

src/client/rpc/mir_socket_rpc_channel.cpp

src/client/rpc/mir_socket_rpc_channel.h

src/server/CMakeLists.txt

src/server/compositor/buffer_bundle.h

src/server/compositor/default_configuration.cpp

src/server/compositor/default_display_buffer_compositor_factory.cpp

src/server/compositor/switching_bundle.cpp

src/server/compositor/switching_bundle.h

src/server/default_configuration_options.cpp

src/server/default_server_configuration.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/default_configuration.cpp

src/server/frontend/global_event_sender.cpp

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_session_creator.cpp

src/server/frontend/resource_cache.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator_android.cpp

src/server/frontend/session_mediator_gbm.cpp

src/server/frontend/surface.cpp

src/server/graphics/android/CMakeLists.txt

src/server/graphics/android/android_display.cpp

src/server/graphics/android/android_display.h

src/server/graphics/android/android_display_buffer_factory.h

src/server/graphics/android/android_platform.cpp

src/server/graphics/android/android_platform.h

src/server/graphics/android/display_buffer_factory.cpp

src/server/graphics/android/display_buffer_factory.h

src/server/graphics/android/display_resource_factory.h

src/server/graphics/android/fb_device.cpp

src/server/graphics/android/fb_device.h

src/server/graphics/android/hwc10_device.cpp

src/server/graphics/android/hwc10_device.h

src/server/graphics/android/hwc11_device.cpp

src/server/graphics/android/hwc11_device.h

src/server/graphics/android/hwc_common_device.cpp

src/server/graphics/android/hwc_common_device.h

src/server/graphics/android/resource_factory.cpp

src/server/graphics/android/resource_factory.h

src/server/graphics/android/server_render_window.cpp

src/server/graphics/android/server_render_window.h

src/server/graphics/default_configuration.cpp

src/server/graphics/gbm/native_gbm_platform.cpp

src/server/graphics/nested/host_connection.cpp

src/server/graphics/nested/host_connection.h

src/server/graphics/nested/nested_display.cpp

src/server/graphics/nested/nested_display.h

src/server/graphics/nested/nested_platform.cpp

src/server/input/CMakeLists.txt

src/server/input/android/dummy_android_pointer_controller.h

src/server/input/display_input_region.cpp

src/server/input/event_filter_chain.cpp

src/server/input/nested_input_configuration.cpp

src/server/input/nested_input_relay.cpp

src/server/input/null_input_configuration.cpp

src/server/logging/connector_report.cpp

src/server/logging/default_configuration.cpp

src/server/logging/display_report.cpp

src/server/logging/session_mediator_report.cpp

src/server/lttng/CMakeLists.txt

src/server/shell/CMakeLists.txt

src/server/shell/application_session.cpp

src/server/shell/broadcasting_session_event_sink.cpp

src/server/shell/consuming_placement_strategy.cpp

src/server/shell/default_focus_mechanism.cpp

src/server/shell/default_session_container.cpp

src/server/shell/gl_pixel_buffer.cpp

src/server/shell/graphics_display_layout.cpp

src/server/shell/mediating_display_changer.cpp

src/server/shell/organising_surface_factory.cpp

src/server/shell/registration_order_focus_sequence.cpp

src/server/shell/session_manager.cpp

src/server/shell/surface_source.cpp

src/server/shell/threaded_snapshot_strategy.cpp

src/server/surfaces/surface_stack.h

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_focus_selection.cpp

tests/acceptance-tests/test_server_shutdown.cpp

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

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

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

tests/integration-tests/shell/test_session.cpp

tests/integration-tests/shell/test_session_manager.cpp

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_drm_auth_magic.cpp

tests/integration-tests/test_error_reporting.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir-stress/src/client.h

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/android_input/CMakeLists.txt

tests/unit-tests/android_input/input_reader.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/compositor/test_buffer_stream.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/compositor/test_switching_bundle.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/stress_protobuf_communicator.cpp

tests/unit-tests/frontend/test_global_event_sender.cpp

tests/unit-tests/frontend/test_protobuf_reports_errors.cpp

tests/unit-tests/frontend/test_protobuf_sends_fds.cpp

tests/unit-tests/frontend/test_protobuf_surface_apis.cpp

tests/unit-tests/frontend/test_published_socket_connector.cpp

tests/unit-tests/frontend/test_resource_cache.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_gbm.cpp

tests/unit-tests/graphics/android/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_hwc10_device.cpp

tests/unit-tests/graphics/android/test_hwc11_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_server_interpreter.cpp

tests/unit-tests/graphics/gbm/test_gbm_display.cpp

tests/unit-tests/graphics/gbm/test_native_gbm_platform.cpp

tests/unit-tests/graphics/test_display.cpp

tests/unit-tests/input/test_display_input_region.cpp

tests/unit-tests/input/test_event_filter_chain.cpp

tests/unit-tests/logging/test_display_report.cpp

tests/unit-tests/options/test_program_option.cpp

tests/unit-tests/shell/CMakeLists.txt

tests/unit-tests/shell/test_broadcasting_session_event_sink.cpp

tests/unit-tests/shell/test_consuming_placement_strategy.cpp

tests/unit-tests/shell/test_default_focus_mechanism.cpp

tests/unit-tests/shell/test_gl_pixel_buffer.cpp

tests/unit-tests/shell/test_graphics_display_layout.cpp

tests/unit-tests/shell/test_mediating_display_changer.cpp

tests/unit-tests/shell/test_organising_surface_factory.cpp

tests/unit-tests/shell/test_registration_order_focus_sequence.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/shell/test_the_session_container_implementation.cpp

tests/unit-tests/shell/test_threaded_snapshot_strategy.cpp

tests/unit-tests/surfaces/test_surface_stack.cpp

tools/setup-partial-armhf-chroot.sh

Show diffs side-by-side

added added

removed removed

src/server/graphics/android/hwc_common_device.h

#ifndef MIR_GRAPHICS_ANDROID_HWC_COMMON_DEVICE_H_

#define MIR_GRAPHICS_ANDROID_HWC_COMMON_DEVICE_H_

#include "display_support_provider.h"

#include "display_device.h"

#include <hardware/hwcomposer.h>

#include <mutex>

HWCCommonDevice* self;

};

class HWCCommonDevice : public DisplaySupportProvider

class HWCCommonDevice : public DisplayDevice

{

public:

virtual ~HWCCommonDevice() noexcept;

/* from HWCDevice */

geometry::PixelFormat display_format() const;

unsigned int number_of_framebuffers_available() const;

virtual void mode(MirPowerMode mode);

void notify_vsync();

void mode(MirPowerMode mode);

protected:

HWCCommonDevice(std::shared_ptr<hwc_composer_device_1> const& hwc_device,

std::shared_ptr<HWCVsyncCoordinator> const& coordinator);

std::shared_ptr<hwc_composer_device_1> const hwc_device;

std::shared_ptr<HWCVsyncCoordinator> const coordinator;

protected:

std::unique_lock<std::mutex> lock_unblanked();

private:

Older »