diff options
| author | 2017-03-17 22:06:03 +0000 | |
|---|---|---|
| committer | 2017-03-17 22:06:03 +0000 | |
| commit | c7b35adf777069bd7c03629b0e6ec7c8c37a6042 (patch) | |
| tree | d6acb10bd07099f7f6eb84db47e3b682acf931eb | |
| parent | 7c1a9a58cd148aa348172025fb96653df32f8867 (diff) | |
| parent | 9551fd3acc2b0bbdfed02ed2bf97c5e560933abe (diff) | |
Merge "Add getDataSpace to layer class"
| -rw-r--r-- | services/surfaceflinger/Layer.cpp | 6 | ||||
| -rw-r--r-- | services/surfaceflinger/Layer.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 295b22982d..861a7d93b7 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -760,9 +760,7 @@ void Layer::forceClientComposition(int32_t hwcId) { mHwcLayers[hwcId].forceClientComposition = true; } -#endif -#ifdef USE_HWC2 void Layer::setPerFrameData(const sp<const DisplayDevice>& displayDevice) { // Apply this display's projection's viewport to the visible region // before giving it to the HWC HAL. @@ -865,6 +863,10 @@ void Layer::setPerFrameData(const sp<const DisplayDevice>& displayDevice) { static_cast<int32_t>(error)); } } + +android_dataspace Layer::getDataSpace() const { + return mCurrentState.dataSpace; +} #else void Layer::setPerFrameData(const sp<const DisplayDevice>& hw, HWComposer::HWCLayerInterface& layer) { diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h index 6b228b00ac..afe6074d7a 100644 --- a/services/surfaceflinger/Layer.h +++ b/services/surfaceflinger/Layer.h @@ -261,6 +261,8 @@ public: void forceClientComposition(int32_t hwcId); void setPerFrameData(const sp<const DisplayDevice>& displayDevice); + android_dataspace getDataSpace() const; + // callIntoHwc exists so we can update our local state and call // acceptDisplayChanges without unnecessarily updating the device's state void setCompositionType(int32_t hwcId, HWC2::Composition type, |