commit 514d1cdb04594d418828f0c6ec642cb180608198
author Scott Main <smain@google.com> Tue Dec 13 10:25:23 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 13 10:25:23 2011 -0800
tree 98648fd300e4bed755d2ff2f3aea47d04c1fa649
parent b0a30e43889415a9a40b9519392ad3be295b9465
parent 442088151c335ce8047183b76a8b8a4a2109ba12

Merge "revisions to NewsReader sample app for AndroidU. Clean up XML markup for clean rendering in HTML docs; Change string resources for two-pane mode to bools; Rename resource files w/ layout info from main.xml to layouts.xml. Add support lib Add HTML page" into ics-mr0

tools/emulator/opengl/system/egl/egl.cpp

diff --git a/tools/emulator/opengl/system/egl/egl.cpp b/tools/emulator/opengl/system/egl/egl.cpp
index e9bae3a..ddc006c 100644
--- a/tools/emulator/opengl/system/egl/egl.cpp
+++ b/tools/emulator/opengl/system/egl/egl.cpp
@@ -308,8 +308,6 @@
         setErrorReturn(EGL_BAD_ALLOC, EGL_FALSE);
     }
 
-    buffer->common.incRef(&buffer->common);
-
     // lock the buffer
     nativeWindow->lockBuffer(nativeWindow, buffer);
 
@@ -323,7 +321,6 @@
 {
     if (buffer) {
         nativeWindow->queueBuffer(nativeWindow, buffer);
-        buffer->common.decRef(&buffer->common);
         buffer = 0;
     }
 }
@@ -338,16 +335,9 @@
 
     rcEnc->rcFlushWindowColorBuffer(rcEnc, rcSurface);
 
-    android_native_buffer_t* prevBuf = buffer;
     //post the back buffer
     nativeWindow->queueBuffer(nativeWindow, buffer);
 
-    buffer->common.incRef(&buffer->common);
-
-    if (prevBuf) {
-        prevBuf->common.decRef(&prevBuf->common);
-    }
-
     // dequeue a new buffer
     if (nativeWindow->dequeueBuffer(nativeWindow, &buffer)) {
         setErrorReturn(EGL_BAD_ALLOC, EGL_FALSE);