am 5a571291: am 0c0d7d25: am 18e1486a: Remove surface from rs init and handle surfaceChanged correctly.

Merge commit '5a571291d38723cc4789bd864b24aa7009b642e6'

* commit '5a571291d38723cc4789bd864b24aa7009b642e6':
  Remove surface from rs init and handle surfaceChanged correctly.
This commit is contained in:
Jason Sams
2009-11-12 23:20:39 -08:00
committed by Android Git Automerger

View File

@@ -72,6 +72,9 @@ public abstract class RenderScriptWallpaper<T extends RenderScriptScene> extends
@Override @Override
public void onSurfaceChanged(SurfaceHolder holder, int format, int width, int height) { public void onSurfaceChanged(SurfaceHolder holder, int format, int width, int height) {
super.onSurfaceChanged(holder, format, width, height); super.onSurfaceChanged(holder, format, width, height);
if (mRs != null) {
mRs.contextSetSurface(width, height, holder.getSurface());
}
if (mRenderer == null) { if (mRenderer == null) {
mRenderer = createScene(width, height); mRenderer = createScene(width, height);
mRenderer.init(mRs, getResources(), isPreview()); mRenderer.init(mRs, getResources(), isPreview());
@@ -95,7 +98,7 @@ public abstract class RenderScriptWallpaper<T extends RenderScriptScene> extends
while (surface == null) { while (surface == null) {
surface = holder.getSurface(); surface = holder.getSurface();
} }
mRs = new RenderScript(surface, false, false); mRs = new RenderScript(false, false);
} }
@Override @Override