LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EmuGL: remove broken EGL buffer refcounting

Browse Source 
The emulator EGL implementation tried to hold its own reference to
buffers acquired/released with dequeueBuffer/queueBuffer, but was
missing an incRef after dequeueBuffer during swapBuffers.

Since the native window holds a reference to the buffer between
dequeueBuffer and queueBuffer, the EGL reference isn't needed anyway.

Change-Id: I95e4f9f4faf59198f99939cdca6603fe176c56bc
This commit is contained in:
Jesse Hall
2011-12-12 09:59:34 -08:00
parent 4ea24bff40
commit b0a30e4388
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/emulator/opengl/system/egl/egl.cpp
View File

@@ -308,8 +308,6 @@ EGLBoolean egl_window_surface_t::connect()
setErrorReturn(EGL_BAD_ALLOC, EGL_FALSE); setErrorReturn(EGL_BAD_ALLOC, EGL_FALSE);
} }
buffer->common.incRef(&buffer->common);
// lock the buffer // lock the buffer
nativeWindow->lockBuffer(nativeWindow, buffer); nativeWindow->lockBuffer(nativeWindow, buffer);
@@ -323,7 +321,6 @@ void egl_window_surface_t::disconnect()
{ {
if (buffer) { if (buffer) {
nativeWindow->queueBuffer(nativeWindow, buffer); nativeWindow->queueBuffer(nativeWindow, buffer);
buffer->common.decRef(&buffer->common);
buffer = 0; buffer = 0;
} }
} }
@@ -338,16 +335,9 @@ EGLBoolean egl_window_surface_t::swapBuffers()
rcEnc->rcFlushWindowColorBuffer(rcEnc, rcSurface); rcEnc->rcFlushWindowColorBuffer(rcEnc, rcSurface);
android_native_buffer_t* prevBuf = buffer;
//post the back buffer //post the back buffer
nativeWindow->queueBuffer(nativeWindow, buffer); nativeWindow->queueBuffer(nativeWindow, buffer);
buffer->common.incRef(&buffer->common);
if (prevBuf) {
prevBuf->common.decRef(&prevBuf->common);
}
// dequeue a new buffer // dequeue a new buffer
if (nativeWindow->dequeueBuffer(nativeWindow, &buffer)) { if (nativeWindow->dequeueBuffer(nativeWindow, &buffer)) {
setErrorReturn(EGL_BAD_ALLOC, EGL_FALSE); setErrorReturn(EGL_BAD_ALLOC, EGL_FALSE);