commit 2ee0dda96ace734fb69c49fc1dc1289c1f5acf7d
author Alec Mouri <alecmouri@google.com> Wed Jan 30 16:44:43 2019 -0800
committer Alec Mouri <alecmouri@google.com> Tue Mar 19 23:24:33 2019 +0000
tree 12b15e8d9e8e49dcda6a67b0bc93dbb0edf42bac
parent 5e1371af16bab6714fd11dfdbfe1b573a6e8d088

Respect crop scaling mode for texture transforms in BufferLayerConsumer

HWC is given the scaled down crop if
NATIVE_WINDOW_SCALING_MODE_SCALE_CROP is the current scaling mode. The
GL path should be given the same crop.

Bug: 122171389
Change-Id: I0621f3fbd48a4e90e61154379478980f513d354f
Test: Repro steps in bug no longer repro.
Test: go/wm-smoke

services/surfaceflinger/BufferLayerConsumer.cpp

diff --git a/services/surfaceflinger/BufferLayerConsumer.cpp b/services/surfaceflinger/BufferLayerConsumer.cpp
index cc78ece..f2d4c51 100644
--- a/services/surfaceflinger/BufferLayerConsumer.cpp
+++ b/services/surfaceflinger/BufferLayerConsumer.cpp
@@ -323,7 +323,8 @@
                                        mCurrentTextureBuffer == nullptr
                                                ? nullptr
                                                : mCurrentTextureBuffer->graphicBuffer(),
-                                       mCurrentCrop, mCurrentTransform, mFilteringEnabled);
+                                       getCurrentCropLocked(), mCurrentTransform,
+                                       mFilteringEnabled);
 }
 
 nsecs_t BufferLayerConsumer::getTimestamp() {
@@ -380,6 +381,10 @@
 
 Rect BufferLayerConsumer::getCurrentCrop() const {
     Mutex::Autolock lock(mMutex);
+    return getCurrentCropLocked();
+}
+
+Rect BufferLayerConsumer::getCurrentCropLocked() const {
     return (mCurrentScalingMode == NATIVE_WINDOW_SCALING_MODE_SCALE_CROP)
             ? GLConsumer::scaleDownCrop(mCurrentCrop, mDefaultWidth, mDefaultHeight)
             : mCurrentCrop;