← Back to branch summary

~raof/mir/prober-drm-device-probe

~raof/mir/prober-drm-device-probe

« back to all changes in this revision

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

Committer: Daniel van Vugt
Date: 2013-04-24 05:18:38 UTC
mfrom: (627 trunk)
mto: This revision was merged to the branch mainline in revision 629.
Revision ID: daniel.van.vugt@canonical.com-20130424051838-bxzdvlavdj3y051r

Merge latest lp:mir

files added:
include/server/mir/compositor/overlay_renderer.h

include/test/mir_test_doubles/mock_hwc_organizer.h

src/server/graphics/android/hwc10_device.cpp

src/server/graphics/android/hwc10_device.h

src/server/graphics/android/hwc_common_device.cpp

src/server/graphics/android/hwc_common_device.h

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

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

files renamed:
include/test/mir_test_doubles/mock_fb_device.h => include/test/mir_test_doubles/mock_fb_hal_device.h

files modified:
CMakeLists.txt

examples/eglapp.c

examples/render_surfaces.cpp

include/server/mir/compositor/default_compositing_strategy.h

include/server/mir/default_server_configuration.h

include/server/mir/graphics/display_buffer.h

include/server/mir/shell/session.h

include/shared/mir/graphics/android/sync_object.h

include/shared/mir_toolkit/event.h

include/test/mir_test_doubles/mock_android_buffer.h

include/test/mir_test_doubles/mock_display_buffer.h

include/test/mir_test_doubles/mock_display_support_provider.h

include/test/mir_test_doubles/mock_hwc_composer_device_1.h

include/test/mir_test_doubles/mock_hwc_interface.h

include/test/mir_test_doubles/mock_input_configuration.h

include/test/mir_test_doubles/mock_input_dispatcher.h

include/test/mir_test_doubles/null_display_buffer.h

include/test/mir_test_doubles/null_virtual_terminal.h

src/client/input/android_input_receiver.cpp

src/server/compositor/default_compositing_strategy.cpp

src/server/default_server_configuration.cpp

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_message_processor.h

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_factory.cpp

src/server/graphics/android/android_display_factory.h

src/server/graphics/android/android_hwc_factory.cpp

src/server/graphics/android/android_hwc_factory.h

src/server/graphics/android/default_framebuffer_factory.cpp

src/server/graphics/android/hwc11_device.cpp

src/server/graphics/android/hwc11_device.h

src/server/graphics/android/hwc_device.h

src/server/graphics/android/hwc_display.cpp

src/server/graphics/android/hwc_display.h

src/server/graphics/android/hwc_factory.h

src/server/graphics/gbm/gbm_display_buffer.cpp

src/server/graphics/gbm/gbm_display_buffer.h

src/server/graphics/gbm/linux_virtual_terminal.cpp

src/server/graphics/gbm/linux_virtual_terminal.h

src/server/graphics/gbm/virtual_terminal.h

src/server/input/android/android_dispatcher_controller.cpp

src/server/input/android/android_dispatcher_controller.h

tests/acceptance-tests/test_client_input.cpp

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

tests/unit-tests/client/input/test_android_input_receiver.cpp

tests/unit-tests/compositor/test_default_compositing_strategy.cpp

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

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

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

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

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

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

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

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

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

Show diffs side-by-side

added added

removed removed

src/server/graphics/android/android_display_factory.h

49

49

std::shared_ptr<DisplayAllocator> const display_factory;

50

50

std::shared_ptr<HWCFactory> const hwc_factory;

51

51

std::shared_ptr<FramebufferFactory> const fb_factory;

52

std::shared_ptr<DisplaySupportProvider> fb_dev;

52

53

std::shared_ptr<hwc_composer_device_1> hwc_dev;

53

54

};

54

55

Older »