diff options
| author | George Mount <mount@google.com> | 2012-11-01 10:32:41 -0700 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2012-11-20 07:42:28 -0800 |
| commit | 0db6ec1a2d602a48437a48ae47fbca01299fdcea (patch) | |
| tree | f539a84f694f3379e2e6132e437c55237f2ed10e /src/com/android/gallery3d/ui/SlideshowView.java | |
| parent | 93b9c1e3b6fee10b3c61ed0dc57608fe32be3d64 (diff) | |
| download | android_packages_apps_Snap-0db6ec1a2d602a48437a48ae47fbca01299fdcea.tar.gz android_packages_apps_Snap-0db6ec1a2d602a48437a48ae47fbca01299fdcea.tar.bz2 android_packages_apps_Snap-0db6ec1a2d602a48437a48ae47fbca01299fdcea.zip | |
Separate GL calls into GLCanvas in preparation for adding GLES2.
Change-Id: I2756c14294a36af7905766ee650fa08fb95e9477
Diffstat (limited to 'src/com/android/gallery3d/ui/SlideshowView.java')
| -rw-r--r-- | src/com/android/gallery3d/ui/SlideshowView.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/ui/SlideshowView.java b/src/com/android/gallery3d/ui/SlideshowView.java index bb36c47e9..7734eb236 100644 --- a/src/com/android/gallery3d/ui/SlideshowView.java +++ b/src/com/android/gallery3d/ui/SlideshowView.java @@ -21,11 +21,10 @@ import android.graphics.PointF; import com.android.gallery3d.anim.CanvasAnimation; import com.android.gallery3d.anim.FloatAnimation; +import com.android.gallery3d.ui.GLCanvas.Blending; import java.util.Random; -import javax.microedition.khronos.opengles.GL11; - public class SlideshowView extends GLView { @SuppressWarnings("unused") private static final String TAG = "SlideshowView"; @@ -93,8 +92,8 @@ public class SlideshowView extends GLView { protected void render(GLCanvas canvas) { long animTime = AnimationTime.get(); boolean requestRender = mTransitionAnimation.calculate(animTime); - GL11 gl = canvas.getGLInstance(); - gl.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE); + canvas.save(GLCanvas.SAVE_FLAG_BLEND); + canvas.setBlending(Blending.Additive); float alpha = mPrevTexture == null ? 1f : mTransitionAnimation.get(); if (mPrevTexture != null && alpha != 1f) { @@ -118,7 +117,7 @@ public class SlideshowView extends GLView { canvas.restore(); } if (requestRender) invalidate(); - gl.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA); + canvas.restore(); } private class SlideshowAnimation extends CanvasAnimation { |