summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2013-07-17 21:06:54 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-07-17 21:06:54 +0000
commitae9610220b5f509687b840532f95f3638ee0146b (patch)
tree4758b365f4a8badca17aa5260845afab674a8c21
parent674816078588d0951c3c9bdaf26ecc9e9b3f2e0a (diff)
parent77a9b4a6bd21188e2744ae9dcd8092c6837bff7c (diff)
downloadnative-jb-mr1.1-dev-plus-aosp.tar.gz
Merge "EGL: Fix error for eglCreateWindowSurface"jb-mr1.1-dev-plus-aosp
-rw-r--r--opengl/libs/EGL/eglApi.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index c25612d050..d1f7c5783f 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -295,7 +295,7 @@ EGLSurface eglCreateWindowSurface( EGLDisplay dpy, EGLConfig config,
if (native_window_api_connect(window, NATIVE_WINDOW_API_EGL) != OK) {
ALOGE("EGLNativeWindowType %p already connected to another API",
window);
- return setError(EGL_BAD_NATIVE_WINDOW, EGL_NO_SURFACE);
+ return setError(EGL_BAD_ALLOC, EGL_NO_SURFACE);
}
// set the native window's buffers format to match this config