diff options
| author | Chris Craik <ccraik@google.com> | 2014-11-21 22:11:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-21 22:11:13 +0000 |
| commit | 29dc496a42d49a37dcd99c0465f3cec18a47e6ff (patch) | |
| tree | b358eca2f3baeef7dbfb446b498fb0e9364bd4c1 /core/jni | |
| parent | c0491a2e2d30eb4bc3e03fccee89d57e9bd575e4 (diff) | |
| parent | 69e65019b0a6204f0ed9487d8fd7b3564eba6df8 (diff) | |
| download | frameworks_base-29dc496a42d49a37dcd99c0465f3cec18a47e6ff.zip frameworks_base-29dc496a42d49a37dcd99c0465f3cec18a47e6ff.tar.gz frameworks_base-29dc496a42d49a37dcd99c0465f3cec18a47e6ff.tar.bz2 | |
Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_view_GLES20Canvas.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp index fe64aba..b023ebd 100644 --- a/core/jni/android_view_GLES20Canvas.cpp +++ b/core/jni/android_view_GLES20Canvas.cpp @@ -172,12 +172,6 @@ static jint android_view_GLES20Canvas_getMaxTextureHeight(JNIEnv* env, jobject c return Caches::getInstance().maxTextureSize; } -static void android_view_GLES20Canvas_setOverrideXfermode(JNIEnv* env, jobject clazz, - jlong rendererPtr, int xfermode) { - DisplayListRenderer* renderer = reinterpret_cast<DisplayListRenderer*>(rendererPtr); - renderer->setOverrideXfermode(xfermode); -} - // ---------------------------------------------------------------------------- // State // ---------------------------------------------------------------------------- @@ -970,8 +964,6 @@ static JNINativeMethod gMethods[] = { { "nGetMaximumTextureWidth", "()I", (void*) android_view_GLES20Canvas_getMaxTextureWidth }, { "nGetMaximumTextureHeight", "()I", (void*) android_view_GLES20Canvas_getMaxTextureHeight }, - { "nSetOverrideXfermode", "(JI)V", (void*) android_view_GLES20Canvas_setOverrideXfermode }, - #endif }; |