Merge "Add getDataSpace to layer class" (c7b35adf) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/Layer.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -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) {

+2 −0

Original line number	Diff line number	Diff line
		@@ -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,