diff options
| author | Jesse Hall <jessehall@google.com> | 2013-07-17 14:10:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-17 14:10:00 -0700 |
| commit | 082fc1cae6a0c283de3ad0d848e0757de3154d0b (patch) | |
| tree | 4e90ae89bac7b70440959a6c9d6b84e9f363f9f2 /opengl | |
| parent | 384f55fff01a9d0630b801abd016b82ded4c5984 (diff) | |
| parent | ae9610220b5f509687b840532f95f3638ee0146b (diff) | |
| download | frameworks_native-082fc1cae6a0c283de3ad0d848e0757de3154d0b.zip frameworks_native-082fc1cae6a0c283de3ad0d848e0757de3154d0b.tar.gz frameworks_native-082fc1cae6a0c283de3ad0d848e0757de3154d0b.tar.bz2 | |
am ae961022: Merge "EGL: Fix error for eglCreateWindowSurface"
* commit 'ae9610220b5f509687b840532f95f3638ee0146b':
EGL: Fix error for eglCreateWindowSurface
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/EGL/eglApi.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp index ec07490..f39c386 100644 --- a/opengl/libs/EGL/eglApi.cpp +++ b/opengl/libs/EGL/eglApi.cpp @@ -373,7 +373,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 |