commit a6f895ee344a350dad60e74b78539a4d5ba41e52
author Jamie Gennis <jgennis@google.com> Mon Oct 01 12:29:34 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 01 12:29:34 2012 -0700
tree afe6130c847265be793b0391cab2a2cba702bb1d
parent 9c63cdd6b0ff28d3a371aa8c6121411fbf7f0a76
parent d30b36d1fd0c7ab80553e784a155266be9703e47

am d30b36d1: SurfaceFlinger: reset the FB_TGT acquire fence

* commit 'd30b36d1fd0c7ab80553e784a155266be9703e47':
  SurfaceFlinger: reset the FB_TGT acquire fence

opengl/libs/EGL/eglApi.cpp

diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index 92023ba..4aed5b5 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -1118,11 +1118,12 @@
     const egl_display_ptr dp = validate_display(dpy);
     if (!dp) return EGL_FALSE;
 
+    EGLBoolean result = EGL_FALSE;
     egl_connection_t* const cnx = &gEGLImpl;
     if (cnx->dso && cnx->egl.eglDestroyImageKHR) {
-        cnx->egl.eglDestroyImageKHR(dp->disp.dpy, img);
+        result = cnx->egl.eglDestroyImageKHR(dp->disp.dpy, img);
     }
-    return EGL_TRUE;
+    return result;
 }
 
 // ----------------------------------------------------------------------------