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

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

Merge "Don't clear the framebuffer when not needed."

parents 5ada6cb0 6b7bd246

core/java/android/view/GLES20Canvas.java

+2 −2
Original line number Diff line number Diff line
@@ -135,10 +135,10 @@ class GLES20Canvas extends HardwareCanvas { 


    @Override

    void onPreDraw() {

        nPrepare(mRenderer);

        nPrepare(mRenderer, mOpaque);

    }



    private native void nPrepare(int renderer);

    private native void nPrepare(int renderer, boolean opaque);



    @Override

    void onPostDraw() {

core/java/android/view/HardwareRenderer.java

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ public abstract class HardwareRenderer { 


        @Override

        GLES20Canvas createCanvas() {

            return mGlCanvas = new GLES20Canvas(true);

            return mGlCanvas = new GLES20Canvas(mTranslucent);

        }



        @Override

core/java/android/view/ViewRoot.java

+29 −20
Original line number Diff line number Diff line
@@ -16,25 +16,41 @@ 


package android.view;



import com.android.internal.view.BaseSurfaceHolder;

import com.android.internal.view.IInputMethodCallback;

import com.android.internal.view.IInputMethodSession;

import com.android.internal.view.RootViewSurfaceTaker;



import android.Manifest;

import android.app.ActivityManagerNative;

import android.content.ClipDescription;

import android.content.ComponentCallbacks;

import android.content.Context;

import android.content.pm.PackageManager;

import android.content.res.CompatibilityInfo;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.Canvas;

import android.graphics.PixelFormat;

import android.graphics.PorterDuff;

import android.graphics.Point;

import android.graphics.PointF;

import android.graphics.PorterDuff;

import android.graphics.Rect;

import android.graphics.Region;

import android.os.*;

import android.media.AudioManager;

import android.os.Binder;

import android.os.Bundle;

import android.os.Debug;

import android.os.Handler;

import android.os.LatencyTimer;

import android.os.Looper;

import android.os.Message;

import android.os.ParcelFileDescriptor;

import android.os.Process;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.util.AndroidRuntimeException;

import android.util.Config;

import android.util.DisplayMetrics;

import android.util.Log;

import android.util.EventLog;

import android.util.Log;

import android.util.Slog;

import android.util.SparseArray;

import android.view.View.MeasureSpec;
@@ -43,21 +59,14 @@ import android.view.accessibility.AccessibilityManager; 
import android.view.inputmethod.InputConnection;

import android.view.inputmethod.InputMethodManager;

import android.widget.Scroller;

import android.content.pm.PackageManager;

import android.content.res.CompatibilityInfo;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.content.ClipData;

import android.content.ClipDescription;

import android.content.ComponentCallbacks;

import android.content.Context;

import android.app.ActivityManagerNative;

import android.Manifest;

import android.media.AudioManager;

import com.android.internal.view.BaseSurfaceHolder;

import com.android.internal.view.IInputMethodCallback;

import com.android.internal.view.IInputMethodSession;

import com.android.internal.view.RootViewSurfaceTaker;



import java.lang.ref.WeakReference;

import java.io.IOException;

import java.io.OutputStream;

import java.lang.ref.WeakReference;

import java.util.ArrayList;



/**

core/jni/android_view_GLES20Canvas.cpp

+3 −3
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ static void android_view_GLES20Canvas_setViewport(JNIEnv* env, jobject canvas, 
}



static void android_view_GLES20Canvas_prepare(JNIEnv* env, jobject canvas,

        OpenGLRenderer* renderer) {

    renderer->prepare();

        OpenGLRenderer* renderer, jboolean opaque) {

    renderer->prepare(opaque);

}



static void android_view_GLES20Canvas_finish(JNIEnv* env, jobject canvas,
@@ -445,7 +445,7 @@ static JNINativeMethod gMethods[] = { 
    { "nCreateRenderer",    "()I",             (void*) android_view_GLES20Canvas_createRenderer },

    { "nDestroyRenderer",   "(I)V",            (void*) android_view_GLES20Canvas_destroyRenderer },

    { "nSetViewport",       "(III)V",          (void*) android_view_GLES20Canvas_setViewport },

    { "nPrepare",           "(I)V",            (void*) android_view_GLES20Canvas_prepare },

    { "nPrepare",           "(IZ)V",           (void*) android_view_GLES20Canvas_prepare },

    { "nFinish",            "(I)V",            (void*) android_view_GLES20Canvas_finish },

    { "nAcquireContext",    "(I)V",            (void*) android_view_GLES20Canvas_acquireContext },

    { "nReleaseContext",    "(I)V",            (void*) android_view_GLES20Canvas_releaseContext },

libs/hwui/DisplayListRenderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ void DisplayListRenderer::setViewport(int width, int height) { 
    mHeight = height;

}



void DisplayListRenderer::prepare() {

void DisplayListRenderer::prepare(bool opaque) {

    mSnapshot = new Snapshot(mFirstSnapshot,

            SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);

    mSaveCount = 1;