Merge "SurfaceTexture: add updateTexImage synchronization" into jb-mr1-dev

Jamie Gennis · Android (Google) Code Review · commit cae2e3887d82 · 2012-09-10T13:31:39.000-07:00
diff --git a/core/jni/android/graphics/SurfaceTexture.cpp b/core/jni/android/graphics/SurfaceTexture.cpp
@@ -223,6 +223,10 @@ 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,6 +223,10 @@ 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`	`+ }`
`226`	`230`	`}`
`227`	`231`
`228`	`232`	`static jint SurfaceTexture_detachFromGLContext(JNIEnv* env, jobject thiz)`