diff options
author | John Reck <jreck@google.com> | 2018-08-30 16:47:59 +0000 |
---|---|---|
committer | Stan Iliev <stani@google.com> | 2018-08-30 18:42:08 +0000 |
commit | 867c43de0544217d26c3ee18f4d6603bb2ea97ce (patch) | |
tree | d780e25edaa90578c80309a105d6fe2e9eea71c8 /core/jni/include | |
parent | c8e22a653297837da9a80b0ba65f6854c8986c96 (diff) |
Revert "TextureView Vulkan support and optimized OpenGL draw"
This reverts commit c8e22a653297837da9a80b0ba65f6854c8986c96.
Reason for revert: broke camera, b/113555199
Bug: 113555199
Change-Id: Iae9b462694d5de0cd99427afead63b567fb4d71d
Diffstat (limited to 'core/jni/include')
-rw-r--r-- | core/jni/include/android_runtime/android_graphics_SurfaceTexture.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/jni/include/android_runtime/android_graphics_SurfaceTexture.h b/core/jni/include/android_runtime/android_graphics_SurfaceTexture.h index 0ad25876a008..c534d4bb9e0a 100644 --- a/core/jni/include/android_runtime/android_graphics_SurfaceTexture.h +++ b/core/jni/include/android_runtime/android_graphics_SurfaceTexture.h @@ -23,14 +23,14 @@ namespace android { +class GLConsumer; class IGraphicBufferProducer; -class SurfaceTexture; extern sp<ANativeWindow> android_SurfaceTexture_getNativeWindow(JNIEnv* env, jobject thiz); extern bool android_SurfaceTexture_isInstanceOf(JNIEnv* env, jobject thiz); -/* Gets the underlying C++ SurfaceTexture object from a SurfaceTexture Java object. */ -extern sp<SurfaceTexture> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz); +/* Gets the underlying GLConsumer from a SurfaceTexture Java object. */ +extern sp<GLConsumer> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz); /* gets the producer end of the SurfaceTexture */ extern sp<IGraphicBufferProducer> SurfaceTexture_getProducer(JNIEnv* env, jobject thiz); |