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

2012-09-10 13:31:39 -07:00
parent dcc036c544 f09263e957
commit cae2e3887d
1 changed files with 4 additions and 0 deletions
--- 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)