summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/glrenderer/GLES11Canvas.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/gallery3d/glrenderer/GLES11Canvas.java')
-rw-r--r--src/com/android/gallery3d/glrenderer/GLES11Canvas.java23
1 files changed, 0 insertions, 23 deletions
diff --git a/src/com/android/gallery3d/glrenderer/GLES11Canvas.java b/src/com/android/gallery3d/glrenderer/GLES11Canvas.java
index a4ffa2a2c..efb9d80b9 100644
--- a/src/com/android/gallery3d/glrenderer/GLES11Canvas.java
+++ b/src/com/android/gallery3d/glrenderer/GLES11Canvas.java
@@ -86,7 +86,6 @@ public class GLES11Canvas implements GLCanvas {
private static float[] sCropRect = new float[4];
private RawTexture mTargetTexture;
- private Blending mBlending = Blending.Mix;
// Drawing statistics
int mCountDrawLine;
@@ -775,12 +774,6 @@ public class GLES11Canvas implements GLCanvas {
config.mAlpha = -1;
}
- if ((saveFlags & SAVE_FLAG_BLEND) != 0) {
- config.mBlending = mBlending;
- } else {
- config.mBlending = null;
- }
-
if ((saveFlags & SAVE_FLAG_MATRIX) != 0) {
System.arraycopy(mMatrixValues, 0, config.mMatrix, 0, 16);
} else {
@@ -815,7 +808,6 @@ public class GLES11Canvas implements GLCanvas {
private static class ConfigState {
float mAlpha;
float mMatrix[] = new float[16];
- Blending mBlending;
ConfigState mNextFree;
public void restore(GLES11Canvas canvas) {
@@ -823,9 +815,6 @@ public class GLES11Canvas implements GLCanvas {
if (mMatrix[0] != Float.NEGATIVE_INFINITY) {
System.arraycopy(mMatrix, 0, canvas.mMatrixValues, 0, 16);
}
- if (mBlending != null) {
- canvas.setBlending(mBlending);
- }
}
}
@@ -993,18 +982,6 @@ public class GLES11Canvas implements GLCanvas {
}
@Override
- public void setBlending(Blending blending) {
- if (mBlending == blending) {
- return;
- }
- Assert.assertTrue(blending == Blending.Additive || blending == Blending.Mix);
- mBlending = blending;
- int srcFunc = GL11.GL_ONE;
- int dstFunc = (blending == Blending.Additive) ? GL11.GL_ONE : GL11.GL_ONE_MINUS_SRC_ALPHA;
- mGL.glBlendFunc(srcFunc, dstFunc);
- }
-
- @Override
public void enableStencil() {
mGL.glEnable(GL11.GL_STENCIL_TEST);
}