Merge "Update ScriptC constructor to remove depricated param."
diff --git a/graphics/java/android/renderscript/ScriptC.java b/graphics/java/android/renderscript/ScriptC.java
index 73f42de..5215795 100644
--- a/graphics/java/android/renderscript/ScriptC.java
+++ b/graphics/java/android/renderscript/ScriptC.java
@@ -33,11 +33,11 @@
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);
}
diff --git a/libs/rs/java/Balls/src/com/android/balls/BallsRS.java b/libs/rs/java/Balls/src/com/android/balls/BallsRS.java
index f76a011..9c845aa 100644
--- a/libs/rs/java/Balls/src/com/android/balls/BallsRS.java
+++ b/libs/rs/java/Balls/src/com/android/balls/BallsRS.java
@@ -107,9 +107,9 @@
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);
diff --git a/libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java b/libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java
index 0b26cfd..eb46e950 100644
--- a/libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java
+++ b/libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java
@@ -45,7 +45,7 @@
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);
diff --git a/libs/rs/java/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java b/libs/rs/java/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java
index e806969..16f404f 100644
--- a/libs/rs/java/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java
+++ b/libs/rs/java/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java
@@ -380,10 +380,10 @@
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);
diff --git a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java
index 81bd578..1531d09 100644
--- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java
+++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java
@@ -172,8 +172,8 @@
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);
diff --git a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java
index ccbecd8..edf40e9 100644
--- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java
+++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java
@@ -138,7 +138,7 @@
private void initRS() {
- mScript = new ScriptC_simplemodel(mRS, mRes, R.raw.simplemodel, true);
+ mScript = new ScriptC_simplemodel(mRS, mRes, R.raw.simplemodel);
initPFS();
initPF();
diff --git a/libs/rs/java/Samples/src/com/android/samples/RsListRS.java b/libs/rs/java/Samples/src/com/android/samples/RsListRS.java
index aaeea876..ce9ab01 100644
--- a/libs/rs/java/Samples/src/com/android/samples/RsListRS.java
+++ b/libs/rs/java/Samples/src/com/android/samples/RsListRS.java
@@ -121,7 +121,7 @@
private void initRS() {
- mScript = new ScriptC_rslist(mRS, mRes, R.raw.rslist, true);
+ mScript = new ScriptC_rslist(mRS, mRes, R.raw.rslist);
mListAllocs = new ScriptField_ListAllocs_s(mRS, DATA_LIST.length);
for(int i = 0; i < DATA_LIST.length; i ++) {
diff --git a/libs/rs/java/Samples/src/com/android/samples/RsRenderStatesRS.java b/libs/rs/java/Samples/src/com/android/samples/RsRenderStatesRS.java
index 0990da3..85c2557 100644
--- a/libs/rs/java/Samples/src/com/android/samples/RsRenderStatesRS.java
+++ b/libs/rs/java/Samples/src/com/android/samples/RsRenderStatesRS.java
@@ -332,7 +332,7 @@
private void initRS() {
- mScript = new ScriptC_rsrenderstates(mRS, mRes, R.raw.rsrenderstates, true);
+ mScript = new ScriptC_rsrenderstates(mRS, mRes, R.raw.rsrenderstates);
initSamplers();
initProgramStore();
diff --git a/libs/rs/java/tests/src/com/android/rs/test/RSTestCore.java b/libs/rs/java/tests/src/com/android/rs/test/RSTestCore.java
index acce886..8054779 100644
--- a/libs/rs/java/tests/src/com/android/rs/test/RSTestCore.java
+++ b/libs/rs/java/tests/src/com/android/rs/test/RSTestCore.java
@@ -57,7 +57,7 @@
mHeight = height;
stopTesting = false;
- mScript = new ScriptC_rslist(mRS, mRes, R.raw.rslist, true);
+ mScript = new ScriptC_rslist(mRS, mRes, R.raw.rslist);
unitTests = new ArrayList<UnitTest>();
diff --git a/libs/rs/java/tests/src/com/android/rs/test/UT_fp_mad.java b/libs/rs/java/tests/src/com/android/rs/test/UT_fp_mad.java
index 9d57e90..e2cff00 100644
--- a/libs/rs/java/tests/src/com/android/rs/test/UT_fp_mad.java
+++ b/libs/rs/java/tests/src/com/android/rs/test/UT_fp_mad.java
@@ -29,7 +29,7 @@
public void run() {
RenderScript pRS = RenderScript.create();
- ScriptC_fp_mad s = new ScriptC_fp_mad(pRS, mRes, R.raw.fp_mad, true);
+ ScriptC_fp_mad s = new ScriptC_fp_mad(pRS, mRes, R.raw.fp_mad);
pRS.mMessageCallback = mRsMessage;
s.invoke_fp_mad_test(0, 0);
pRS.finish();
diff --git a/libs/rs/java/tests/src/com/android/rs/test/UT_primitives.java b/libs/rs/java/tests/src/com/android/rs/test/UT_primitives.java
index da995da..2da43fc 100644
--- a/libs/rs/java/tests/src/com/android/rs/test/UT_primitives.java
+++ b/libs/rs/java/tests/src/com/android/rs/test/UT_primitives.java
@@ -88,7 +88,7 @@
public void run() {
RenderScript pRS = RenderScript.create();
- ScriptC_primitives s = new ScriptC_primitives(pRS, mRes, R.raw.primitives, true);
+ ScriptC_primitives s = new ScriptC_primitives(pRS, mRes, R.raw.primitives);
pRS.mMessageCallback = mRsMessage;
if (!initializeGlobals(s)) {
// initializeGlobals failed
diff --git a/libs/rs/java/tests/src/com/android/rs/test/UT_rsdebug.java b/libs/rs/java/tests/src/com/android/rs/test/UT_rsdebug.java
index c555658..7ad77c7 100644
--- a/libs/rs/java/tests/src/com/android/rs/test/UT_rsdebug.java
+++ b/libs/rs/java/tests/src/com/android/rs/test/UT_rsdebug.java
@@ -29,7 +29,7 @@
public void run() {
RenderScript pRS = RenderScript.create();
- ScriptC_rsdebug s = new ScriptC_rsdebug(pRS, mRes, R.raw.rsdebug, true);
+ ScriptC_rsdebug s = new ScriptC_rsdebug(pRS, mRes, R.raw.rsdebug);
pRS.mMessageCallback = mRsMessage;
s.invoke_test_rsdebug(0, 0);
pRS.finish();