commit 4f5777139be44823f9a47dcf5480c78384a394c9
author Linux Build Service Account <lnxbuild@localhost> Fri May 04 01:40:52 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri May 04 01:40:52 2018 -0700
tree fa5d3039b8f9c96a7c9ab96d2b8a7c05870f5a0c
parent 168d5ab8e9f15d73dc8f8e7289e483de8acdc0db
parent 2c17ac104ac7caf80d288840bb8f6d700ac4dc60

Merge "hwc2: Do not mark single buffered or color fill layers as skip"

sdm/libs/hwc2/hwc_display.cpp

diff --git a/sdm/libs/hwc2/hwc_display.cpp b/sdm/libs/hwc2/hwc_display.cpp
index 6f59b4c..41e6f8a 100644
--- a/sdm/libs/hwc2/hwc_display.cpp
+++ b/sdm/libs/hwc2/hwc_display.cpp
@@ -565,7 +565,8 @@
       layer_stack_.flags.hdr_present = true;
     }
 
-    if (hwc_layer->IsNonIntegralSourceCrop() && !is_secure && !hdr_layer) {
+    if (hwc_layer->IsNonIntegralSourceCrop() && !is_secure && !hdr_layer &&
+        !layer->flags.single_buffer && !layer->flags.solid_fill) {
       layer->flags.skip = true;
     }
 

sdm/libs/hwc2/hwc_layers.cpp

diff --git a/sdm/libs/hwc2/hwc_layers.cpp b/sdm/libs/hwc2/hwc_layers.cpp
index aa4fb06..2ae1f26 100644
--- a/sdm/libs/hwc2/hwc_layers.cpp
+++ b/sdm/libs/hwc2/hwc_layers.cpp
@@ -439,6 +439,9 @@
                               (crop.top != roundf(crop.top)) ||
                               (crop.right != roundf(crop.right)) ||
                               (crop.bottom != roundf(crop.bottom)));
+  if (non_integral_source_crop_) {
+    DLOGV_IF(kTagClient, "Crop: LTRB %f %f %f %f", crop.left, crop.top, crop.right, crop.bottom);
+  }
   if (layer_->src_rect != src_rect) {
     geometry_changes_ |= kSourceCrop;
     layer_->src_rect = src_rect;