summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--hwc1.4/Android.mk60
-rw-r--r--hwc1.4/hwcomposer.cpp1202
-rw-r--r--hwc2/common/base/HwcLayer.cpp2
-rw-r--r--hwc2/common/base/HwcLayer.h6
-rw-r--r--hwc2/common/base/HwcModule.cpp9
-rw-r--r--hwc2/common/base/Hwcomposer.cpp14
-rw-r--r--hwc2/common/composers/GE2DComposer.cpp3
-rw-r--r--hwc2/common/composers/GE2DComposer.h6
-rw-r--r--hwc2/common/composers/IComposeDevice.cpp (renamed from hwc2/common/composers/Composers.cpp)10
-rw-r--r--hwc2/common/composers/IComposeDevice.h (renamed from hwc2/common/composers/Composers.h)17
-rw-r--r--hwc2/common/devices/PhysicalDevice.cpp25
-rw-r--r--hwc2/common/devices/PrimaryDevice.cpp2
-rw-r--r--hwc2/common/hdmi/DisplayHdmi.h2
-rw-r--r--hwc2/common/utils/Utils.cpp2
-rw-r--r--hwc2/common/utils/Utils.h5
-rw-r--r--hwc2/include/Hwcomposer.h4
-rw-r--r--hwc2/include/IComposeDeviceFactory.h (renamed from hwc2/include/IComposerFactory.h)16
-rw-r--r--hwc2/include/IComposer.h47
-rw-r--r--hwc2/include/PhysicalDevice.h17
-rw-r--r--hwc2/include/PrimaryDevice.h4
-rw-r--r--hwc2/platforms/Android.mk6
-rw-r--r--hwc2/platforms/PlatFactory.cpp6
22 files changed, 45 insertions, 1420 deletions
diff --git a/hwc2/common/base/Hwcomposer.cpp b/hwc2/common/base/Hwcomposer.cpp
index 341ef53..48646dc 100644
--- a/hwc2/common/base/Hwcomposer.cpp
+++ b/hwc2/common/base/Hwcomposer.cpp
@@ -924,21 +924,13 @@ bool Hwcomposer::release() {
return true;
}
-bool Hwcomposer::initialize(private_module_t *grallocModule) {
+bool Hwcomposer::initialize() {
CTRACE();
if (!mPlatFactory) {
DEINIT_AND_RETURN_FALSE("failed to provide a PlatFactory");
}
-#if PLATFORM_SDK_VERSION < 26
- if ( !grallocModule) {
- DEINIT_AND_RETURN_FALSE("failed to provide a grallocModule");
- }
- // initial gralloc module.
- mGrallocModule = grallocModule;
-#endif
-
mUeventObserver = new UeventObserver();
if (!mUeventObserver || !mUeventObserver->initialize()) {
DEINIT_AND_RETURN_FALSE("failed to initialize uevent observer");
@@ -1005,9 +997,5 @@ UeventObserver* Hwcomposer::getUeventObserver()
return mUeventObserver;
}
-private_module_t* Hwcomposer::getGrallocModule() {
- return mGrallocModule;
-}
-
} // namespace amlogic
} // namespace android