diff options
Diffstat (limited to 'src/com/android/gallery3d/glrenderer')
-rw-r--r-- | src/com/android/gallery3d/glrenderer/GLCanvas.java | 31 | ||||
-rw-r--r-- | src/com/android/gallery3d/glrenderer/GLES11Canvas.java | 28 | ||||
-rw-r--r-- | src/com/android/gallery3d/glrenderer/GLES20Canvas.java | 27 |
3 files changed, 0 insertions, 86 deletions
diff --git a/src/com/android/gallery3d/glrenderer/GLCanvas.java b/src/com/android/gallery3d/glrenderer/GLCanvas.java index 941002e8d..305e90521 100644 --- a/src/com/android/gallery3d/glrenderer/GLCanvas.java +++ b/src/com/android/gallery3d/glrenderer/GLCanvas.java @@ -197,37 +197,6 @@ public interface GLCanvas { public abstract int uploadBuffer(java.nio.ByteBuffer buffer); /** - * Enable stencil test - */ - public abstract void enableStencil(); - - /** - * Disable stencil. - */ - public abstract void disableStencil(); - - /** - * Clears the stencil so that a new stencil can be generated. - */ - public abstract void clearStencilBuffer(); - - /** - * Start/stop updating the stencil buffer. - * - * @param update True if the stencil should be updated, false otherwise. - */ - public abstract void updateStencil(boolean update); - - /** - * Changes how the stencil buffer is used. - * - * @param onlyOutside If true, only the area outside the stencil can be - * changed. If false, the area inside the stencil can be drawn to - * as well. - */ - public abstract void drawOnlyOutsideStencil(boolean onlyOutside); - - /** * After LightCycle makes GL calls, this method is called to restore the GL * configuration to the one expected by GLCanvas. */ diff --git a/src/com/android/gallery3d/glrenderer/GLES11Canvas.java b/src/com/android/gallery3d/glrenderer/GLES11Canvas.java index efb9d80b9..7013c3d1f 100644 --- a/src/com/android/gallery3d/glrenderer/GLES11Canvas.java +++ b/src/com/android/gallery3d/glrenderer/GLES11Canvas.java @@ -612,7 +612,6 @@ public class GLES11Canvas implements GLCanvas { // Set the background color gl.glClearColor(0f, 0f, 0f, 0f); - gl.glClearStencil(0); gl.glEnable(GL11.GL_BLEND); gl.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -982,33 +981,6 @@ public class GLES11Canvas implements GLCanvas { } @Override - public void enableStencil() { - mGL.glEnable(GL11.GL_STENCIL_TEST); - } - - @Override - public void disableStencil() { - mGL.glDisable(GL11.GL_STENCIL_TEST); - } - - @Override - public void clearStencilBuffer() { - mGL.glClear(GL11.GL_STENCIL_BUFFER_BIT); - } - - @Override - public void updateStencil(boolean update) { - int passOp = update ? GL11.GL_REPLACE : GL11.GL_KEEP; - mGL.glStencilOp(GL11.GL_KEEP, GL11.GL_KEEP, passOp); - } - - @Override - public void drawOnlyOutsideStencil(boolean onlyOutside) { - int func = onlyOutside ? GL11.GL_NOTEQUAL : GL11.GL_ALWAYS; - mGL.glStencilFunc(func, 1, 1); - } - - @Override public void recoverFromLightCycle() { // This is only required for GLES20 } diff --git a/src/com/android/gallery3d/glrenderer/GLES20Canvas.java b/src/com/android/gallery3d/glrenderer/GLES20Canvas.java index 28b72ec3b..4ead1315e 100644 --- a/src/com/android/gallery3d/glrenderer/GLES20Canvas.java +++ b/src/com/android/gallery3d/glrenderer/GLES20Canvas.java @@ -960,33 +960,6 @@ public class GLES20Canvas implements GLCanvas { return bufferId; } - @Override - public void enableStencil() { - GLES20.glEnable(GLES20.GL_STENCIL_TEST); - } - - @Override - public void disableStencil() { - GLES20.glDisable(GLES20.GL_STENCIL_TEST); - } - - @Override - public void clearStencilBuffer() { - GLES20.glClear(GLES20.GL_STENCIL_BUFFER_BIT); - } - - @Override - public void updateStencil(boolean update) { - int passOp = update ? GLES20.GL_REPLACE : GLES20.GL_KEEP; - GLES20.glStencilOp(GLES20.GL_KEEP, GLES20.GL_KEEP, passOp); - } - - @Override - public void drawOnlyOutsideStencil(boolean onlyOutside) { - int func = onlyOutside ? GLES20.GL_NOTEQUAL : GLES20.GL_ALWAYS; - GLES20.glStencilFunc(func, 1, 1); - } - public static void checkError() { int error = GLES20.glGetError(); if (error != 0) { |