commit a02c4ed885d97e516f844ddb0a96083f1b45b4cb
author Chris Craik <ccraik@google.com> Fri Jun 14 13:43:58 2013 -0700
committer Chris Craik <ccraik@google.com> Fri Jun 14 13:43:58 2013 -0700
tree 74a79cf96d32b37ee36c9308170aa3643093dce5
parent 5f73a7df6dccd61ee2596ece7e9e3c66a7a58339

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

libs/hwui/OpenGLRenderer.h

diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h
index 5b7f90d..9cd2047 100644
--- a/libs/hwui/OpenGLRenderer.h
+++ b/libs/hwui/OpenGLRenderer.h
@@ -81,7 +81,7 @@
 };
 
 enum ClipSideFlags {
-    kClipSide_Unclipped = 0x0,
+    kClipSide_None = 0x0,
     kClipSide_Left = 0x1,
     kClipSide_Top = 0x2,
     kClipSide_Right = 0x4,