Add helper to reset rect.

Jira: None.
Test: Build passes on Android.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>

diff --git a/common/core/hwclayer.cpp b/common/core/hwclayer.cpp
index a71677e..fae2ba6 100644 (file)
--- a/common/core/hwclayer.cpp
+++ b/common/core/hwclayer.cpp
@@ -107,7 +107,8 @@ void HwcLayer::SetSurfaceDamage(const HwcRegion& surface_damage) {
         (rect.right == 0)) {
       state_ &= ~kLayerContentChanged;
       state_ &= ~kSurfaceDamageChanged;
-      surface_damage_ = rect;
+      surface_damage_.reset();
+      current_rendering_damage_.reset();
       return;
     }
   } else if (rects == 0) {
@@ -201,18 +202,20 @@ void HwcLayer::Validate() {
     layer_cache_ &= ~kDisplayFrameRectChanged;
     layer_cache_ &= ~kSourceRectChanged;
     if (!last_rendering_damage_.empty()) {
-      last_rendering_damage_ = HwcRect<int>(0, 0, 0, 0);
+      last_rendering_damage_.reset();
     }
 
     if (!previous_rendering_damage_.empty()) {
       last_rendering_damage_ = previous_rendering_damage_;
-      previous_rendering_damage_ = HwcRect<int>(0, 0, 0, 0);
+      previous_rendering_damage_.reset();
     }
 
     if (!current_rendering_damage_.empty()) {
       previous_rendering_damage_ = current_rendering_damage_;
-      current_rendering_damage_ = surface_damage_;
     }
+
+    current_rendering_damage_ = surface_damage_;
+    damage_validated_ = false;
   }
 
   if (left_constraint_.empty() && left_source_constraint_.empty())

diff --git a/common/core/overlaylayer.cpp b/common/core/overlaylayer.cpp
index 7669d79..6800d83 100644 (file)
--- a/common/core/overlaylayer.cpp
+++ b/common/core/overlaylayer.cpp
@@ -274,7 +274,7 @@ void OverlayLayer::InitializeState(HwcLayer* layer,
       surface_damage_.left =
           std::max(surface_damage_.left, display_frame_.left);
     } else {
-      surface_damage_ = HwcRect<int>(0, 0, 0, 0);
+      surface_damage_.reset();
     }
     IMOSAICDISPLAYTRACE(
         "surface_damage_ %d %d %d %d  left_source_constraint: %d "

diff --git a/public/hwcrect.h b/public/hwcrect.h
index 775fada..934a194 100644 (file)
--- a/public/hwcrect.h
+++ b/public/hwcrect.h
@@ -62,6 +62,12 @@ struct Rect {
     }
     return true;
   }
+
+  void reset() {
+    for (int i = 0; i < 4; i++) {
+      bounds[i] = 0;
+    }
+  }
 };
 
 }  // namespace hwcomposer