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

Commit d2be84ff authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Delete unused args"

parents adae4b4c ab1080c4

core/java/android/view/ThreadedRenderer.java

+2 −2
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ public final class ThreadedRenderer { 
        }



        mRootNode.setLeftTopRightBottom(-mInsetLeft, -mInsetTop, mSurfaceWidth, mSurfaceHeight);

        nSetup(mNativeProxy, mSurfaceWidth, mSurfaceHeight, mLightRadius,

        nSetup(mNativeProxy, mLightRadius,

                mAmbientShadowAlpha, mSpotShadowAlpha);



        setLightCenter(attachInfo);
@@ -991,7 +991,7 @@ public final class ThreadedRenderer { 
    private static native void nUpdateSurface(long nativeProxy, Surface window);

    private static native boolean nPauseSurface(long nativeProxy, Surface window);

    private static native void nSetStopped(long nativeProxy, boolean stopped);

    private static native void nSetup(long nativeProxy, int width, int height,

    private static native void nSetup(long nativeProxy,

            float lightRadius, int ambientShadowAlpha, int spotShadowAlpha);

    private static native void nSetLightCenter(long nativeProxy,

            float lightX, float lightY, float lightZ);

core/jni/android_view_Surface.cpp

+2 −2
Original line number Diff line number Diff line
@@ -507,8 +507,8 @@ static jlong create(JNIEnv* env, jclass clazz, jlong rootNodePtr, jlong surfaceP 
    proxy->setSwapBehavior(kSwap_discardBuffer);

    proxy->initialize(surface);

    // Shadows can't be used via this interface, so just set the light source

    // to all 0s. (and width & height are unused, TODO remove them)

    proxy->setup(0, 0, 0, 0, 0);

    // to all 0s.

    proxy->setup(0, 0, 0);

    proxy->setLightCenter((Vector3){0, 0, 0});

    return (jlong) proxy;

}

core/jni/android_view_ThreadedRenderer.cpp

+3 −3
Original line number Diff line number Diff line
@@ -610,9 +610,9 @@ static void android_view_ThreadedRenderer_setStopped(JNIEnv* env, jobject clazz, 
}



static void android_view_ThreadedRenderer_setup(JNIEnv* env, jobject clazz, jlong proxyPtr,

        jint width, jint height, jfloat lightRadius, jint ambientShadowAlpha, jint spotShadowAlpha) {

        jfloat lightRadius, jint ambientShadowAlpha, jint spotShadowAlpha) {

    RenderProxy* proxy = reinterpret_cast<RenderProxy*>(proxyPtr);

    proxy->setup(width, height, lightRadius, ambientShadowAlpha, spotShadowAlpha);

    proxy->setup(lightRadius, ambientShadowAlpha, spotShadowAlpha);

}



static void android_view_ThreadedRenderer_setLightCenter(JNIEnv* env, jobject clazz,
@@ -866,7 +866,7 @@ static const JNINativeMethod gMethods[] = { 
    { "nUpdateSurface", "(JLandroid/view/Surface;)V", (void*) android_view_ThreadedRenderer_updateSurface },

    { "nPauseSurface", "(JLandroid/view/Surface;)Z", (void*) android_view_ThreadedRenderer_pauseSurface },

    { "nSetStopped", "(JZ)V", (void*) android_view_ThreadedRenderer_setStopped },

    { "nSetup", "(JIIFII)V", (void*) android_view_ThreadedRenderer_setup },

    { "nSetup", "(JFII)V", (void*) android_view_ThreadedRenderer_setup },

    { "nSetLightCenter", "(JFFF)V", (void*) android_view_ThreadedRenderer_setLightCenter },

    { "nSetOpaque", "(JZ)V", (void*) android_view_ThreadedRenderer_setOpaque },

    { "nSyncAndDrawFrame", "(J[JI)I", (void*) android_view_ThreadedRenderer_syncAndDrawFrame },

libs/hwui/renderthread/CanvasContext.cpp

+1 −2
Original line number Diff line number Diff line
@@ -155,8 +155,7 @@ void CanvasContext::setStopped(bool stopped) { 
    }

}



// TODO: don't pass viewport size, it's automatic via EGL

void CanvasContext::setup(int width, int height, float lightRadius,

void CanvasContext::setup(float lightRadius,

        uint8_t ambientShadowAlpha, uint8_t spotShadowAlpha) {

#if HWUI_NEW_OPS

    mLightGeometry.radius = lightRadius;

libs/hwui/renderthread/CanvasContext.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public: 
    void setStopped(bool stopped);

    bool hasSurface() { return mNativeSurface.get(); }



    void setup(int width, int height, float lightRadius,

    void setup(float lightRadius,

            uint8_t ambientShadowAlpha, uint8_t spotShadowAlpha);

    void setLightCenter(const Vector3& lightCenter);

    void setOpaque(bool opaque);