diff options
| author | 2013-07-22 23:31:18 +0000 | |
|---|---|---|
| committer | 2013-07-22 23:31:20 +0000 | |
| commit | 98427708a81eefcc24ae29e2f22e55f1ae44c927 (patch) | |
| tree | b541f690c964d8bce9562a93203dd7aeb5ad909b /libs/hwui/OpenGLRenderer.cpp | |
| parent | fd23eca5ba30a1624233c9597f8c4b9db790994b (diff) | |
| parent | 9ab2d1847552aa4169b4325aae1b1368d6947a9f (diff) | |
Merge "Ensure glActiveTexture is cleaned up correctly on functor resume"
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 06315baa2960..bc00ce897756 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -360,6 +360,7 @@ void OpenGLRenderer::interrupt() { mCaches.currentProgram = NULL; } } + mCaches.resetActiveTexture(); mCaches.unbindMeshBuffer(); mCaches.unbindIndicesBuffer(); mCaches.resetVertexPointers(); |