diff options
| author | Mathias Agopian <mathias@google.com> | 2013-02-23 04:13:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-23 04:13:34 +0000 |
| commit | 0d1ab1db229ffc1d776df466b02e2b51c004df9c (patch) | |
| tree | 93ab25ad25b5530c263cbf21e7ac102cbcf99ef4 /core/jni/android_opengl_EGL14.cpp | |
| parent | bd0dc13cb870e4dc0c3dfbbeba83a9e03ab481e9 (diff) | |
| parent | 89be00bcda2b5965757e83bdf70a650b64373045 (diff) | |
| download | frameworks_base-0d1ab1db229ffc1d776df466b02e2b51c004df9c.zip frameworks_base-0d1ab1db229ffc1d776df466b02e2b51c004df9c.tar.gz frameworks_base-0d1ab1db229ffc1d776df466b02e2b51c004df9c.tar.bz2 | |
Merge "regenerate egl/gles stubs from glgen"
Diffstat (limited to 'core/jni/android_opengl_EGL14.cpp')
| -rw-r--r-- | core/jni/android_opengl_EGL14.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/jni/android_opengl_EGL14.cpp b/core/jni/android_opengl_EGL14.cpp index 26fc261..196004a 100644 --- a/core/jni/android_opengl_EGL14.cpp +++ b/core/jni/android_opengl_EGL14.cpp @@ -1,5 +1,4 @@ /* -** ** Copyright 2012, The Android Open Source Project ** ** Licensed under the Apache License, Version 2.0 (the "License"); @@ -605,7 +604,7 @@ android_eglCreateWindowSurfaceTexture jint _remaining; EGLint *attrib_list = (EGLint *) 0; android::sp<ANativeWindow> window; - android::sp<android::GLConsumer> surfaceTexture; + android::sp<android::GLConsumer> glConsumer; if (!attrib_list_ref) { _exception = 1; @@ -626,12 +625,12 @@ not_valid_surface: _exceptionMessage = "Make sure the SurfaceView or associated SurfaceHolder has a valid Surface"; goto exit; } - surfaceTexture = android::SurfaceTexture_getSurfaceTexture(_env, win); + glConsumer = android::SurfaceTexture_getSurfaceTexture(_env, win); - if (surfaceTexture == NULL) + if (glConsumer == NULL) goto not_valid_surface; - window = new android::Surface(surfaceTexture->getBufferQueue()); + window = new android::Surface(glConsumer->getBufferQueue()); if (window == NULL) goto not_valid_surface; |