commit 659de832b9796e14de44b6411980a65e33283a93
author Chris Craik <ccraik@google.com> Mon Dec 01 20:08:27 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 01 20:08:29 2014 +0000
tree 9ab610781d982dbef689dacf38a7bfc47da18a81
parent f90404ca7b47234437b3f8f418fca313825de02c
parent 52b2cf9fdf95ccdcbb3f5e403eb9691c1ead1214

Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev

libs/hwui/OpenGLRenderer.cpp

diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 80b4c2a..075f2c5 100755
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -1560,13 +1560,7 @@
             setScissorFromClip();
         }
 
-        if (clearLayer) {
-            setStencilFromClip();
-        } else {
-            // While clearing layer, force disable stencil buffer, since
-            // it's invalid to stencil-clip *during* the layer clear
-            mCaches.stencil.disable();
-        }
+        setStencilFromClip();
     }
 
     mDescription.reset();