commit 562af68f45347d72bfda91b68d7fe45b583f86a7
author Chet Haase <chet@google.com> Mon Sep 10 11:17:53 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 10 11:17:54 2012 -0700
tree 2d412d9964d720d2346866c886dd663950f77e8f
parent 996be340817b8c45a595a79bf79c44ac7c52ef4b
parent beb8bd0db28d8c5cad2a258f2ba2f3b8b76cf037

Merge "Reset GL buffer state after functor invocation" into jb-mr1-dev

libs/hwui/OpenGLRenderer.cpp

diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 9f8b87c..f4c2675 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -299,10 +299,12 @@
                 mFunctors.add(f);
             }
         }
+        // protect against functors binding to other buffers
+        mCaches.unbindMeshBuffer();
+        mCaches.unbindIndicesBuffer();
+        mCaches.activeTexture(0);
     }
 
-    mCaches.activeTexture(0);
-
     return result;
 }