diff options
author | Chris Craik <ccraik@google.com> | 2013-02-21 19:31:17 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-21 19:31:17 -0800 |
commit | 94b97b38b749d50c8693a044dd2688328cca863e (patch) | |
tree | 6fedcbbe4e60867fb6776bc89ab90abace1f3e8f /libs/hwui/OpenGLRenderer.cpp | |
parent | 4e89d1a9b25b4bca47bd8c7cb22b72ed4bbbfd1e (diff) | |
parent | eab51de4de88219256260fe26e2018a6234ef83b (diff) | |
download | frameworks_base-94b97b38b749d50c8693a044dd2688328cca863e.zip frameworks_base-94b97b38b749d50c8693a044dd2688328cca863e.tar.gz frameworks_base-94b97b38b749d50c8693a044dd2688328cca863e.tar.bz2 |
am eab51de4: Merge "Fix clipping and stencil layer issues"
* commit 'eab51de4de88219256260fe26e2018a6234ef83b':
Fix clipping and stencil layer issues
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
-rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index c271795..ffad868 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -1284,6 +1284,10 @@ void OpenGLRenderer::setMatrix(SkMatrix* matrix) { } } +bool OpenGLRenderer::hasRectToRectTransform() { + return CC_LIKELY(mSnapshot->transform->rectToRect()); +} + void OpenGLRenderer::getMatrix(SkMatrix* matrix) { mSnapshot->transform->copyTo(*matrix); } @@ -1505,8 +1509,10 @@ void OpenGLRenderer::setupDraw(bool clear) { if (clear) clearLayerRegions(); // Make sure setScissor & setStencil happen at the beginning of // this method - if (mDirtyClip && mCaches.scissorEnabled) { - setScissorFromClip(); + if (mDirtyClip) { + if (mCaches.scissorEnabled) { + setScissorFromClip(); + } setStencilFromClip(); } mDescription.reset(); |