ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am dcc959be: Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev

Browse Source 
* commit 'dcc959beb77099d319a94e3985da2f4ea4064e7b':
  Adding eglInitialize and eglTerminate image creation and deletion.
This commit is contained in:
Michael Lentine 2014-10-21 18:35:24 +00:00 committed by Android Git Automerger
commit 15b2ecf599
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/gui/GLConsumer.cpp
View File

@ -1065,6 +1065,7 @@ GLConsumer::EglImage::~EglImage() {
if (!eglDestroyImageKHR(mEglDisplay, mEglImage)) { if (!eglDestroyImageKHR(mEglDisplay, mEglImage)) {
ALOGE("~EglImage: eglDestroyImageKHR failed"); ALOGE("~EglImage: eglDestroyImageKHR failed");
} }
eglTerminate(mEglDisplay);
} }
} }
@ -1079,6 +1080,7 @@ status_t GLConsumer::EglImage::createIfNeeded(EGLDisplay eglDisplay,
if (!eglDestroyImageKHR(mEglDisplay, mEglImage)) { if (!eglDestroyImageKHR(mEglDisplay, mEglImage)) {
ALOGE("createIfNeeded: eglDestroyImageKHR failed"); ALOGE("createIfNeeded: eglDestroyImageKHR failed");
} }
eglTerminate(mEglDisplay);
mEglImage = EGL_NO_IMAGE_KHR; mEglImage = EGL_NO_IMAGE_KHR;
mEglDisplay = EGL_NO_DISPLAY; mEglDisplay = EGL_NO_DISPLAY;
} }
@ -1129,11 +1131,13 @@ EGLImageKHR GLConsumer::EglImage::createImage(EGLDisplay dpy,
// removes this restriction if there is hardware that can support it. // removes this restriction if there is hardware that can support it.
attrs[2] = EGL_NONE; attrs[2] = EGL_NONE;
} }
eglInitialize(dpy, 0, 0);
EGLImageKHR image = eglCreateImageKHR(dpy, EGL_NO_CONTEXT, EGLImageKHR image = eglCreateImageKHR(dpy, EGL_NO_CONTEXT,
EGL_NATIVE_BUFFER_ANDROID, cbuf, attrs); EGL_NATIVE_BUFFER_ANDROID, cbuf, attrs);
if (image == EGL_NO_IMAGE_KHR) { if (image == EGL_NO_IMAGE_KHR) {
EGLint error = eglGetError(); EGLint error = eglGetError();
ALOGE("error creating EGLImage: %#x", error); ALOGE("error creating EGLImage: %#x", error);
eglTerminate(dpy);
} }
return image; return image;
} }