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

Merge "Report errors when eglCreateImageKHR fails"

Browse Source
This commit is contained in:
Mathias Agopian 2011-04-26 18:05:23 -07:00 committed by Android (Google) Code Review
commit 0ea7d61fa1
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/gui/SurfaceTexture.cpp
View File

@ -274,10 +274,14 @@ status_t SurfaceTexture::updateTexImage() {
EGLImageKHR image = mSlots[mLastQueued].mEglImage; EGLImageKHR image = mSlots[mLastQueued].mEglImage;
if (image == EGL_NO_IMAGE_KHR) { if (image == EGL_NO_IMAGE_KHR) {
EGLDisplay dpy = eglGetCurrentDisplay(); EGLDisplay dpy = eglGetCurrentDisplay();
sp<GraphicBuffer> graphicBuffer = mSlots[mLastQueued].mGraphicBuffer; image = createImage(dpy, mSlots[mLastQueued].mGraphicBuffer);
image = createImage(dpy, graphicBuffer);
mSlots[mLastQueued].mEglImage = image; mSlots[mLastQueued].mEglImage = image;
mSlots[mLastQueued].mEglDisplay = dpy; mSlots[mLastQueued].mEglDisplay = dpy;
if (image == EGL_NO_IMAGE_KHR) {
// NOTE: if dpy was invalid, createImage() is guaranteed to
// fail. so we'd end up here.
return -EINVAL;
}
} }
GLint error; GLint error;
@ -483,12 +487,9 @@ EGLImageKHR SurfaceTexture::createImage(EGLDisplay dpy,
}; };
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);
EGLint error = eglGetError(); if (image == EGL_NO_IMAGE_KHR) {
if (error != EGL_SUCCESS) { EGLint error = eglGetError();
LOGE("error creating EGLImage: %#x", error); LOGE("error creating EGLImage: %#x", error);
} else if (image == EGL_NO_IMAGE_KHR) {
LOGE("no error reported, but no image was returned by "
"eglCreateImageKHR");
} }
return image; return image;
} }