am ab1a53c5: am bf62d307: am af5bd75b: Merge "Enable stencil clipping within clearLayerRegions"

* commit 'ab1a53c509edbc8bacd944233335587dffd95999': Enable stencil clipping within clearLayerRegions
2014-11-26 00:14:29 +00:00
parent 1f7b3b5c7d ab1a53c509
commit 47414be761
1 changed files with 1 additions and 7 deletions
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -1568,13 +1568,7 @@ void OpenGLRenderer::setupDraw(bool clearLayer) {
            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();