summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-12-14 19:08:34 -0800
committerJason Sams <rjsams@android.com>2010-12-14 19:08:34 -0800
commit1316636ac28004152cffcb1c8795997c7a33765d (patch)
tree238a82582ba20a17ddb84edbd9e3bf940bead4e4
parent69f9d2200feba0b961cb89f1710ecd647befced3 (diff)
downloadandroid_packages_wallpapers_MagicSmoke-1316636ac28004152cffcb1c8795997c7a33765d.tar.gz
android_packages_wallpapers_MagicSmoke-1316636ac28004152cffcb1c8795997c7a33765d.tar.bz2
android_packages_wallpapers_MagicSmoke-1316636ac28004152cffcb1c8795997c7a33765d.zip
Update for Allocation changes
Change-Id: I664d96abc4e045962aebe156ac8c143ef474aeef
-rw-r--r--src/com/android/magicsmoke/MagicSmokeRS.java9
-rw-r--r--src/com/android/magicsmoke/clouds.rs2
2 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/magicsmoke/MagicSmokeRS.java b/src/com/android/magicsmoke/MagicSmokeRS.java
index eb06855..268771f 100644
--- a/src/com/android/magicsmoke/MagicSmokeRS.java
+++ b/src/com/android/magicsmoke/MagicSmokeRS.java
@@ -262,8 +262,13 @@ class MagicSmokeRS extends RenderScriptScene implements OnSharedPreferenceChange
int pixels[] = new int[65536];
in.getPixels(pixels, 0, 256, 0, 0, 256, 256);
- mRealTextures[index] = Allocation.createTyped(mRS, mTextureType);
- mSourceTextures[index] = Allocation.createTyped(mRS, mTextureType);
+ mRealTextures[index] = Allocation.createTyped(mRS, mTextureType,
+ Allocation.MipmapControl.MIPMAP_NONE,
+ Allocation.USAGE_SCRIPT |
+ Allocation.USAGE_GRAPHICS_TEXTURE);
+ mSourceTextures[index] = Allocation.createTyped(mRS, mTextureType,
+ Allocation.MipmapControl.MIPMAP_NONE,
+ Allocation.USAGE_SCRIPT);
mSourceTextures[index].copyFrom(pixels);
in.recycle();
}
diff --git a/src/com/android/magicsmoke/clouds.rs b/src/com/android/magicsmoke/clouds.rs
index a22e5c7..cc81e57 100644
--- a/src/com/android/magicsmoke/clouds.rs
+++ b/src/com/android/magicsmoke/clouds.rs
@@ -337,7 +337,7 @@ static void makeTexture(int *src, int *dst, rs_allocation rsid) {
}
}
- rsgUploadToTexture(rsid, 0);
+ rsgAllocationSyncAll(rsid);
}
static void makeTextures() {