Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99d49118 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Add support for drawBitmapMesh()." into honeycomb

parents 055e56ee 5a7b466a

core/java/android/view/GLES20Canvas.java

+24 −1
Original line number Diff line number Diff line
@@ -630,9 +630,32 @@ class GLES20Canvas extends HardwareCanvas { 
    @Override

    public void drawBitmapMesh(Bitmap bitmap, int meshWidth, int meshHeight, float[] verts,

            int vertOffset, int[] colors, int colorOffset, Paint paint) {

        // TODO: Implement

        if (meshWidth < 0 || meshHeight < 0 || vertOffset < 0 || colorOffset < 0) {

            throw new ArrayIndexOutOfBoundsException();

        }



        if (meshWidth == 0 || meshHeight == 0) {

            return;

        }



        final int count = (meshWidth + 1) * (meshHeight + 1);

        checkRange(verts.length, vertOffset, count * 2);



        // TODO: Colors are ignored for now

        colors = null;

        colorOffset = 0;



        boolean hasColorFilter = paint != null && setupColorFilter(paint);

        final int nativePaint = paint == null ? 0 : paint.mNativePaint;        

        nDrawBitmapMesh(mRenderer, bitmap.mNativeBitmap, bitmap.mBuffer, meshWidth, meshHeight,

                verts, vertOffset, colors, colorOffset, nativePaint);

        if (hasColorFilter) nResetModifiers(mRenderer);

    }



    private native void nDrawBitmapMesh(int renderer, int bitmap, byte[] buffer,

            int meshWidth, int meshHeight, float[] verts, int vertOffset,

            int[] colors, int colorOffset, int paint);



    @Override

    public void drawCircle(float cx, float cy, float radius, Paint paint) {

        boolean hasModifier = setupModifiers(paint);

core/jni/android_view_GLES20Canvas.cpp

+31 −12
Original line number Diff line number Diff line
@@ -271,6 +271,22 @@ static void android_view_GLES20Canvas_drawBitmapMatrix(JNIEnv* env, jobject canv 
    renderer->drawBitmap(bitmap, matrix, paint);

}



static void android_view_GLES20Canvas_drawBitmapMesh(JNIEnv* env, jobject canvas,

        OpenGLRenderer* renderer, SkBitmap* bitmap, jbyteArray buffer,

        jint meshWidth, jint meshHeight, jfloatArray vertices, jint offset,

        jintArray colors, jint colorOffset, SkPaint* paint) {

    // This object allows the renderer to allocate a global JNI ref to the buffer object.

    JavaHeapBitmapRef bitmapRef(env, bitmap, buffer);



    jfloat* verticesArray = vertices ? env->GetFloatArrayElements(vertices, NULL) + offset : NULL;

    jint* colorsArray = colors ? env->GetIntArrayElements(colors, NULL) + colorOffset : NULL;



    renderer->drawBitmapMesh(bitmap, meshWidth, meshHeight, verticesArray, colorsArray, paint);



    if (vertices) env->ReleaseFloatArrayElements(vertices, verticesArray, 0);

    if (colors) env->ReleaseIntArrayElements(colors, colorsArray, 0);

}



static void android_view_GLES20Canvas_drawPatch(JNIEnv* env, jobject canvas,

        OpenGLRenderer* renderer, SkBitmap* bitmap, jbyteArray buffer, jbyteArray chunks,

        float left, float top, float right, float bottom, SkPaint* paint) {
@@ -393,24 +409,24 @@ static void renderTextRun(OpenGLRenderer* renderer, const jchar* text, 
}



static void android_view_GLES20Canvas_drawTextArray(JNIEnv* env, jobject canvas,

        OpenGLRenderer* renderer, jcharArray text, int index, int count,

        jfloat x, jfloat y, int flags, SkPaint* paint) {

        OpenGLRenderer* renderer, jcharArray text, jint index, jint count,

        jfloat x, jfloat y, jint flags, SkPaint* paint) {

    jchar* textArray = env->GetCharArrayElements(text, NULL);

    renderText(renderer, textArray + index, count, x, y, flags, paint);

    env->ReleaseCharArrayElements(text, textArray, JNI_ABORT);

}



static void android_view_GLES20Canvas_drawText(JNIEnv* env, jobject canvas,

        OpenGLRenderer* renderer, jstring text, int start, int end,

        jfloat x, jfloat y, int flags, SkPaint* paint) {

        OpenGLRenderer* renderer, jstring text, jint start, jint end,

        jfloat x, jfloat y, jint flags, SkPaint* paint) {

    const jchar* textArray = env->GetStringChars(text, NULL);

    renderText(renderer, textArray + start, end - start, x, y, flags, paint);

    env->ReleaseStringChars(text, textArray);

}



static void android_view_GLES20Canvas_drawTextRunArray(JNIEnv* env, jobject canvas,

        OpenGLRenderer* renderer, jcharArray text, int index, int count,

        int contextIndex, int contextCount, jfloat x, jfloat y, int dirFlags,

        OpenGLRenderer* renderer, jcharArray text, jint index, jint count,

        jint contextIndex, jint contextCount, jfloat x, jfloat y, jint dirFlags,

        SkPaint* paint) {

    jchar* textArray = env->GetCharArrayElements(text, NULL);

    renderTextRun(renderer, textArray + contextIndex, index - contextIndex,
@@ -419,8 +435,8 @@ static void android_view_GLES20Canvas_drawTextRunArray(JNIEnv* env, jobject canv 
 }



static void android_view_GLES20Canvas_drawTextRun(JNIEnv* env, jobject canvas,

        OpenGLRenderer* renderer, jstring text, int start, int end,

        int contextStart, int contextEnd, jfloat x, jfloat y, int dirFlags,

        OpenGLRenderer* renderer, jstring text, jint start, jint end,

        jint contextStart, int contextEnd, jfloat x, jfloat y, jint dirFlags,

        SkPaint* paint) {

    const jchar* textArray = env->GetStringChars(text, NULL);

    jint count = end - start;
@@ -576,6 +592,9 @@ static JNINativeMethod gMethods[] = { 
    { "nDrawBitmap",        "(II[BFFI)V",      (void*) android_view_GLES20Canvas_drawBitmap },

    { "nDrawBitmap",        "(II[BFFFFFFFFI)V",(void*) android_view_GLES20Canvas_drawBitmapRect },

    { "nDrawBitmap",        "(II[BII)V",       (void*) android_view_GLES20Canvas_drawBitmapMatrix },



    { "nDrawBitmapMesh",    "(II[BII[FI[III)V",(void*) android_view_GLES20Canvas_drawBitmapMesh },



    { "nDrawPatch",         "(II[B[BFFFFI)V",  (void*) android_view_GLES20Canvas_drawPatch },



    { "nDrawColor",         "(III)V",          (void*) android_view_GLES20Canvas_drawColor },

graphics/java/android/graphics/Canvas.java

+5 −2
Original line number Diff line number Diff line
@@ -1176,7 +1176,10 @@ public class Canvas { 
                paint != null ? paint.mNativePaint : 0);

    }



    private static void checkRange(int length, int offset, int count) {

    /**

     * @hide

     */

    protected static void checkRange(int length, int offset, int count) {

        if ((offset | count) < 0 || offset + count > length) {

            throw new ArrayIndexOutOfBoundsException();

        }

libs/hwui/DisplayListRenderer.cpp

+30 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ const char* DisplayList::OP_NAMES[] = { 
    "DrawBitmap",

    "DrawBitmapMatrix",

    "DrawBitmapRect",

    "DrawBitmapMesh",

    "DrawPatch",

    "DrawColor",

    "DrawRect",
@@ -308,6 +309,19 @@ void DisplayList::replay(OpenGLRenderer& renderer, uint32_t level) { 
                        getFloat(), getFloat(), getFloat(), getFloat(), getPaint());

            }

            break;

            case DrawBitmapMesh: {

                int verticesCount = 0;

                uint32_t colorsCount = 0;



                SkBitmap* bitmap = getBitmap();

                uint32_t meshWidth = getInt();

                uint32_t meshHeight = getInt();

                float* vertices = getFloats(verticesCount);

                bool hasColors = getInt();

                int* colors = hasColors ? getInts(colorsCount) : NULL;



                renderer.drawBitmapMesh(bitmap, meshWidth, meshHeight, vertices, colors, getPaint());

            }

            case DrawPatch: {

                int32_t* xDivs = NULL;

                int32_t* yDivs = NULL;
@@ -587,6 +601,22 @@ void DisplayListRenderer::drawBitmap(SkBitmap* bitmap, float srcLeft, float srcT 
    addPaint(paint);

}



void DisplayListRenderer::drawBitmapMesh(SkBitmap* bitmap, int meshWidth, int meshHeight,

        float* vertices, int* colors, SkPaint* paint) {

    addOp(DisplayList::DrawBitmapMesh);

    addBitmap(bitmap);

    addInt(meshWidth);

    addInt(meshHeight);

    addFloats(vertices, (meshWidth + 1) * (meshHeight + 1) * 2);

    if (colors) {

        addInt(1);

        addInts(colors, (meshWidth + 1) * (meshHeight + 1));

    } else {

        addInt(0);

    }

    addPaint(paint);

}



void DisplayListRenderer::drawPatch(SkBitmap* bitmap, const int32_t* xDivs, const int32_t* yDivs,

        const uint32_t* colors, uint32_t width, uint32_t height, int8_t numColors,

        float left, float top, float right, float bottom, SkPaint* paint) {

libs/hwui/DisplayListRenderer.h

+3 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ public: 
        DrawBitmap,

        DrawBitmapMatrix,

        DrawBitmapRect,

        DrawBitmapMesh,

        DrawPatch,

        DrawColor,

        DrawRect,
@@ -267,6 +268,8 @@ public: 
    void drawBitmap(SkBitmap* bitmap, float srcLeft, float srcTop,

            float srcRight, float srcBottom, float dstLeft, float dstTop,

            float dstRight, float dstBottom, SkPaint* paint);

    void drawBitmapMesh(SkBitmap* bitmap, int meshWidth, int meshHeight,

            float* vertices, int* colors, SkPaint* paint);

    void drawPatch(SkBitmap* bitmap, const int32_t* xDivs, const int32_t* yDivs,

            const uint32_t* colors, uint32_t width, uint32_t height, int8_t numColors,

            float left, float top, float right, float bottom, SkPaint* paint);