diff options
| author | Chris Craik <ccraik@google.com> | 2013-09-17 19:17:12 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2013-09-17 19:17:12 -0700 |
| commit | 2765c0b71679b5762ed72610e8310abd6d071b96 (patch) | |
| tree | e30f430930366ef5be5688c1b6a0a1adbf2984d2 /libs/hwui/OpenGLRenderer.cpp | |
| parent | e08e6632294143f889ab68f0c3453ee6802dc60e (diff) | |
| parent | d97303a73babf8f820a78f72d558be8e4ad09f47 (diff) | |
| download | frameworks_base-2765c0b71679b5762ed72610e8310abd6d071b96.zip frameworks_base-2765c0b71679b5762ed72610e8310abd6d071b96.tar.gz frameworks_base-2765c0b71679b5762ed72610e8310abd6d071b96.tar.bz2 | |
resolved conflicts for merge of d97303a7 to master
Change-Id: I29e2e64e0ec241675762482cbe5c5e9dc58adca6
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 0c3a81b..7b35ee1 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -1628,14 +1628,7 @@ bool OpenGLRenderer::quickRejectNoScissor(float left, float top, float right, fl Rect r(left, top, right, bottom); currentTransform().mapRect(r); - - if (snapOut) { - // snapOut is generally used to account for 1 pixel ramp (in window coordinates) - // outside of the provided rect boundaries in tessellated AA geometry - r.snapOutToPixelBoundaries(); - } else { - r.snapToPixelBoundaries(); - } + r.snapGeometryToPixelBoundaries(snapOut); Rect clipRect(*mSnapshot->clipRect); clipRect.snapToPixelBoundaries(); |