diff options
| author | Mathias Agopian <pixelflinger@gmail.com> | 2012-09-24 15:43:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-24 15:43:54 -0700 |
| commit | 81b316aa5395b6318ad4a10e1ed27d0b9b0df07f (patch) | |
| tree | a5ece9b57e09eef86c0fd9a5f0399402e57487cb /opengl/libs | |
| parent | 2cee285a97900cccd0992a274228ca806ba70884 (diff) | |
| parent | 98838aa0836518b7397cbfe763f34305e3387a5f (diff) | |
| download | frameworks_native-81b316aa5395b6318ad4a10e1ed27d0b9b0df07f.zip frameworks_native-81b316aa5395b6318ad4a10e1ed27d0b9b0df07f.tar.gz frameworks_native-81b316aa5395b6318ad4a10e1ed27d0b9b0df07f.tar.bz2 | |
am 98838aa0: am 77af25b6: Merge "Return back-end result from eglDestroyImageKHR"
* commit '98838aa0836518b7397cbfe763f34305e3387a5f':
Return back-end result from eglDestroyImageKHR
Diffstat (limited to 'opengl/libs')
| -rw-r--r-- | opengl/libs/EGL/eglApi.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp index 91b4567..f5a0202 100644 --- a/opengl/libs/EGL/eglApi.cpp +++ b/opengl/libs/EGL/eglApi.cpp @@ -1112,11 +1112,12 @@ EGLBoolean eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR img) 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; } // ---------------------------------------------------------------------------- |