Update ScriptC constructor to remove depricated param.
Change-Id: Id36e325834526c6b5416fd78d5cf4259d7df97e9
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
initPFS();
|
||||
initPF();
|
||||
|
||||
@@ -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);
|
||||
|
||||
mListAllocs = new ScriptField_ListAllocs_s(mRS, DATA_LIST.length);
|
||||
for(int i = 0; i < DATA_LIST.length; i ++) {
|
||||
|
||||
@@ -332,7 +332,7 @@ public class RsRenderStatesRS {
|
||||
|
||||
private void initRS() {
|
||||
|
||||
mScript = new ScriptC_rsrenderstates(mRS, mRes, R.raw.rsrenderstates, true);
|
||||
mScript = new ScriptC_rsrenderstates(mRS, mRes, R.raw.rsrenderstates);
|
||||
|
||||
initSamplers();
|
||||
initProgramStore();
|
||||
|
||||
@@ -57,7 +57,7 @@ public class RSTestCore {
|
||||
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>();
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ public class UT_fp_mad extends UnitTest {
|
||||
|
||||
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();
|
||||
|
||||
@@ -88,7 +88,7 @@ public class UT_primitives extends UnitTest {
|
||||
|
||||
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
|
||||
|
||||
@@ -29,7 +29,7 @@ public class UT_rsdebug extends UnitTest {
|
||||
|
||||
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();
|
||||
|
||||
Reference in New Issue
Block a user