summaryrefslogtreecommitdiff
authorSky Zhou <sky.zhou@amlogic.com>2017-01-19 05:43:33 (GMT)
committer Gerrit Code Review <gituser@scgit.amlogic.com>2017-01-19 05:43:33 (GMT)
commit3a6796c5a9801e29496aa8f79e29c1b4b0e7b84b (patch)
tree94aa42af95a2bb3b5b4e20515bc90dfb36304b4b
parent9255ce11614132aa3803c9c5e313e0313dfef99f (diff)
parentb91d99905c0861f9075b5038c4a4afbed6488351 (diff)
downloadhwcomposer-3a6796c5a9801e29496aa8f79e29c1b4b0e7b84b.zip
hwcomposer-3a6796c5a9801e29496aa8f79e29c1b4b0e7b84b.tar.gz
hwcomposer-3a6796c5a9801e29496aa8f79e29c1b4b0e7b84b.tar.bz2
Merge "PD#138457: use ge2d blend op to process two same size layers." into n-amlogic
Diffstat
-rw-r--r--hwc2/common/composers/GE2DComposer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/hwc2/common/composers/GE2DComposer.cpp b/hwc2/common/composers/GE2DComposer.cpp
index bafd226..7c3d884 100644
--- a/hwc2/common/composers/GE2DComposer.cpp
+++ b/hwc2/common/composers/GE2DComposer.cpp
@@ -492,7 +492,7 @@ void GE2DComposer::runGE2DProcess(int32_t slot, Vector< LayerState* > &hwcLayers
bool debugSameSize = Utils::checkBoolProp("sys.sf.debug.ss");
// TODO:2 same size layers case.
- if (debugSameSize && layerNum > GE2D_COMPOSE_ONE_LAYER) {
+ if (!debugSameSize && layerNum > GE2D_COMPOSE_ONE_LAYER) {
if (Utils::compareRect(sourceCrop[0], sourceCrop[1])
&& Utils::compareRect(sourceCrop[0], displayFrame[0])
&& Utils::compareRect(sourceCrop[1], displayFrame[1])) {