diff options
| author | Mathias Agopian <mathias@google.com> | 2010-09-09 14:21:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-09 14:21:55 -0700 |
| commit | 12e85311f4d8de8011f1c4b10320a399ba97597f (patch) | |
| tree | 6a1f53019f3830fce04d2137eb456834fc925bf5 /opengl/libs | |
| parent | 293de3eaf22987b011b3b9a4bd176b4d2c17d224 (diff) | |
| parent | a9ff29b59cf33e552285a0bff3caf7a44f93f1c0 (diff) | |
| download | frameworks_base-12e85311f4d8de8011f1c4b10320a399ba97597f.zip frameworks_base-12e85311f4d8de8011f1c4b10320a399ba97597f.tar.gz frameworks_base-12e85311f4d8de8011f1c4b10320a399ba97597f.tar.bz2 | |
am a9ff29b5: am 6808e6a8: Merge "Fix a few typos in EGL wrapper" into gingerbread
Merge commit 'a9ff29b59cf33e552285a0bff3caf7a44f93f1c0'
* commit 'a9ff29b59cf33e552285a0bff3caf7a44f93f1c0':
Fix a few typos in EGL wrapper
Diffstat (limited to 'opengl/libs')
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 9228b0b..bd5fad2 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -240,7 +240,7 @@ struct egl_image_t : public egl_object_t memset(images, 0, sizeof(images)); } EGLDisplay dpy; - EGLConfig context; + EGLContext context; EGLImageKHR images[IMPL_NUM_IMPLEMENTATIONS]; }; @@ -1770,7 +1770,7 @@ EGLBoolean eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR img) egl_connection_t* const cnx = &gEGLImpl[i]; if (image->images[i] != EGL_NO_IMAGE_KHR) { if (cnx->dso) { - if (cnx->egl.eglCreateImageKHR) { + if (cnx->egl.eglDestroyImageKHR) { if (cnx->egl.eglDestroyImageKHR( dp->disp[i].dpy, image->images[i])) { success = true; |