diff options
| author | Andy McFadden <fadden@android.com> | 2012-12-18 09:48:38 -0800 |
|---|---|---|
| committer | Andy McFadden <fadden@android.com> | 2012-12-18 11:22:21 -0800 |
| commit | d47f7d8b5fe3a3861d7cbdc5f912235407823c8e (patch) | |
| tree | b4c4e636bac379ded38550ade39e39c2d86467ea /graphics/jni | |
| parent | 4e7ec240cabbdf3ac9776a691be0a46ea4e2e69e (diff) | |
| download | base-d47f7d8b5fe3a3861d7cbdc5f912235407823c8e.tar.gz | |
Rename ISurfaceTexture and SurfaceTexture
The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.
Bug 7736700
Change-Id: I08e677faf2ebb418ef131d0a8008e01037db0e50
Diffstat (limited to 'graphics/jni')
| -rw-r--r-- | graphics/jni/android_renderscript_RenderScript.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp index e0470dc3c445..75c7903f3914 100644 --- a/graphics/jni/android_renderscript_RenderScript.cpp +++ b/graphics/jni/android_renderscript_RenderScript.cpp @@ -42,7 +42,7 @@ #include <rs.h> #include <rsEnv.h> #include <gui/Surface.h> -#include <gui/SurfaceTexture.h> +#include <gui/GLConsumer.h> #include <gui/SurfaceTextureClient.h> #include <android_runtime/android_graphics_SurfaceTexture.h> @@ -242,7 +242,7 @@ nContextSetSurfaceTexture(JNIEnv *_env, jobject _this, RsContext con, jint width LOG_API("nContextSetSurfaceTexture, con(%p), width(%i), height(%i), surface(%p)", con, width, height, (Surface *)sur); sp<ANativeWindow> window; - sp<SurfaceTexture> st; + sp<GLConsumer> st; if (sur == 0) { } else { @@ -481,9 +481,9 @@ static void nAllocationGetSurfaceTextureID2(JNIEnv *_env, jobject _this, RsContext con, jint a, jobject jst) { LOG_API("nAllocationGetSurfaceTextureID2, con(%p), a(%p)", con, (RsAllocation)a); - sp<SurfaceTexture> st = SurfaceTexture_getSurfaceTexture(_env, jst); + sp<GLConsumer> st = SurfaceTexture_getSurfaceTexture(_env, jst); - rsAllocationGetSurfaceTextureID2(con, (RsAllocation)a, st.get(), sizeof(SurfaceTexture *)); + rsAllocationGetSurfaceTextureID2(con, (RsAllocation)a, st.get(), sizeof(GLConsumer *)); } static void |