Add support for HWC_DEVICE_API_VERSION_1_0
The acquire and release fences aren't yet used; this is just support
for the new version and temporary backwards compatibility for older
versions.
Change-Id: Ia5ccc05a97c86f649042b9a35e11042fa0187e84
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.h b/services/surfaceflinger/DisplayHardware/HWComposer.h
index cafa247..05c6f6d 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.h
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.h
@@ -31,8 +31,8 @@
const struct timespec *request,
struct timespec *remain);
-struct hwc_composer_device;
-struct hwc_layer_list;
+struct hwc_composer_device_1;
+struct hwc_layer_list_1;
struct hwc_procs;
namespace android {
@@ -218,21 +218,21 @@
inline void invalidate();
inline void vsync(int dpy, int64_t timestamp);
- sp<SurfaceFlinger> mFlinger;
- hw_module_t const* mModule;
- struct hwc_composer_device* mHwc;
- struct hwc_layer_list* mList;
- size_t mCapacity;
- mutable size_t mNumOVLayers;
- mutable size_t mNumFBLayers;
- EGLDisplay mDpy;
- EGLSurface mSur;
- cb_context* mCBContext;
- EventHandler& mEventHandler;
- nsecs_t mRefreshPeriod;
- size_t mVSyncCount;
- sp<VSyncThread> mVSyncThread;
- bool mDebugForceFakeVSync;
+ sp<SurfaceFlinger> mFlinger;
+ hw_module_t const* mModule;
+ struct hwc_composer_device_1* mHwc;
+ struct hwc_layer_list_1* mList;
+ size_t mCapacity;
+ mutable size_t mNumOVLayers;
+ mutable size_t mNumFBLayers;
+ EGLDisplay mDpy;
+ EGLSurface mSur;
+ cb_context* mCBContext;
+ EventHandler& mEventHandler;
+ nsecs_t mRefreshPeriod;
+ size_t mVSyncCount;
+ sp<VSyncThread> mVSyncThread;
+ bool mDebugForceFakeVSync;
};
// ---------------------------------------------------------------------------