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

Commit 0a7d9cb0 authored by Jeykumar Sankaran's avatar Jeykumar Sankaran Committed by Steve Kondik
Browse files

frameworks/base: Call setDirtyRect to update dirty rectangle 

This change updates dirty rectangle instead of dirty region of a
surface.

Change-Id: Ic5c6e68ff644911a596a2432fd14868edbff9b17
parent 12b7ae1f

core/java/android/view/HardwareRenderer.java

+1 −1
Original line number Diff line number Diff line
@@ -1467,7 +1467,7 @@ public abstract class HardwareRenderer { 
                        // and also its better to check the surface

                        // validity to avoid any crash.

                        if(mSurface.isValid() && dirty != null) {

                                mSurface.setDirtyRegion(dirty);

                                mSurface.setDirtyRect(dirty);

                        }

                        saveCount = canvas.save();

                        callbacks.onHardwarePreDraw(canvas);

core/java/android/view/Surface.java

+3 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ public class Surface implements Parcelable { 
    private static native boolean nativeIsConsumerRunningBehind(int nativeObject);

    private static native int nativeReadFromParcel(int nativeObject, Parcel source);

    private static native void nativeWriteToParcel(int nativeObject, Parcel dest);

    private static native void nativeSetDirtyRegion(int nativeObject, Rect dirty);

    private static native void nativeSetDirtyRect(int nativeObject, Rect dirty);



    public static final Parcelable.Creator<Surface> CREATOR =

            new Parcelable.Creator<Surface>() {
@@ -153,9 +153,9 @@ public class Surface implements Parcelable { 
     * Set dirty region passed from HW renderer.

     * @hide

     */

    public void setDirtyRegion(Rect dirty) {

    public void setDirtyRect(Rect dirty) {

        if (mNativeObject != 0) {

            nativeSetDirtyRegion(mNativeObject,dirty);

            nativeSetDirtyRect(mNativeObject,dirty);

        }

    }

core/jni/android_view_Surface.cpp

+11 −19
Original line number Diff line number Diff line
@@ -188,9 +188,10 @@ static inline SkBitmap::Config convertPixelFormat(PixelFormat format) { 
    }

}



static void nativeSetDirtyRegion(JNIEnv* env, jclass clazz,

static void nativeSetDirtyRect(JNIEnv* env, jclass clazz,

        jint nativeObject, jobject dirtyRect) {



#ifdef QCOM_BSP

    sp<Surface> surface(reinterpret_cast<Surface *>(nativeObject));



    if (!isSurfaceValid(surface)) {
@@ -198,23 +199,14 @@ static void nativeSetDirtyRegion(JNIEnv* env, jclass clazz, 
        return;

    }



    // get dirty region

    Region dirtyRegion;

    Rect dirty;

    Rect rect;

    rect.left = env->GetIntField(dirtyRect, gRectClassInfo.left);

    rect.top = env->GetIntField(dirtyRect, gRectClassInfo.top);

    rect.right = env->GetIntField(dirtyRect, gRectClassInfo.right);

    rect.bottom = env->GetIntField(dirtyRect, gRectClassInfo.bottom);



    dirty.left = env->GetIntField(dirtyRect, gRectClassInfo.left);

    dirty.top = env->GetIntField(dirtyRect, gRectClassInfo.top);

    dirty.right = env->GetIntField(dirtyRect, gRectClassInfo.right);

    dirty.bottom = env->GetIntField(dirtyRect, gRectClassInfo.bottom);



    if (!dirty.isEmpty()) {

       dirtyRegion.set(dirty);

    }



    status_t err = surface->setDirtyRegion(&dirtyRegion);

    if (err < 0) {

        doThrowIAE(env);

    }

    surface->setDirtyRect(&rect);

#endif

}



static inline void swapCanvasPtr(JNIEnv* env, jobject canvasObj, SkCanvas* newCanvas) {
@@ -398,8 +390,8 @@ static JNINativeMethod gSurfaceMethods[] = { 
            (void*)nativeReadFromParcel },

    {"nativeWriteToParcel", "(ILandroid/os/Parcel;)V",

            (void*)nativeWriteToParcel },

    {"nativeSetDirtyRegion", "(ILandroid/graphics/Rect;)V",

           (void*)nativeSetDirtyRegion },

    {"nativeSetDirtyRect", "(ILandroid/graphics/Rect;)V",

           (void*)nativeSetDirtyRect },

};



int register_android_view_Surface(JNIEnv* env)