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

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

Merge "Update ScriptC constructor to remove depricated param."

parents f3e0268b 3ba02b3d

graphics/java/android/renderscript/ScriptC.java

+2 −2
Original line number Diff line number Diff line
@@ -33,11 +33,11 @@ import java.lang.reflect.Modifier; 
public class ScriptC extends Script {

    private static final String TAG = "ScriptC";



    ScriptC(int id, RenderScript rs) {

    protected ScriptC(int id, RenderScript rs) {

        super(id, rs);

    }



    protected ScriptC(RenderScript rs, Resources resources, int resourceID, boolean isRoot) {

    protected ScriptC(RenderScript rs, Resources resources, int resourceID) {

        super(0, rs);

        mID = internalCreate(rs, resources, resourceID);

    }

libs/rs/java/Balls/src/com/android/balls/BallsRS.java

+2 −2
Original line number Diff line number Diff line
@@ -107,9 +107,9 @@ public class BallsRS { 
        smb.addIndexType(Primitive.LINE);

        Mesh smA = smb.create();



        mPhysicsScript = new ScriptC_ball_physics(mRS, mRes, R.raw.ball_physics, true);

        mPhysicsScript = new ScriptC_ball_physics(mRS, mRes, R.raw.ball_physics);



        mScript = new ScriptC_balls(mRS, mRes, R.raw.balls, true);

        mScript = new ScriptC_balls(mRS, mRes, R.raw.balls);

        mScript.set_partMesh(smP);

        mScript.set_arcMesh(smA);

        mScript.set_physics_script(mPhysicsScript);

libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ public class FountainRS { 
        smb.addIndexType(Primitive.POINT);

        Mesh sm = smb.create();



        mScript = new ScriptC_fountain(mRS, mRes, R.raw.fountain, true);

        mScript = new ScriptC_fountain(mRS, mRes, R.raw.fountain);

        mScript.set_partMesh(sm);

        mScript.bind_point(points);

        mRS.contextBindRootScript(mScript);

libs/rs/java/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java

+3 −3
Original line number Diff line number Diff line
@@ -380,10 +380,10 @@ public class ImageProcessingActivity extends Activity 
        mScratchPixelsAllocation1 = Allocation.createTyped(mRS, tb.create());

        mScratchPixelsAllocation2 = Allocation.createTyped(mRS, tb.create());



        mScriptVBlur = new ScriptC_vertical_blur(mRS, getResources(), R.raw.vertical_blur, false);

        mScriptHBlur = new ScriptC_horizontal_blur(mRS, getResources(), R.raw.horizontal_blur, false);

        mScriptVBlur = new ScriptC_vertical_blur(mRS, getResources(), R.raw.vertical_blur);

        mScriptHBlur = new ScriptC_horizontal_blur(mRS, getResources(), R.raw.horizontal_blur);



        mScript = new ScriptC_threshold(mRS, getResources(), R.raw.threshold, false);

        mScript = new ScriptC_threshold(mRS, getResources(), R.raw.threshold);

        mScript.set_width(mBitmapIn.getWidth());

        mScript.set_height(mBitmapIn.getHeight());

        mScript.set_radius(mRadius);

libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java

+2 −2
Original line number Diff line number Diff line
@@ -172,8 +172,8 @@ public class SceneGraphRS { 


    private void initRS() {



        mScript = new ScriptC_scenegraph(mRS, mRes, R.raw.scenegraph, true);

        mTransformScript = new ScriptC_transform(mRS, mRes, R.raw.transform, false);

        mScript = new ScriptC_scenegraph(mRS, mRes, R.raw.scenegraph);

        mTransformScript = new ScriptC_transform(mRS, mRes, R.raw.transform);

        mTransformScript.set_transformScript(mTransformScript);



        mScript.set_gTransformRS(mTransformScript);