Merge "fix [2931161] crash in labyritnth when completing a level" into gingerbread (5de4b2f2) · Commits · e / os / android_frameworks_native-old

opengl/libagl/egl.cpp

+35 −32

Original line number	Diff line number	Diff line
		@@ -576,7 +576,7 @@ EGLBoolean egl_window_surface_v2_t::swapBuffers()
		buffer = 0;

		// dequeue a new buffer
		nativeWindow->dequeueBuffer(nativeWindow, &buffer);
		if (nativeWindow->dequeueBuffer(nativeWindow, &buffer) == NO_ERROR) {

		// TODO: lockBuffer should rather be executed when the very first
		// direct rendering occurs.
		@@ -612,6 +612,9 @@ EGLBoolean egl_window_surface_v2_t::swapBuffers()
		return setError(EGL_BAD_ACCESS, EGL_FALSE);
		// FIXME: we should make sure we're not accessing the buffer anymore
		}
		} else {
		return setError(EGL_BAD_CURRENT_SURFACE, EGL_FALSE);
		}

		return EGL_TRUE;
		}