diff options
| author | Jason Sams <rjsams@android.com> | 2010-10-10 17:58:25 -0700 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-10-10 17:58:25 -0700 |
| commit | 2222aa90031604e9752ebc2909303a84139b8b18 (patch) | |
| tree | 221332fe04b58b792d1c40cfca730948cf4ccca5 /libs/rs/java/ModelViewer | |
| parent | 7499a1ca68ba115efcf53f6a06520c579c44364d (diff) | |
| download | frameworks_base-2222aa90031604e9752ebc2909303a84139b8b18.zip frameworks_base-2222aa90031604e9752ebc2909303a84139b8b18.tar.gz frameworks_base-2222aa90031604e9752ebc2909303a84139b8b18.tar.bz2 | |
Cleanup error message for null binding address.
Only print the debug if script debugging is enabled.
Change-Id: I72b9c2a73d49987a73b354442e9defec02b93bc6
Implement inner utiliy class to specify surface formats.
Remove boxed bitmap upload functions.
Change-Id: I3ff5ca59e53d02b9d75277afa947ea3d218459eb
Diffstat (limited to 'libs/rs/java/ModelViewer')
4 files changed, 8 insertions, 4 deletions
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 b5592f0..81bd578 100644 --- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java +++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java @@ -128,7 +128,7 @@ public class SceneGraphRS { } private void loadImage() { - mGridImage = Allocation.createFromBitmapResourceBoxed(mRS, mRes, R.drawable.robot, Element.RGB_565(mRS), true); + mGridImage = Allocation.createFromBitmapResource(mRS, mRes, R.drawable.robot, Element.RGB_565(mRS), true); mGridImage.uploadToTexture(0); mScript.set_gTGrid(mGridImage); diff --git a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphView.java b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphView.java index 44a59b2..9457fd7 100644 --- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphView.java +++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphView.java @@ -53,7 +53,9 @@ public class SceneGraphView extends RSSurfaceView { public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) { super.surfaceChanged(holder, format, w, h); if (mRS == null) { - mRS = createRenderScript(true); + RenderScriptGL.SurfaceConfig sc = new RenderScriptGL.SurfaceConfig(); + sc.setDepth(16, 24); + mRS = createRenderScript(sc); mRS.contextSetSurface(w, h, holder.getSurface()); mRender = new SceneGraphRS(); mRender.init(mRS, getResources(), w, h); 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 afbf30b..ccbecd8 100644 --- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java +++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java @@ -124,7 +124,7 @@ public class SimpleModelRS { } private void loadImage() { - mGridImage = Allocation.createFromBitmapResourceBoxed(mRS, mRes, R.drawable.robot, Element.RGB_565(mRS), true); + mGridImage = Allocation.createFromBitmapResource(mRS, mRes, R.drawable.robot, Element.RGB_565(mRS), true); mGridImage.uploadToTexture(0); mScript.set_gTGrid(mGridImage); diff --git a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelView.java b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelView.java index 2574fdd..4253085 100644 --- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelView.java +++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelView.java @@ -53,7 +53,9 @@ public class SimpleModelView extends RSSurfaceView { public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) { super.surfaceChanged(holder, format, w, h); if (mRS == null) { - mRS = createRenderScript(true); + RenderScriptGL.SurfaceConfig sc = new RenderScriptGL.SurfaceConfig(); + sc.setDepth(16, 24); + mRS = createRenderScript(sc); mRS.contextSetSurface(w, h, holder.getSurface()); mRender = new SimpleModelRS(); mRender.init(mRS, getResources(), w, h); |