diff options
| author | John Reck <jreck@google.com> | 2014-10-03 23:57:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-03 23:57:09 +0000 |
| commit | b0d6cd236ce84085c6f19955b4f4610d1a754411 (patch) | |
| tree | d82c289cc502d116b4c946d79055d8ee2b8b88e9 /core | |
| parent | 865acc74395a56287ab7bec58947327b5790aa70 (diff) | |
| parent | d988a45d60cd2ff05e41a44c78cb09d307bd90cb (diff) | |
| download | frameworks_base-b0d6cd236ce84085c6f19955b4f4610d1a754411.zip frameworks_base-b0d6cd236ce84085c6f19955b4f4610d1a754411.tar.gz frameworks_base-b0d6cd236ce84085c6f19955b4f4610d1a754411.tar.bz2 | |
am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev
* commit 'd988a45d60cd2ff05e41a44c78cb09d307bd90cb':
Cleanup DeferredLayerUpdater
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/ThreadedRenderer.java | 1 | ||||
| -rw-r--r-- | core/jni/android_view_ThreadedRenderer.cpp | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java index 5d2822d..1e46517 100644 --- a/core/java/android/view/ThreadedRenderer.java +++ b/core/java/android/view/ThreadedRenderer.java @@ -493,7 +493,6 @@ public class ThreadedRenderer extends HardwareRenderer { private static native void nInvokeFunctor(long functor, boolean waitForCompletion); - private static native long nCreateDisplayListLayer(long nativeProxy, int width, int height); private static native long nCreateTextureLayer(long nativeProxy); private static native void nBuildLayer(long nativeProxy, long node); private static native boolean nCopyLayerInto(long nativeProxy, long layer, long bitmap); diff --git a/core/jni/android_view_ThreadedRenderer.cpp b/core/jni/android_view_ThreadedRenderer.cpp index a8edb77..6219956 100644 --- a/core/jni/android_view_ThreadedRenderer.cpp +++ b/core/jni/android_view_ThreadedRenderer.cpp @@ -320,13 +320,6 @@ static void android_view_ThreadedRenderer_invokeFunctor(JNIEnv* env, jobject cla RenderProxy::invokeFunctor(functor, waitForCompletion); } -static jlong android_view_ThreadedRenderer_createDisplayListLayer(JNIEnv* env, jobject clazz, - jlong proxyPtr, jint width, jint height) { - RenderProxy* proxy = reinterpret_cast<RenderProxy*>(proxyPtr); - DeferredLayerUpdater* layer = proxy->createDisplayListLayer(width, height); - return reinterpret_cast<jlong>(layer); -} - static jlong android_view_ThreadedRenderer_createTextureLayer(JNIEnv* env, jobject clazz, jlong proxyPtr) { RenderProxy* proxy = reinterpret_cast<RenderProxy*>(proxyPtr); @@ -443,7 +436,6 @@ static JNINativeMethod gMethods[] = { { "nDestroy", "(J)V", (void*) android_view_ThreadedRenderer_destroy }, { "nRegisterAnimatingRenderNode", "(JJ)V", (void*) android_view_ThreadedRenderer_registerAnimatingRenderNode }, { "nInvokeFunctor", "(JZ)V", (void*) android_view_ThreadedRenderer_invokeFunctor }, - { "nCreateDisplayListLayer", "(JII)J", (void*) android_view_ThreadedRenderer_createDisplayListLayer }, { "nCreateTextureLayer", "(J)J", (void*) android_view_ThreadedRenderer_createTextureLayer }, { "nBuildLayer", "(JJ)V", (void*) android_view_ThreadedRenderer_buildLayer }, { "nCopyLayerInto", "(JJJ)Z", (void*) android_view_ThreadedRenderer_copyLayerInto }, |