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

Commit 580807a2 authored by Stephen Hines's avatar Stephen Hines Committed by Android (Google) Code Review
Browse files

Merge "Handle RS reflection name changes."

parents 87263059 93a958f0

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

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ public class FountainRS { 


    private Resources mRes;

    private RenderScriptGL mRS;

    private ScriptC_Fountain mScript;

    private ScriptC_fountain mScript;

    public void init(RenderScriptGL rs, Resources res, int width, int height) {

        mRS = rs;

        mRes = res;
@@ -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, true);

        mScript.set_partMesh(sm);

        mScript.bind_point(points);

        mRS.contextBindRootScript(mScript);

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

+6 −6
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ public class ImageProcessingActivity extends Activity 
    private Bitmap mBitmapIn;

    private Bitmap mBitmapOut;

    private Bitmap mBitmapScratch;

    private ScriptC_Threshold mScript;

    private ScriptC_VerticalBlur mScriptVBlur;

    private ScriptC_HorizontalBlur mScriptHBlur;

    private ScriptC_threshold mScript;

    private ScriptC_vertical_blur mScriptVBlur;

    private ScriptC_horizontal_blur mScriptHBlur;

    private int mRadius = 0;

    private SeekBar mRadiusSeekBar;
@@ -380,10 +380,10 @@ public class ImageProcessingActivity extends Activity 
        mScratchPixelsAllocation1 = Allocation.createTyped(mRS, tb.create());

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



        mScriptVBlur = new ScriptC_VerticalBlur(mRS, getResources(), R.raw.verticalblur, false);

        mScriptHBlur = new ScriptC_HorizontalBlur(mRS, getResources(), R.raw.horizontalblur, false);

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

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



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

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

        mScript.set_width(mBitmapIn.getWidth());

        mScript.set_height(mBitmapIn.getHeight());

        mScript.set_radius(mRadius);

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

+4 −4
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ public class SceneGraphRS { 
    private Font mItalic;

    private Allocation mTextAlloc;



    private ScriptC_Scenegraph mScript;

    private ScriptC_Transform mTransformScript;

    private ScriptC_scenegraph mScript;

    private ScriptC_transform mTransformScript;



    int mLastX;

    int mLastY;
@@ -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, true);

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

        mTransformScript.set_transformScript(mTransformScript);



        mScript.set_gTransformRS(mTransformScript);

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

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public class SimpleModelRS { 
    private Font mItalic;

    private Allocation mTextAlloc;



    private ScriptC_Simplemodel mScript;

    private ScriptC_simplemodel mScript;



    int mLastX;

    int mLastY;
@@ -138,7 +138,7 @@ public class SimpleModelRS { 


    private void initRS() {



        mScript = new ScriptC_Simplemodel(mRS, mRes, R.raw.simplemodel, true);

        mScript = new ScriptC_simplemodel(mRS, mRes, R.raw.simplemodel, true);



        initPFS();

        initPF();

libs/rs/java/Samples/src/com/android/samples/RsListRS.java

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class RsListRS { 


    ScriptField_ListAllocs_s mListAllocs;



    private ScriptC_Rslist mScript;

    private ScriptC_rslist mScript;



    int mLastX;

    int mLastY;
@@ -121,7 +121,7 @@ public class RsListRS { 


    private void initRS() {



        mScript = new ScriptC_Rslist(mRS, mRes, R.raw.rslist, true);

        mScript = new ScriptC_rslist(mRS, mRes, R.raw.rslist, true);



        mListAllocs = new ScriptField_ListAllocs_s(mRS, DATA_LIST.length);

        for(int i = 0; i < DATA_LIST.length; i ++) {