Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev

Jamie Gennis · Android (Google) Code Review · commit 94998c9c4e19 · 2012-09-18T14:32:01.000-07:00
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -223,10 +223,6 @@ static void SurfaceTexture_updateTexImage(JNIEnv* env, jobject thiz)`
`223`	`223`	`} else if (err < 0) {`
`224`	`224`	`jniThrowRuntimeException(env, "Error during updateTexImage (see logcat for details)");`
`225`	`225`	`}`
`226`		`- err = surfaceTexture->doGLFenceWait();`
`227`		`- if (err != NO_ERROR) {`
`228`		`- jniThrowRuntimeException(env, "Error waiting for fence (see logcat for details)");`
`229`		`- }`
`230`	`226`	`}`
`231`	`227`
`232`	`228`	`static jint SurfaceTexture_detachFromGLContext(JNIEnv* env, jobject thiz)`