diff options
| -rw-r--r-- | core/java/android/view/GLES20Canvas.java | 7 | ||||
| -rw-r--r-- | core/jni/android_view_GLES20Canvas.cpp | 6 | ||||
| -rw-r--r-- | graphics/java/android/graphics/Canvas.java | 11 | ||||
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 7 | ||||
| -rw-r--r-- | libs/hwui/OpenGLRenderer.h | 1 |
5 files changed, 0 insertions, 32 deletions
diff --git a/core/java/android/view/GLES20Canvas.java b/core/java/android/view/GLES20Canvas.java index a7fe95d..e586370 100644 --- a/core/java/android/view/GLES20Canvas.java +++ b/core/java/android/view/GLES20Canvas.java @@ -509,13 +509,6 @@ class GLES20Canvas extends HardwareCanvas { private static native void nSetMatrix(int renderer, int matrix); @Override - public int getNativeMatrix() { - return nGetMatrix(mRenderer); - } - - private static native int nGetMatrix(int renderer); - - @Override public void getMatrix(Matrix matrix) { nGetMatrix(mRenderer, matrix.native_instance); } diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp index b3f2d51..039c5ba 100644 --- a/core/jni/android_view_GLES20Canvas.cpp +++ b/core/jni/android_view_GLES20Canvas.cpp @@ -289,11 +289,6 @@ static void android_view_GLES20Canvas_setMatrix(JNIEnv* env, jobject clazz, renderer->setMatrix(matrix); } -static const float* android_view_GLES20Canvas_getNativeMatrix(JNIEnv* env, - jobject clazz, OpenGLRenderer* renderer) { - return renderer->getMatrix(); -} - static void android_view_GLES20Canvas_getMatrix(JNIEnv* env, jobject clazz, OpenGLRenderer* renderer, SkMatrix* matrix) { renderer->getMatrix(matrix); @@ -776,7 +771,6 @@ static JNINativeMethod gMethods[] = { { "nSkew", "(IFF)V", (void*) android_view_GLES20Canvas_skew }, { "nSetMatrix", "(II)V", (void*) android_view_GLES20Canvas_setMatrix }, - { "nGetMatrix", "(I)I", (void*) android_view_GLES20Canvas_getNativeMatrix }, { "nGetMatrix", "(II)V", (void*) android_view_GLES20Canvas_getMatrix }, { "nConcatMatrix", "(II)V", (void*) android_view_GLES20Canvas_concatMatrix }, diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java index 6ae8c9b..eefd21e 100644 --- a/graphics/java/android/graphics/Canvas.java +++ b/graphics/java/android/graphics/Canvas.java @@ -508,17 +508,6 @@ public class Canvas { } /** - * Returns a pointer to an internal 4x4 native matrix. The returned - * pointer is a pointer to an array of 16 floats. - * - * @hide - */ - @SuppressWarnings({"UnusedDeclaration"}) - public int getNativeMatrix() { - return 0; - } - - /** * Return a new matrix with a copy of the canvas' current transformation * matrix. */ diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index ed2fa3c..4864cff 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -924,13 +924,6 @@ void OpenGLRenderer::setMatrix(SkMatrix* matrix) { mSnapshot->transform->load(*matrix); } -const float* OpenGLRenderer::getMatrix() const { - if (mSnapshot->fbo != 0) { - return &mSnapshot->transform->data[0]; - } - return &mIdentity.data[0]; -} - void OpenGLRenderer::getMatrix(SkMatrix* matrix) { mSnapshot->transform->copyTo(*matrix); } diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h index fa893f0..14b22b3 100644 --- a/libs/hwui/OpenGLRenderer.h +++ b/libs/hwui/OpenGLRenderer.h @@ -87,7 +87,6 @@ public: virtual void scale(float sx, float sy); virtual void skew(float sx, float sy); - const float* getMatrix() const; void getMatrix(SkMatrix* matrix); virtual void setMatrix(SkMatrix* matrix); virtual void concatMatrix(SkMatrix* matrix); |