ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "surfaceflinger: Consolidate display orientation compensation hooks" 

* This is completely breaking graphics.

This reverts commit f8e2372ad7.

Change-Id: I1d694f4228199891a191ce3fb924cec71a6100f0
This commit is contained in:
Steve Kondik 2015-11-10 23:58:38 +01:00
parent f8e2372ad7
commit af9298115c
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
services/surfaceflinger/DisplayDevice.cpp
View File

@ -84,7 +84,6 @@ DisplayDevice::DisplayDevice(
mIsSecure(isSecure), mIsSecure(isSecure),
mSecureLayerVisible(false), mSecureLayerVisible(false),
mLayerStack(NO_LAYER_STACK), mLayerStack(NO_LAYER_STACK),
mHardwareOrientation(0),
mOrientation(), mOrientation(),
mPowerMode(HWC_POWER_MODE_OFF), mPowerMode(HWC_POWER_MODE_OFF),
mActiveConfig(0) mActiveConfig(0)
@ -132,12 +131,7 @@ DisplayDevice::DisplayDevice(
// was created with createDisplay(). // was created with createDisplay().
switch (mType) { switch (mType) {
case DISPLAY_PRIMARY: case DISPLAY_PRIMARY:
char value[PROPERTY_VALUE_MAX];
mDisplayName = "Built-in Screen"; mDisplayName = "Built-in Screen";
/* hwrotation applies only to the primary display */
property_get("ro.sf.hwrotation", value, "0");
mHardwareOrientation = atoi(value);
break; break;
case DISPLAY_EXTERNAL: case DISPLAY_EXTERNAL:
mDisplayName = "HDMI Screen"; mDisplayName = "HDMI Screen";
@ -398,7 +392,9 @@ status_t DisplayDevice::orientationToTransfrom(
int orientation, int w, int h, Transform* tr) int orientation, int w, int h, Transform* tr)
{ {
uint32_t flags = 0; uint32_t flags = 0;
int additionalRot = this->getHardwareOrientation(); char value[PROPERTY_VALUE_MAX];
property_get("ro.sf.hwrotation", value, "0");
int additionalRot = atoi(value);
if (additionalRot) { if (additionalRot) {
additionalRot /= 90; additionalRot /= 90;
@ -470,7 +466,11 @@ void DisplayDevice::setProjection(int orientation,
if (!frame.isValid()) { if (!frame.isValid()) {
// the destination frame can be invalid if it has never been set, // the destination frame can be invalid if it has never been set,
// in that case we assume the whole display frame. // in that case we assume the whole display frame.
if ((mHardwareOrientation/90) & DisplayState::eOrientationSwapMask) { char value[PROPERTY_VALUE_MAX];
property_get("ro.sf.hwrotation", value, "0");
int additionalRot = atoi(value);
if (additionalRot == 90 || additionalRot == 270) {
frame = Rect(h, w); frame = Rect(h, w);
} else { } else {
frame = Rect(w, h); frame = Rect(w, h);
@ -529,10 +529,6 @@ void DisplayDevice::setProjection(int orientation,
mFrame = frame; mFrame = frame;
} }
int DisplayDevice::getHardwareOrientation() {
return mHardwareOrientation;
}
void DisplayDevice::dump(String8& result) const { void DisplayDevice::dump(String8& result) const {
const Transform& tr(mGlobalTransform); const Transform& tr(mGlobalTransform);
result.appendFormat( result.appendFormat(

2
services/surfaceflinger/DisplayDevice.h
View File

@ -173,7 +173,6 @@ public:
*/ */
uint32_t getPageFlipCount() const; uint32_t getPageFlipCount() const;
void dump(String8& result) const; void dump(String8& result) const;
int getHardwareOrientation();
private: private:
/* /*
@ -218,7 +217,6 @@ private:
int w, int h, Transform* tr); int w, int h, Transform* tr);
uint32_t mLayerStack; uint32_t mLayerStack;
int mHardwareOrientation;
int mOrientation; int mOrientation;
// user-provided visible area of the layer stack // user-provided visible area of the layer stack
Rect mViewport; Rect mViewport;

4
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -641,7 +641,9 @@ status_t SurfaceFlinger::getDisplayConfigs(const sp<IBinder>& display,
info.orientation = 0; info.orientation = 0;
} }
int additionalRot = mDisplays[0]->getHardwareOrientation() / 90; char value[PROPERTY_VALUE_MAX];
property_get("ro.sf.hwrotation", value, "0");
int additionalRot = atoi(value) / 90;
if ((type == DisplayDevice::DISPLAY_PRIMARY) && (additionalRot & DisplayState::eOrientationSwapMask)) { if ((type == DisplayDevice::DISPLAY_PRIMARY) && (additionalRot & DisplayState::eOrientationSwapMask)) {
info.h = hwConfig.width; info.h = hwConfig.width;
info.w = hwConfig.height; info.w = hwConfig.height;