am 762d0114: Merge "display projection API now has a single function instead of 3" into jb-mr1-dev (f9a65e17) · Commits · e / os / android_frameworks_native-old

include/gui/SurfaceComposerClient.h

+15 −5

Original line number	Diff line number	Diff line
		@@ -121,11 +121,21 @@ public:
		const sp<ISurfaceTexture>& surface);
		static void setDisplayLayerStack(const sp<IBinder>& token,
		uint32_t layerStack);
		static void setDisplayOrientation(const sp<IBinder>& token,
		uint32_t orientation);
		static void setDisplayViewport(const sp<IBinder>& token,
		const Rect& viewport);
		static void setDisplayFrame(const sp<IBinder>& token, const Rect& frame);

		/* setDisplayProjection() defines the projection of layer stacks
		* to a given display.
		*
		* - orientation defines the display's orientation.
		* - layerStackRect defines which area of the window manager coordinate
		* space will be used.
		* - displayRect defines where on the display will layerStackRect be
		* mapped to. displayRect is specified post-orientation, that is
		* it uses the orientation seen by the end-user.
		*/
		static void setDisplayProjection(const sp<IBinder>& token,
		uint32_t orientation,
		const Rect& layerStackRect,
		const Rect& displayRect);

		private:
		virtual void onFirstRef();

include/private/gui/LayerState.h

+3 −5

Original line number	Diff line number	Diff line
		@@ -109,9 +109,7 @@ struct DisplayState {
		enum {
		eSurfaceChanged = 0x01,
		eLayerStackChanged = 0x02,
		eOrientationChanged = 0x04,
		eViewportChanged = 0x08,
		eFrameChanged = 0x10
		eDisplayProjectionChanged = 0x04
		};

		uint32_t what;

libs/gui/SurfaceComposerClient.cpp

+17 −43

Original line number	Diff line number	Diff line
		@@ -119,9 +119,10 @@ public:

		void setDisplaySurface(const sp<IBinder>& token, const sp<ISurfaceTexture>& surface);
		void setDisplayLayerStack(const sp<IBinder>& token, uint32_t layerStack);
		void setDisplayOrientation(const sp<IBinder>& token, uint32_t orientation);
		void setDisplayViewport(const sp<IBinder>& token, const Rect& viewport);
		void setDisplayFrame(const sp<IBinder>& token, const Rect& frame);
		void setDisplayProjection(const sp<IBinder>& token,
		uint32_t orientation,
		const Rect& layerStackRect,
		const Rect& displayRect);

		static void closeGlobalTransaction(bool synchronous) {
		Composer::getInstance().closeGlobalTransactionImpl(synchronous);
		@@ -326,39 +327,19 @@ void Composer::setDisplayLayerStack(const sp<IBinder>& token,
		s.what \|= DisplayState::eLayerStackChanged;
		}

		void Composer::setDisplayOrientation(const sp<IBinder>& token,
		uint32_t orientation) {
		void Composer::setDisplayProjection(const sp<IBinder>& token,
		uint32_t orientation,
		const Rect& layerStackRect,
		const Rect& displayRect) {
		Mutex::Autolock _l(mLock);
		DisplayState& s(getDisplayStateLocked(token));
		s.orientation = orientation;
		s.what \|= DisplayState::eOrientationChanged;
		s.viewport = layerStackRect;
		s.frame = displayRect;
		s.what \|= DisplayState::eDisplayProjectionChanged;
		mForceSynchronous = true; // TODO: do we actually still need this?
		}

		// FIXME: get rid of this eventually
		status_t Composer::setOrientation(int orientation) {
		sp<ISurfaceComposer> sm(ComposerService::getComposerService());
		sp<IBinder> token(sm->getBuiltInDisplay(ISurfaceComposer::eDisplayIdMain));
		Composer::setDisplayOrientation(token, orientation);
		return NO_ERROR;
		}

		void Composer::setDisplayViewport(const sp<IBinder>& token,
		const Rect& viewport) {
		Mutex::Autolock _l(mLock);
		DisplayState& s(getDisplayStateLocked(token));
		s.viewport = viewport;
		s.what \|= DisplayState::eViewportChanged;
		}

		void Composer::setDisplayFrame(const sp<IBinder>& token,
		const Rect& frame) {
		Mutex::Autolock _l(mLock);
		DisplayState& s(getDisplayStateLocked(token));
		s.frame = frame;
		s.what \|= DisplayState::eFrameChanged;
		}

		// ---------------------------------------------------------------------------

		SurfaceComposerClient::SurfaceComposerClient()
		@@ -520,19 +501,12 @@ void SurfaceComposerClient::setDisplayLayerStack(const sp<IBinder>& token,
		Composer::getInstance().setDisplayLayerStack(token, layerStack);
		}

		void SurfaceComposerClient::setDisplayOrientation(const sp<IBinder>& token,
		uint32_t orientation) {
		Composer::getInstance().setDisplayOrientation(token, orientation);
		}

		void SurfaceComposerClient::setDisplayViewport(const sp<IBinder>& token,
		const Rect& viewport) {
		Composer::getInstance().setDisplayViewport(token, viewport);
		}

		void SurfaceComposerClient::setDisplayFrame(const sp<IBinder>& token,
		const Rect& frame) {
		Composer::getInstance().setDisplayFrame(token, frame);
		void SurfaceComposerClient::setDisplayProjection(const sp<IBinder>& token,
		uint32_t orientation,
		const Rect& layerStackRect,
		const Rect& displayRect) {
		Composer::getInstance().setDisplayProjection(token, orientation,
		layerStackRect, displayRect);
		}

		// ----------------------------------------------------------------------------

services/surfaceflinger/DisplayDevice.cpp

+5 −16

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@ void DisplayDevice::init(EGLConfig config)
		mHwcDisplayId = mFlinger->allocateHwcDisplayId(mType);

		// initialize the display orientation transform.
		DisplayDevice::setOrientation(DisplayState::eOrientationDefault);
		setProjection(DisplayState::eOrientationDefault, mViewport, mFrame);
		}

		uint32_t DisplayDevice::getPageFlipCount() const {
		@@ -298,24 +298,13 @@ status_t DisplayDevice::orientationToTransfrom(
		return NO_ERROR;
		}

		void DisplayDevice::setOrientation(int orientation) {
		void DisplayDevice::setProjection(int orientation,
		const Rect& viewport, const Rect& frame) {
		mOrientation = orientation;
		updateGeometryTransform();
		}

		void DisplayDevice::setViewport(const Rect& viewport) {
		if (viewport.isValid()) {
		mViewport = viewport;
		updateGeometryTransform();
		}
		}

		void DisplayDevice::setFrame(const Rect& frame) {
		if (frame.isValid()) {
		mFrame = frame;
		updateGeometryTransform();
		}
		}

		void DisplayDevice::updateGeometryTransform() {
		int w = mDisplayWidth;

services/surfaceflinger/DisplayDevice.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -94,9 +94,7 @@ public:
		Region getDirtyRegion(bool repaintEverything) const;

		void setLayerStack(uint32_t stack);
		void setOrientation(int orientation);
		void setViewport(const Rect& viewport);
		void setFrame(const Rect& frame);
		void setProjection(int orientation, const Rect& viewport, const Rect& frame);

		int getOrientation() const { return mOrientation; }
		const Transform& getTransform() const { return mGlobalTransform; }