Merge "Fix T-junctions in layers' generated meshes" into jb-mr2-dev

1 files changed, 8 insertions, 1 deletions

diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 6c8f38d2fd9b..d683c272bdcc 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -1022,7 +1022,14 @@ void OpenGLRenderer::composeLayerRegion(Layer* layer, const Rect& rect) {
     //       information about this implementation
     if (CC_LIKELY(!layer->region.isEmpty())) {
         size_t count;
-        const android::Rect* rects = layer->region.getArray(&count);
+        const android::Rect* rects;
+        Region safeRegion;
+        if (CC_LIKELY(hasRectToRectTransform())) {
+            rects = layer->region.getArray(&count);
+        } else {
+            safeRegion = Region::createTJunctionFreeRegion(layer->region);
+            rects = safeRegion.getArray(&count);
+        }
 
         const float alpha = layer->getAlpha() / 255.0f;
         const float texX = 1.0f / float(layer->getWidth());