diff options
| author | Derek Sollenberger <djsollen@google.com> | 2014-05-08 14:41:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-08 14:41:47 +0000 |
| commit | 5b554f010358d8f47e31d92a42aa3edc4a71ec47 (patch) | |
| tree | 3adcf06e0c8b18fe725188888031870e485e6be0 /core/jni/android_view_GLES20Canvas.cpp | |
| parent | cf501a60b8817acdea2368eb56225ebc831b1559 (diff) | |
| parent | c29a0a4664a4b9871fadd668b632469a0db240b9 (diff) | |
| download | frameworks_base-5b554f010358d8f47e31d92a42aa3edc4a71ec47.zip frameworks_base-5b554f010358d8f47e31d92a42aa3edc4a71ec47.tar.gz frameworks_base-5b554f010358d8f47e31d92a42aa3edc4a71ec47.tar.bz2 | |
Merge "Avoid caching shadow properties in Java & HWUI."
Diffstat (limited to 'core/jni/android_view_GLES20Canvas.cpp')
| -rw-r--r-- | core/jni/android_view_GLES20Canvas.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp index 7b2f829..fae6698 100644 --- a/core/jni/android_view_GLES20Canvas.cpp +++ b/core/jni/android_view_GLES20Canvas.cpp @@ -79,7 +79,6 @@ using namespace uirenderer; #define RENDERER_LOGD(...) #endif -#define MODIFIER_SHADOW 1 #define MODIFIER_SHADER 2 // ---------------------------------------------------------------------------- @@ -617,7 +616,6 @@ static void android_view_GLES20Canvas_drawLines(JNIEnv* env, jobject clazz, static void android_view_GLES20Canvas_resetModifiers(JNIEnv* env, jobject clazz, jlong rendererPtr, jint modifiers) { OpenGLRenderer* renderer = reinterpret_cast<OpenGLRenderer*>(rendererPtr); - if (modifiers & MODIFIER_SHADOW) renderer->resetShadow(); if (modifiers & MODIFIER_SHADER) renderer->resetShader(); } @@ -629,12 +627,6 @@ static void android_view_GLES20Canvas_setupShader(JNIEnv* env, jobject clazz, } -static void android_view_GLES20Canvas_setupShadow(JNIEnv* env, jobject clazz, - jlong rendererPtr, jfloat radius, jfloat dx, jfloat dy, jint color) { - OpenGLRenderer* renderer = reinterpret_cast<OpenGLRenderer*>(rendererPtr); - renderer->setupShadow(radius, dx, dy, color); -} - // ---------------------------------------------------------------------------- // Draw filters // ---------------------------------------------------------------------------- @@ -1032,7 +1024,6 @@ static JNINativeMethod gMethods[] = { { "nResetModifiers", "(JI)V", (void*) android_view_GLES20Canvas_resetModifiers }, { "nSetupShader", "(JJ)V", (void*) android_view_GLES20Canvas_setupShader }, - { "nSetupShadow", "(JFFFI)V", (void*) android_view_GLES20Canvas_setupShadow }, { "nSetupPaintFilter", "(JII)V", (void*) android_view_GLES20Canvas_setupPaintFilter }, { "nResetPaintFilter", "(J)V", (void*) android_view_GLES20Canvas_resetPaintFilter }, |