Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle RS reflection name changes."

Browse Source
This commit is contained in:
Stephen Hines
2010-09-17 13:55:39 -07:00
committed by Android (Google) Code Review
parent 8726305905 93a958f095
commit 580807a20a
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java
View File

@@ -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);

12
libs/rs/java/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java
View File

@@ -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);

8
libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java
View File

@@ -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);

4
libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java
View File

@@ -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();

4
libs/rs/java/Samples/src/com/android/samples/RsListRS.java
View File

@@ -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 ++) {

4
libs/rs/java/Samples/src/com/android/samples/RsRenderStatesRS.java
View File

@@ -92,7 +92,7 @@ public class RsRenderStatesRS {
private Allocation mTextAlloc;
private ScriptC_Rsrenderstates mScript;
private ScriptC_rsrenderstates mScript;
private final BitmapFactory.Options mOptionsARGB = new BitmapFactory.Options();
@@ -304,7 +304,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, true);
initSamplers();
initProgramStore();

6
libs/rs/java/tests/src/com/android/rs/test/RSTestCore.java
View File

@@ -30,10 +30,10 @@ public class RSTestCore {
private Resources mRes;
private RenderScriptGL mRS;
private ScriptC_TestRoot mRootScript;
private ScriptC_test_root mRootScript;
private boolean fp_mad() {
ScriptC_FpMad s = new ScriptC_FpMad(mRS, mRes, R.raw.fpmad, true);
ScriptC_fp_mad s = new ScriptC_fp_mad(mRS, mRes, R.raw.fp_mad, true);
s.invoke_doTest(0, 0);
return true;
}
@@ -43,7 +43,7 @@ public class RSTestCore {
mRS = rs;
mRes = res;
mRootScript = new ScriptC_TestRoot(mRS, mRes, R.raw.testroot, true);
mRootScript = new ScriptC_test_root(mRS, mRes, R.raw.test_root, true);
fp_mad();