diff options
| author | Jason Sams <rjsams@android.com> | 2010-12-15 01:41:00 -0800 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-12-15 01:41:00 -0800 |
| commit | 6d8eb266dd398abf0511685fdaf98abba3396174 (patch) | |
| tree | 1dab5166d146562573c048806a337b24177d732e /libs/rs/java/ModelViewer | |
| parent | 7dddf275cd7aa3b44ebeea1e34346f0a31308649 (diff) | |
| download | frameworks_base-6d8eb266dd398abf0511685fdaf98abba3396174.zip frameworks_base-6d8eb266dd398abf0511685fdaf98abba3396174.tar.gz frameworks_base-6d8eb266dd398abf0511685fdaf98abba3396174.tar.bz2 | |
Fix mipmap bug introduced with Allocation cleanup.
Add syncAll to rsg headers.
Change-Id: I02c953f3fddab3c6f4e98570cdad45a59711bbde
Diffstat (limited to 'libs/rs/java/ModelViewer')
| -rw-r--r-- | libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java | 6 | ||||
| -rw-r--r-- | libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java | 6 |
2 files changed, 6 insertions, 6 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 f61cf25..6cb50b8 100644 --- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java +++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java @@ -128,9 +128,9 @@ public class SceneGraphRS { } private void loadImage() { - mGridImage = Allocation.createFromBitmapResource(mRS, mRes, R.drawable.robot, Element.RGB_565(mRS), true); - mGridImage.uploadToTexture(0); - + mGridImage = Allocation.createFromBitmapResource(mRS, mRes, R.drawable.robot, + Allocation.MipmapControl.MIPMAP_ON_SYNC_TO_TEXTURE, + Allocation.USAGE_GRAPHICS_TEXTURE); mScript.set_gTGrid(mGridImage); } 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 22b3fff..747463a 100644 --- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java +++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java @@ -124,9 +124,9 @@ public class SimpleModelRS { } private void loadImage() { - mGridImage = Allocation.createFromBitmapResource(mRS, mRes, R.drawable.robot, Element.RGB_565(mRS), true); - mGridImage.uploadToTexture(0); - + mGridImage = Allocation.createFromBitmapResource(mRS, mRes, R.drawable.robot, + Allocation.MipmapControl.MIPMAP_ON_SYNC_TO_TEXTURE, + Allocation.USAGE_GRAPHICS_TEXTURE); mScript.set_gTGrid(mGridImage); } |