commit c521b10854ebdc227d6f32649c627a548caef2e4
author John Reck <jreck@google.com> Tue Jun 09 14:26:56 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 09 14:26:57 2015 +0000
tree cfac062126ced403e10afc1b0d6243c256377805
parent a121d34ceefc8d106bf48f8fdd400d67445fc573
parent f087c828cd0c4f58d0b98bdc73061204b831dd0b

Merge "Fix a GL error leak issue"

libs/hwui/Caches.cpp

diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index cdf8150..77b66f2 100644
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -25,6 +25,7 @@
 #include "LayerRenderer.h"
 #include "ShadowTessellator.h"
 #include "RenderState.h"
+#include "utils/GLUtils.h"
 
 namespace android {
 
@@ -368,6 +369,12 @@
 
     clearGarbage();
     glFinish();
+
+    // glFinish() need dequeue buffer, and it is not 100% success
+    // It generates gl error sometimes, this error will be there
+    // until glGetError called. Call GLUtils::dumpGLErrors to clean
+    // the error in case it leaks to other functions
+    GLUtils::dumpGLErrors();
 }
 
 ///////////////////////////////////////////////////////////////////////////////