diff options
Diffstat (limited to 'libs/rs/java')
5 files changed, 10 insertions, 9 deletions
diff --git a/libs/rs/java/Film/src/com/android/film/FilmRS.java b/libs/rs/java/Film/src/com/android/film/FilmRS.java index b80e619..7d04502 100644 --- a/libs/rs/java/Film/src/com/android/film/FilmRS.java +++ b/libs/rs/java/Film/src/com/android/film/FilmRS.java @@ -40,7 +40,7 @@ public class FilmRS { public FilmRS() { } - public void init(RenderScript rs, Resources res, int width, int height) { + public void init(RenderScriptGL rs, Resources res, int width, int height) { mRS = rs; mRes = res; initRS(); @@ -65,7 +65,7 @@ public class FilmRS { private Resources mRes; - private RenderScript mRS; + private RenderScriptGL mRS; private Script mScriptStrip; private Script mScriptImage; private Sampler mSampler; diff --git a/libs/rs/java/Film/src/com/android/film/FilmView.java b/libs/rs/java/Film/src/com/android/film/FilmView.java index 4a201fd..5bc2811 100644 --- a/libs/rs/java/Film/src/com/android/film/FilmView.java +++ b/libs/rs/java/Film/src/com/android/film/FilmView.java @@ -22,6 +22,7 @@ import java.util.concurrent.Semaphore; import android.renderscript.RSSurfaceView; import android.renderscript.RenderScript; +import android.renderscript.RenderScriptGL; import android.content.Context; import android.content.res.Resources; @@ -45,7 +46,7 @@ public class FilmView extends RSSurfaceView { //setFocusable(true); } - private RenderScript mRS; + private RenderScriptGL mRS; private FilmRS mRender; 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 71f95a7..9356579 100644 --- a/libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java +++ b/libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java @@ -37,7 +37,7 @@ public class FountainRS { public FountainRS() { } - public void init(RenderScript rs, Resources res, int width, int height) { + public void init(RenderScriptGL rs, Resources res, int width, int height) { mRS = rs; mRes = res; initRS(); @@ -65,7 +65,7 @@ public class FountainRS { private Resources mRes; - private RenderScript mRS; + private RenderScriptGL mRS; private Allocation mIntAlloc; private SimpleMesh mSM; private SomeData mSD; diff --git a/libs/rs/java/Fountain/src/com/android/fountain/FountainView.java b/libs/rs/java/Fountain/src/com/android/fountain/FountainView.java index fcb93f4..dfd6a49 100644 --- a/libs/rs/java/Fountain/src/com/android/fountain/FountainView.java +++ b/libs/rs/java/Fountain/src/com/android/fountain/FountainView.java @@ -22,6 +22,7 @@ import java.util.concurrent.Semaphore; import android.renderscript.RSSurfaceView; import android.renderscript.RenderScript; +import android.renderscript.RenderScriptGL; import android.content.Context; import android.content.res.Resources; @@ -45,7 +46,7 @@ public class FountainView extends RSSurfaceView { //setFocusable(true); } - private RenderScript mRS; + private RenderScriptGL mRS; private FountainRS mRender; public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) { 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 0ca00b3..568d3ab 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 @@ -126,14 +126,13 @@ public class ImageProcessingActivity extends Activity implements SurfaceHolder.C } public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { - mRS.contextSetSurface(width, height, holder.getSurface()); } public void surfaceDestroyed(SurfaceHolder holder) { } private Script.Invokable createScript() { - mRS = new RenderScript(false, false); + mRS = RenderScript.create(); mRS.mMessageCallback = new FilterCallback(); mParamsType = Type.createFromClass(mRS, Params.class, 1, "Parameters"); @@ -164,7 +163,7 @@ public class ImageProcessingActivity extends Activity implements SurfaceHolder.C sb.setType(true, 2); Script.Invokable invokable = sb.addInvokable("main"); sb.setScript(getResources(), R.raw.threshold); - sb.setRoot(true); + //sb.setRoot(true); ScriptC script = sb.create(); script.bindAllocation(mParamsAllocation, 0); |