summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--common/display/include/HwDisplayConnector.h8
-rw-r--r--common/hwc/ActiveModeMgr.cpp (renamed from hwc2/ActiveModeMgr.cpp)0
-rw-r--r--common/hwc/Android.mk5
-rw-r--r--common/hwc/FixedSizeModeMgr.cpp (renamed from hwc2/FixedSizeModeMgr.cpp)0
-rw-r--r--common/hwc/HwcModeMgr.cpp (renamed from hwc2/HwcModeMgr.cpp)0
-rw-r--r--common/hwc/RealModeMgr.cpp (renamed from hwc2/RealModeMgr.cpp)0
-rw-r--r--common/hwc/VariableModeMgr.cpp (renamed from hwc2/VariableModeMgr.cpp)0
-rw-r--r--common/hwc/include/ActiveModeMgr.h (renamed from hwc2/ActiveModeMgr.h)0
-rw-r--r--common/hwc/include/FixedSizeModeMgr.h (renamed from hwc2/FixedSizeModeMgr.h)0
-rw-r--r--common/hwc/include/RealModeMgr.h (renamed from hwc2/RealModeMgr.h)0
-rw-r--r--common/hwc/include/VariableModeMgr.h (renamed from hwc2/VariableModeMgr.h)0
-rw-r--r--hwc2/Android.mk62
-rwxr-xr-xhwc2/Hwc2Display.cpp18
-rw-r--r--hwc2/Hwc2Display.h4
-rw-r--r--hwc2/Hwc2Module.cpp9
-rw-r--r--hwc2/MesonHwc2.cpp8
-rw-r--r--hwc2/MesonHwc2.h9
-rw-r--r--postprocessor/Android.mk3
-rw-r--r--postprocessor/fbprocessor/CopyProcessor.cpp16
-rw-r--r--service/2.3/default/android.hardware.graphics.composer@2.3-service.droidlogic.xml9
-rw-r--r--service/2.4/default/android.hardware.graphics.composer@2.4-service.droidlogic.xml9
21 files changed, 138 insertions, 22 deletions
diff --git a/hwc2/MesonHwc2.h b/hwc2/MesonHwc2.h
index 562640c..94356ab 100644
--- a/hwc2/MesonHwc2.h
+++ b/hwc2/MesonHwc2.h
@@ -11,12 +11,11 @@
#include <map>
#include <hardware/hardware.h>
-#include <HwcDisplayPipe.h>
+#include "HwcDisplayPipe.h"
#include "Hwc2Display.h"
-
-class MesonHwc2 {
+class MesonHwc2 : public android::Singleton<MesonHwc2> {
/*hwc2 interface*/
public:
void getCapabilities(uint32_t* outCount, int32_t* outCapabilities);
@@ -144,6 +143,10 @@ public:
MesonHwc2();
virtual ~MesonHwc2();
+/* for meson display service */
+public:
+ int32_t captureDisplayScreen(buffer_handle_t hnd);
+
protected:
int32_t initialize();
bool isDisplayValid(hwc2_display_t display);