diff options
| author | Stephen Hines <srhines@google.com> | 2013-05-06 18:18:57 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2013-05-06 18:18:57 -0700 |
| commit | 0e1207e03dcdf3d19b5560ddca5defa4ee87801b (patch) | |
| tree | 7abc069a1aa0754f302a98af5c6644124b8621d3 /tests/RenderScriptTests/Fountain | |
| parent | 9cbe2ae3aeb9a73c866bfd96b34f2d8ce895ab6b (diff) | |
| download | frameworks_base-0e1207e03dcdf3d19b5560ddca5defa4ee87801b.zip frameworks_base-0e1207e03dcdf3d19b5560ddca5defa4ee87801b.tar.gz frameworks_base-0e1207e03dcdf3d19b5560ddca5defa4ee87801b.tar.bz2 | |
Switch Fountain(Fbo) to use RSSurfaceView instead of RSTextureView.
Change-Id: Ifb036e83d76270075de1e7de3b67bb00c645bff2
Diffstat (limited to 'tests/RenderScriptTests/Fountain')
| -rw-r--r-- | tests/RenderScriptTests/Fountain/src/com/example/android/rs/fountain/FountainView.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tests/RenderScriptTests/Fountain/src/com/example/android/rs/fountain/FountainView.java b/tests/RenderScriptTests/Fountain/src/com/example/android/rs/fountain/FountainView.java index ba09421..98cec55 100644 --- a/tests/RenderScriptTests/Fountain/src/com/example/android/rs/fountain/FountainView.java +++ b/tests/RenderScriptTests/Fountain/src/com/example/android/rs/fountain/FountainView.java @@ -20,7 +20,7 @@ import java.io.Writer; import java.util.ArrayList; import java.util.concurrent.Semaphore; -import android.renderscript.RSTextureView; +import android.renderscript.RSSurfaceView; import android.renderscript.RenderScript; import android.renderscript.RenderScriptGL; @@ -39,7 +39,7 @@ import android.view.SurfaceView; import android.view.KeyEvent; import android.view.MotionEvent; -public class FountainView extends RSTextureView { +public class FountainView extends RSSurfaceView { public FountainView(Context context) { super(context); @@ -49,13 +49,12 @@ public class FountainView extends RSTextureView { private RenderScriptGL mRS; private FountainRS mRender; - @Override - protected void onAttachedToWindow() { - super.onAttachedToWindow(); - android.util.Log.e("rs", "onAttachedToWindow"); + public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) { + super.surfaceChanged(holder, format, w, h); if (mRS == null) { RenderScriptGL.SurfaceConfig sc = new RenderScriptGL.SurfaceConfig(); mRS = createRenderScriptGL(sc); + mRS.setSurface(holder, w, h); mRender = new FountainRS(); mRender.init(mRS, getResources()); } @@ -63,8 +62,6 @@ public class FountainView extends RSTextureView { @Override protected void onDetachedFromWindow() { - super.onDetachedFromWindow(); - android.util.Log.e("rs", "onDetachedFromWindow"); if (mRS != null) { mRS = null; destroyRenderScriptGL(); |
