diff options
| author | 2013-06-17 18:11:34 +0000 | |
|---|---|---|
| committer | 2013-06-17 18:11:34 +0000 | |
| commit | 2a0451e54a3c3b397861736c42e42125bd938d43 (patch) | |
| tree | c8713e9605f2c2a796f2ed0c1d1a01acf5f09bdd /libs/hwui/OpenGLRenderer.cpp | |
| parent | 4aaf8b3d4b160aea5ceb5ccf799e44c1d5a3f14b (diff) | |
| parent | a02c4ed885d97e516f844ddb0a96083f1b45b4cb (diff) | |
Merge "Fix clip merging behavior"
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 05f43a9f74a5..91cc4e04c4f5 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -1384,7 +1384,7 @@ bool OpenGLRenderer::storeDisplayState(DeferredDisplayState& state, int stateDef return true; } - state.mClipSideFlags = kClipSide_Unclipped; + state.mClipSideFlags = kClipSide_None; if (!currentClip.contains(state.mBounds)) { int& flags = state.mClipSideFlags; // op partially clipped, so record which sides are clipped for clip-aware merging |