summaryrefslogtreecommitdiff
path: root/libs/hwui/OpenGLRenderer.cpp
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2013-06-14 13:43:58 -0700
committer Chris Craik <ccraik@google.com> 2013-06-14 13:43:58 -0700
commita02c4ed885d97e516f844ddb0a96083f1b45b4cb (patch)
tree74a79cf96d32b37ee36c9308170aa3643093dce5 /libs/hwui/OpenGLRenderer.cpp
parent5f73a7df6dccd61ee2596ece7e9e3c66a7a58339 (diff)
Fix clip merging behavior
Previously, a new op with a clipped side could be added to a MergingDrawBatch without considering the batch's current bounds. Change-Id: I1b873ecf821bad7cda6630c3f311edd90ac5cc8c
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
-rw-r--r--libs/hwui/OpenGLRenderer.cpp2
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