am f3c2eb7: am d6344d7: Merge "Work around a possible driver bug Bug #7296475" into jb-mr1-dev

Romain Guy · Android Git Automerger · commit 466c58d4e179 · 2012-10-07T23:40:48.000-07:00
* commit 'f3c2eb79e4660692d85cc531c2825bff65270242':
  Work around a possible driver bug Bug #7296475
diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
@@ -418,6 +418,7 @@ bool Caches::enableScissor() {
     if (!scissorEnabled) {
         glEnable(GL_SCISSOR_TEST);
         scissorEnabled = true;
+        resetScissor();
         return true;
     }
     return false;
