diff options
| author | 2019-03-20 23:54:08 -0700 | |
|---|---|---|
| committer | 2019-03-20 23:54:08 -0700 | |
| commit | 4fc168050a2f2e5e1333e17a477d009bbafee030 (patch) | |
| tree | e81b0c1918ae3dffe9101f03f30e5a56e5abadc8 /services/surfaceflinger/DisplayDevice.cpp | |
| parent | 987a019c57e9b8b7cbd73242c95a23312b00667b (diff) | |
| parent | 445c7b36406aecd467d1444d63add110a320fefc (diff) | |
Merge changes from topic "RenderArea" am: 3b14b7db6f
am: 445c7b3640
Change-Id: I9561e2f4a475e7e0778dbfde23bc2d682ceff8a9
Diffstat (limited to 'services/surfaceflinger/DisplayDevice.cpp')
| -rw-r--r-- | services/surfaceflinger/DisplayDevice.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp index 309fd0a791..65c3839141 100644 --- a/services/surfaceflinger/DisplayDevice.cpp +++ b/services/surfaceflinger/DisplayDevice.cpp @@ -224,6 +224,7 @@ DisplayDevice::DisplayDevice( std::unique_ptr<RE::Surface> renderSurface, int displayWidth, int displayHeight, + int displayInstallOrientation, bool hasWideColorGamut, const HdrCapabilities& hdrCapabilities, const int32_t supportedPerFrameMetadata, @@ -239,6 +240,7 @@ DisplayDevice::DisplayDevice( mSurface{std::move(renderSurface)}, mDisplayWidth(displayWidth), mDisplayHeight(displayHeight), + mDisplayInstallOrientation(displayInstallOrientation), mPageFlipCount(0), mIsSecure(isSecure), mLayerStack(NO_LAYER_STACK), @@ -610,9 +612,8 @@ void DisplayDevice::setProjection(int orientation, // need to take care of primary display rotation for mGlobalTransform // for case if the panel is not installed aligned with device orientation if (mType == DisplayType::DISPLAY_PRIMARY) { - int primaryDisplayOrientation = mFlinger->getPrimaryDisplayOrientation(); DisplayDevice::orientationToTransfrom( - (orientation + primaryDisplayOrientation) % (DisplayState::eOrientation270 + 1), + (orientation + mDisplayInstallOrientation) % (DisplayState::eOrientation270 + 1), w, h, &R); } |