Merge branch 'm' of git://codeaurora.org/platform/frameworks/native into cm-13.0 (8f0e7521) · Commits · e / os / android_frameworks_native

services/surfaceflinger/Android.mk

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -109,7 +109,8 @@ LOCAL_SHARED_LIBRARIES := \

	ifeq ($(TARGET_USES_QCOM_BSP), true)		ifeq ($(TARGET_USES_QCOM_BSP), true)
	LOCAL_WHOLE_STATIC_LIBRARIES += libexsurfaceflinger		LOCAL_WHOLE_STATIC_LIBRARIES += libexsurfaceflinger
	LOCAL_C_INCLUDES += $(ANDROID_BUILD_TOP)/vendor/qcom/opensource/display-frameworks/native/services/surfaceflinger/		LOCAL_C_INCLUDES += vendor/qcom/opensource/display-frameworks/native/services/surfaceflinger
			LOCAL_C_INCLUDES += vendor/qcom/opensource/display-frameworks/include
	LOCAL_C_INCLUDES += $(call project-path-for,qcom-display)/libgralloc		LOCAL_C_INCLUDES += $(call project-path-for,qcom-display)/libgralloc
	LOCAL_C_INCLUDES += $(call project-path-for,qcom-display)/libqdutils		LOCAL_C_INCLUDES += $(call project-path-for,qcom-display)/libqdutils
	LOCAL_SHARED_LIBRARIES += libqdutils		LOCAL_SHARED_LIBRARIES += libqdutils

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -707,6 +707,9 @@ status_t HWComposer::prepare() {
	if (l.compositionType == HWC_OVERLAY) {		if (l.compositionType == HWC_OVERLAY) {
	disp.hasOvComp = true;		disp.hasOvComp = true;
	}		}
			if (isCompositionTypeBlit(l.compositionType)) {
			disp.hasFbComp = true;
			}
	if (l.compositionType == HWC_CURSOR_OVERLAY) {		if (l.compositionType == HWC_CURSOR_OVERLAY) {
	disp.hasOvComp = true;		disp.hasOvComp = true;
	}		}
	@@ -1242,7 +1245,7 @@ void HWComposer::dump(String8& result) const {
	if (hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_3)) {		if (hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_3)) {
	result.appendFormat(		result.appendFormat(
	" %9s \| %08" PRIxPTR " \| %04x \| %04x \| %02x \| %04x \| %-11s \|%7.1f,%7.1f,%7.1f,%7.1f \|%5d,%5d,%5d,%5d \| %s\n",		" %9s \| %08" PRIxPTR " \| %04x \| %04x \| %02x \| %04x \| %-11s \|%7.1f,%7.1f,%7.1f,%7.1f \|%5d,%5d,%5d,%5d \| %s\n",
	compositionTypeName[type],		(isCompositionTypeBlit(l.compositionType)) ? "HWC_BLIT" : compositionTypeName[type],
	intptr_t(l.handle), l.hints, l.flags, l.transform, l.blending, formatStr.string(),		intptr_t(l.handle), l.hints, l.flags, l.transform, l.blending, formatStr.string(),
	l.sourceCropf.left, l.sourceCropf.top, l.sourceCropf.right, l.sourceCropf.bottom,		l.sourceCropf.left, l.sourceCropf.top, l.sourceCropf.right, l.sourceCropf.bottom,
	l.displayFrame.left, l.displayFrame.top, l.displayFrame.right, l.displayFrame.bottom,		l.displayFrame.left, l.displayFrame.top, l.displayFrame.right, l.displayFrame.bottom,
	@@ -1250,7 +1253,7 @@ void HWComposer::dump(String8& result) const {
	} else {		} else {
	result.appendFormat(		result.appendFormat(
	" %9s \| %08" PRIxPTR " \| %04x \| %04x \| %02x \| %04x \| %-11s \|%7d,%7d,%7d,%7d \|%5d,%5d,%5d,%5d \| %s\n",		" %9s \| %08" PRIxPTR " \| %04x \| %04x \| %02x \| %04x \| %-11s \|%7d,%7d,%7d,%7d \|%5d,%5d,%5d,%5d \| %s\n",
	compositionTypeName[type],		(isCompositionTypeBlit(l.compositionType)) ? "HWC_BLIT" : compositionTypeName[type],
	intptr_t(l.handle), l.hints, l.flags, l.transform, l.blending, formatStr.string(),		intptr_t(l.handle), l.hints, l.flags, l.transform, l.blending, formatStr.string(),
	l.sourceCrop.left, l.sourceCrop.top, l.sourceCrop.right, l.sourceCrop.bottom,		l.sourceCrop.left, l.sourceCrop.top, l.sourceCrop.right, l.sourceCrop.bottom,
	l.displayFrame.left, l.displayFrame.top, l.displayFrame.right, l.displayFrame.bottom,		l.displayFrame.left, l.displayFrame.top, l.displayFrame.right, l.displayFrame.bottom,

services/surfaceflinger/DisplayHardware/HWComposer.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -312,6 +312,9 @@ public:
	* Extensions		* Extensions
	*/		*/
	virtual inline bool isVDSEnabled() const { return true; };		virtual inline bool isVDSEnabled() const { return true; };
			virtual inline bool isCompositionTypeBlit(const int32_t /compType/) const {
			return false;
			};

	private:		private:
	void loadHwcModule();		void loadHwcModule();

services/surfaceflinger/Layer.cpp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -579,6 +579,7 @@ void Layer::setAcquireFence(const sp<const DisplayDevice>& /* hw */,
	}		}
	}		}
	}		}
			setAcquiredFenceIfBlit(fenceFd, layer);
	layer.setAcquireFenceFd(fenceFd);		layer.setAcquireFenceFd(fenceFd);
	}		}

	@@ -665,7 +666,7 @@ void Layer::onDraw(const sp<const DisplayDevice>& hw, const Region& clip,

	RenderEngine& engine(mFlinger->getRenderEngine());		RenderEngine& engine(mFlinger->getRenderEngine());

	if (!blackOutLayer) {		if (!blackOutLayer \|\| canAllowGPUForProtected()) {
	// TODO: we could be more subtle with isFixedSize()		// TODO: we could be more subtle with isFixedSize()
	const bool useFiltering = getFiltering() \|\| needsFiltering(hw) \|\| isFixedSize();		const bool useFiltering = getFiltering() \|\| needsFiltering(hw) \|\| isFixedSize();

services/surfaceflinger/Layer.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -298,6 +298,10 @@ public:
	virtual void setPosition(const sp<const DisplayDevice>& /hw/,		virtual void setPosition(const sp<const DisplayDevice>& /hw/,
	HWComposer::HWCLayerInterface& /layer/,		HWComposer::HWCLayerInterface& /layer/,
	const State& /state/) { }		const State& /state/) { }
			virtual void setAcquiredFenceIfBlit(int& /fenceFd /,
			HWComposer::HWCLayerInterface& /layer /) { }
			virtual bool canAllowGPUForProtected() const { return false; }


	/*		/*
	* returns the rectangle that crops the content of the layer and scales it		* returns the rectangle that crops the content of the layer and scales it