Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "give the proper orientation to the h/w composer HAL"

Browse Source
This commit is contained in:
Mathias Agopian
2011-08-18 21:05:51 -07:00
committed by Android (Google) Code Review
parent 54f655389a 3f88327a54
commit eb031bb9dd
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/surfaceflinger/Layer.cpp
View File

@@ -196,13 +196,12 @@ void Layer::setGeometry(hwc_layer_t* hwcl)
* 1) buffer orientation/flip/mirror * 1) buffer orientation/flip/mirror
* 2) state transformation (window manager) * 2) state transformation (window manager)
* 3) layer orientation (screen orientation) * 3) layer orientation (screen orientation)
* mOrientation is already the composition of (2) and (3) * mTransform is already the composition of (2) and (3)
* (NOTE: the matrices are multiplied in reverse order) * (NOTE: the matrices are multiplied in reverse order)
*/ */
const Transform bufferOrientation(mCurrentTransform); const Transform bufferOrientation(mCurrentTransform);
const Transform layerOrientation(mOrientation); const Transform tr(mTransform * bufferOrientation);
const Transform tr(layerOrientation * bufferOrientation);
// this gives us only the "orientation" component of the transform // this gives us only the "orientation" component of the transform
const uint32_t finalTransform = tr.getOrientation(); const uint32_t finalTransform = tr.getOrientation();

1
services/surfaceflinger/LayerBase.cpp
View File

@@ -257,6 +257,7 @@ void LayerBase::validateVisibility(const Transform& planeTransform)
// cache a few things... // cache a few things...
mOrientation = tr.getOrientation(); mOrientation = tr.getOrientation();
mTransform = tr;
mTransformedBounds = tr.makeBounds(w, h); mTransformedBounds = tr.makeBounds(w, h);
mLeft = tr.tx(); mLeft = tr.tx();
mTop = tr.ty(); mTop = tr.ty();

1
services/surfaceflinger/LayerBase.h
View File

@@ -247,6 +247,7 @@ private:
protected: protected:
// cached during validateVisibility() // cached during validateVisibility()
int32_t mOrientation; int32_t mOrientation;
Transform mTransform;
GLfloat mVertices[4][2]; GLfloat mVertices[4][2];
Rect mTransformedBounds; Rect mTransformedBounds;
int mLeft; int mLeft;