diff options
| author | Chris Craik <ccraik@google.com> | 2014-12-01 20:08:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-01 20:08:29 +0000 |
| commit | 659de832b9796e14de44b6411980a65e33283a93 (patch) | |
| tree | 9ab610781d982dbef689dacf38a7bfc47da18a81 | |
| parent | f90404ca7b47234437b3f8f418fca313825de02c (diff) | |
| parent | 52b2cf9fdf95ccdcbb3f5e403eb9691c1ead1214 (diff) | |
| download | frameworks_base-659de832b9796e14de44b6411980a65e33283a93.zip frameworks_base-659de832b9796e14de44b6411980a65e33283a93.tar.gz frameworks_base-659de832b9796e14de44b6411980a65e33283a93.tar.bz2 | |
Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev
| -rwxr-xr-x | libs/hwui/OpenGLRenderer.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
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 @@ 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(); |