From 7dc259e7540e8a85dddbf1440c7921762b1e35d3 Mon Sep 17 00:00:00 2001 From: Tellen Yu Date: Tue, 23 May 2017 02:01:13 +0000 Subject: Merge "bringup o-pdk" into pdk2017 --- diff --git a/hwc2/common/base/HwcLayer.cpp b/hwc2/common/base/HwcLayer.cpp index 4d8bb5f..8163478 100644 --- a/hwc2/common/base/HwcLayer.cpp +++ b/hwc2/common/base/HwcLayer.cpp @@ -35,7 +35,7 @@ HwcLayer::HwcLayer(hwc2_display_t& dpy) mAcquireFence(-1), mDataSpace(HAL_DATASPACE_UNKNOWN), mPlaneAlpha(0.0f), - mTransform(HAL_TRANSFORM_RESERVED), + mTransform(0), mZ(0), mBufferHnd(NULL), mInitialized(false) diff --git a/hwc2/common/base/HwcModule.cpp b/hwc2/common/base/HwcModule.cpp index 9b3a34b..5af1713 100644 --- a/hwc2/common/base/HwcModule.cpp +++ b/hwc2/common/base/HwcModule.cpp @@ -544,6 +544,8 @@ hwc2_function_pointer_t hwc2_getFunction(struct hwc2_device* device, return reinterpret_cast(getActiveConfig); case HWC2_FUNCTION_GET_CHANGED_COMPOSITION_TYPES: return reinterpret_cast(getChangedCompositionTypes); + case HWC2_FUNCTION_GET_CLIENT_TARGET_SUPPORT: + return reinterpret_cast(getClientTargetSupport); case HWC2_FUNCTION_GET_COLOR_MODES: return reinterpret_cast(getColorModes); case HWC2_FUNCTION_GET_DISPLAY_ATTRIBUTE: diff --git a/hwc2/common/composers/GE2DComposer.cpp b/hwc2/common/composers/GE2DComposer.cpp index ddaa229..591b495 100644 --- a/hwc2/common/composers/GE2DComposer.cpp +++ b/hwc2/common/composers/GE2DComposer.cpp @@ -10,6 +10,7 @@ #include #include #include +#include namespace android { namespace amlogic { diff --git a/hwc2/common/composers/GE2DComposer.h b/hwc2/common/composers/GE2DComposer.h index 22d2f35..c71c115 100644 --- a/hwc2/common/composers/GE2DComposer.h +++ b/hwc2/common/composers/GE2DComposer.h @@ -22,7 +22,7 @@ public: LayerState() : mBufferHnd(NULL), mBlendMode(0), - mTransform(HAL_TRANSFORM_RESERVED), + mTransform(0), mBufferFd(-1) { } diff --git a/hwc2/common/devices/PhysicalDevice.cpp b/hwc2/common/devices/PhysicalDevice.cpp index 214480f..0afbb54 100644 --- a/hwc2/common/devices/PhysicalDevice.cpp +++ b/hwc2/common/devices/PhysicalDevice.cpp @@ -1449,7 +1449,7 @@ int32_t PhysicalDevice::getLineValue(const char *lineStr, const char *magicStr) return 0; } - if (NULL != (pos = strstr(lineStr, magicStr))) { + if (NULL != (pos = strstr((char *)lineStr, magicStr))) { pos = pos + strlen(magicStr); char* start = pos; while (*start != '\n' && (strlen(start) > 0)) -- cgit