summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-02-09 16:01:56 -0800
committerJason Sams <rjsams@android.com>2010-02-09 16:01:56 -0800
commit1cac273ca3dc02971458785fe4d6d27cfa3f613e (patch)
treee40351fa5b0a53068635796ecdd8b2de89c66181 /src
parente12a3ede680253bdff8dadf0e7e27f981e39705b (diff)
downloadandroid_packages_wallpapers_MagicSmoke-1cac273ca3dc02971458785fe4d6d27cfa3f613e.tar.gz
android_packages_wallpapers_MagicSmoke-1cac273ca3dc02971458785fe4d6d27cfa3f613e.tar.bz2
android_packages_wallpapers_MagicSmoke-1cac273ca3dc02971458785fe4d6d27cfa3f613e.zip
Convert to RenderScriptGL
Diffstat (limited to 'src')
-rw-r--r--src/com/android/magicsmoke/RenderScriptScene.java8
-rw-r--r--src/com/android/magicsmoke/RenderScriptWallpaper.java11
2 files changed, 10 insertions, 9 deletions
diff --git a/src/com/android/magicsmoke/RenderScriptScene.java b/src/com/android/magicsmoke/RenderScriptScene.java
index 446e01f..8a5e213 100644
--- a/src/com/android/magicsmoke/RenderScriptScene.java
+++ b/src/com/android/magicsmoke/RenderScriptScene.java
@@ -18,7 +18,7 @@
package com.android.magicsmoke;
import android.content.res.Resources;
-import android.renderscript.RenderScript;
+import android.renderscript.RenderScriptGL;
import android.renderscript.ScriptC;
import android.view.MotionEvent;
@@ -27,7 +27,7 @@ public abstract class RenderScriptScene {
protected int mHeight;
protected boolean mPreview;
protected Resources mResources;
- protected RenderScript mRS;
+ protected RenderScriptGL mRS;
protected ScriptC mScript;
public RenderScriptScene(int width, int height) {
@@ -35,7 +35,7 @@ public abstract class RenderScriptScene {
mHeight = height;
}
- public void init(RenderScript rs, Resources res, boolean isPreview) {
+ public void init(RenderScriptGL rs, Resources res, boolean isPreview) {
mRS = rs;
mResources = res;
mPreview = isPreview;
@@ -58,7 +58,7 @@ public abstract class RenderScriptScene {
return mResources;
}
- public RenderScript getRS() {
+ public RenderScriptGL getRS() {
return mRS;
}
diff --git a/src/com/android/magicsmoke/RenderScriptWallpaper.java b/src/com/android/magicsmoke/RenderScriptWallpaper.java
index 87c8729..1f24812 100644
--- a/src/com/android/magicsmoke/RenderScriptWallpaper.java
+++ b/src/com/android/magicsmoke/RenderScriptWallpaper.java
@@ -18,6 +18,7 @@
package com.android.magicsmoke;
import android.service.wallpaper.WallpaperService;
+import android.renderscript.RenderScriptGL;
import android.renderscript.RenderScript;
import android.util.Log;
import android.view.MotionEvent;
@@ -32,7 +33,7 @@ public abstract class RenderScriptWallpaper<T extends RenderScriptScene> extends
protected abstract T createScene(int width, int height);
private class RenderScriptEngine extends Engine {
- private RenderScript mRs;
+ private RenderScriptGL mRs;
private T mRenderer;
@Override
@@ -56,7 +57,7 @@ public abstract class RenderScriptWallpaper<T extends RenderScriptScene> extends
if (mRs != null) {
mRs.destroy();
mRs = null;
- }
+ }
}
@Override
@@ -64,7 +65,7 @@ public abstract class RenderScriptWallpaper<T extends RenderScriptScene> extends
super.onVisibilityChanged(visible);
if (mRenderer != null) {
if (visible) {
- mRenderer.start();
+ mRenderer.start();
} else {
mRenderer.stop();
}
@@ -90,7 +91,7 @@ public abstract class RenderScriptWallpaper<T extends RenderScriptScene> extends
public void onTouchEvent(MotionEvent event) {
mRenderer.onTouchEvent(event);
}
-
+
@Override
public void onOffsetsChanged(float xOffset, float yOffset,
float xStep, float yStep, int xPixels, int yPixels) {
@@ -105,7 +106,7 @@ public abstract class RenderScriptWallpaper<T extends RenderScriptScene> extends
while (surface == null) {
surface = holder.getSurface();
}
- mRs = new RenderScript(false, false);
+ mRs = new RenderScriptGL(false, false);
mRs.contextSetPriority(RenderScript.Priority.LOW);
}