commit 49385ec7c361347a69245c8a0838f6d03343a1de
author Jesse Hall <jessehall@google.com> Thu Mar 07 23:43:56 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 07 23:43:56 2013 +0000
tree bd4bdcc6fe5fe8983cb6a2c10f07228118dd8d77
parent 86306b587644e939c5b6d4a53d67c9b74ce24ba5
parent 5f555569e757d280f707e2587b3d154c9d8c872f

Merge "When disconnecting a surface, cancel don't queue the buffer" into jb-mr2-dev

opengl/libagl/egl.cpp

diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp
index bc1cf36..0ed5727 100644
--- a/opengl/libagl/egl.cpp
+++ b/opengl/libagl/egl.cpp
@@ -420,9 +420,8 @@
         bits = NULL;
         unlock(buffer);
     }
-    // enqueue the last frame
-    nativeWindow->queueBuffer(nativeWindow, buffer, -1);
     if (buffer) {
+        nativeWindow->cancelBuffer(nativeWindow, buffer, -1);
         buffer->common.decRef(&buffer->common);
         buffer = 0;
     }