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

Commit 78e0618d authored by Jason Sams's avatar Jason Sams Committed by Android (Google) Code Review
Browse files

Merge "Cleanup character limits."

parents 46ded12d bd184c55

graphics/java/android/renderscript/RenderScript.java

+4 −2
Original line number Diff line number Diff line
@@ -492,7 +492,8 @@ public class RenderScript { 
                                         boolean depthMask, boolean dither,

                                         int srcMode, int dstMode, int depthFunc) {

        validate();

        return rsnProgramStoreCreate(mContext, r, g, b, a, depthMask, dither, srcMode, dstMode, depthFunc);

        return rsnProgramStoreCreate(mContext, r, g, b, a, depthMask, dither, srcMode,

                                     dstMode, depthFunc);

    }



    native int  rsnProgramRasterCreate(int con, boolean pointSmooth, boolean lineSmooth,
@@ -500,7 +501,8 @@ public class RenderScript { 
    synchronized int nProgramRasterCreate(boolean pointSmooth, boolean lineSmooth,

                                          boolean pointSprite, float lineWidth, int cullMode) {

        validate();

        return rsnProgramRasterCreate(mContext, pointSmooth, lineSmooth, pointSprite, lineWidth, cullMode);

        return rsnProgramRasterCreate(mContext, pointSmooth, lineSmooth, pointSprite, lineWidth,

                                      cullMode);

    }



    native void rsnProgramBindConstants(int con, int pv, int slot, int mID);

libs/rs/rsFont.cpp

+2 −1
Original line number Diff line number Diff line
@@ -509,7 +509,8 @@ void FontState::initRenderState() { 


    ProgramStore *fontStore = new ProgramStore(mRSC, true, true, true, true,

                                               false, false,

                                               RS_BLEND_SRC_SRC_ALPHA, RS_BLEND_DST_ONE_MINUS_SRC_ALPHA,

                                               RS_BLEND_SRC_SRC_ALPHA,

                                               RS_BLEND_DST_ONE_MINUS_SRC_ALPHA,

                                               RS_DEPTH_FUNC_ALWAYS);

    mFontProgramStore.set(fontStore);

    mFontProgramStore->init();