diff options
| author | Jamie Gennis <jgennis@google.com> | 2012-09-18 14:32:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-18 14:32:01 -0700 |
| commit | 94998c9c4e19d5b439228646f1b283201367b7a0 (patch) | |
| tree | cc35990db99a6f13df65d43ce3343aaf0eb6f470 /core/jni | |
| parent | ab3d0fd684eabecd6b290ef3cb9799739db04ca3 (diff) | |
| parent | 917a3b34a33f703503d05aaef4af955a09553703 (diff) | |
| download | frameworks_base-94998c9c4e19d5b439228646f1b283201367b7a0.zip frameworks_base-94998c9c4e19d5b439228646f1b283201367b7a0.tar.gz frameworks_base-94998c9c4e19d5b439228646f1b283201367b7a0.tar.bz2 | |
Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android/graphics/SurfaceTexture.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/jni/android/graphics/SurfaceTexture.cpp b/core/jni/android/graphics/SurfaceTexture.cpp index bc58813..c48b974 100644 --- a/core/jni/android/graphics/SurfaceTexture.cpp +++ b/core/jni/android/graphics/SurfaceTexture.cpp @@ -223,10 +223,6 @@ static void SurfaceTexture_updateTexImage(JNIEnv* env, jobject thiz) } else if (err < 0) { jniThrowRuntimeException(env, "Error during updateTexImage (see logcat for details)"); } - err = surfaceTexture->doGLFenceWait(); - if (err != NO_ERROR) { - jniThrowRuntimeException(env, "Error waiting for fence (see logcat for details)"); - } } static jint SurfaceTexture_detachFromGLContext(JNIEnv* env, jobject thiz) |