Merge "Removing some unused code in GLCanvas" into ub-launcher3-master (1666e957) · Commits · e / os / android_packages_apps_Trebuchet

WallpaperPicker/src/com/android/gallery3d/glrenderer/BasicTexture.java

+0 −35

Original line number	Diff line number	Diff line
		@@ -46,8 +46,6 @@ public abstract class BasicTexture implements Texture {
		protected int mTextureWidth;
		protected int mTextureHeight;

		private boolean mHasBorder;

		protected GLCanvas mCanvasRef = null;
		private static WeakHashMap<BasicTexture, Object> sAllTextures
		= new WeakHashMap<BasicTexture, Object>();
		@@ -85,10 +83,6 @@ public abstract class BasicTexture implements Texture {
		}
		}

		public boolean isFlippedVertically() {
		return false;
		}

		public int getId() {
		return mId;
		}
		@@ -113,25 +107,6 @@ public abstract class BasicTexture implements Texture {
		return mTextureHeight;
		}

		// Returns true if the texture has one pixel transparent border around the
		// actual content. This is used to avoid jigged edges.
		//
		// The jigged edges appear because we use GL_CLAMP_TO_EDGE for texture wrap
		// mode (GL_CLAMP is not available in OpenGL ES), so a pixel partially
		// covered by the texture will use the color of the edge texel. If we add
		// the transparent border, the color of the edge texel will be mixed with
		// appropriate amount of transparent.
		//
		// Currently our background is black, so we can draw the thumbnails without
		// enabling blending.
		public boolean hasBorder() {
		return mHasBorder;
		}

		protected void setBorder(boolean hasBorder) {
		mHasBorder = hasBorder;
		}

		@Override
		public void draw(GLCanvas canvas, int x, int y) {
		canvas.drawTexture(this, x, y, getWidth(), getHeight());
		@@ -146,9 +121,6 @@ public abstract class BasicTexture implements Texture {
		// It should make sure the data is uploaded to GL memory.
		abstract protected boolean onBind(GLCanvas canvas);

		// Returns the GL texture target for this texture (e.g. GL_TEXTURE_2D).
		abstract protected int getTarget();

		public boolean isLoaded() {
		return mState == STATE_LOADED;
		}
		@@ -185,13 +157,6 @@ public abstract class BasicTexture implements Texture {
		sInFinalizer.set(null);
		}

		// This is for deciding if we can call Bitmap's recycle().
		// We cannot call Bitmap's recycle() in finalizer because at that point
		// the finalizer of Bitmap may already be called so recycle() will crash.
		public static boolean inFinalizer() {
		return sInFinalizer.get() != null;
		}

		public static void yieldAllTextures() {
		synchronized (sAllTextures) {
		for (BasicTexture t : sAllTextures.keySet()) {

WallpaperPicker/src/com/android/gallery3d/glrenderer/BitmapTexture.java

+1 −5

Original line number	Diff line number	Diff line
		@@ -29,11 +29,7 @@ public class BitmapTexture extends UploadedTexture {
		protected Bitmap mContentBitmap;

		public BitmapTexture(Bitmap bitmap) {
		this(bitmap, false);
		}

		public BitmapTexture(Bitmap bitmap, boolean hasBorder) {
		super(hasBorder);
		super();
		Utils.assertTrue(bitmap != null && !bitmap.isRecycled());
		mContentBitmap = bitmap;
		}

WallpaperPicker/src/com/android/gallery3d/glrenderer/GLCanvas.java

+1 −93

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.gallery3d.glrenderer;

		import android.graphics.Bitmap;
		import android.graphics.Rect;
		import android.graphics.RectF;

		//
		@@ -40,36 +39,14 @@ public interface GLCanvas {
		// Clear the drawing buffers. This should only be used by GLRoot.
		public abstract void clearBuffer();

		public abstract void clearBuffer(float[] argb);

		// Sets and gets the current alpha, alpha must be in [0, 1].
		public abstract void setAlpha(float alpha);

		public abstract float getAlpha();

		// (current alpha) = (current alpha) * alpha
		public abstract void multiplyAlpha(float alpha);

		// Change the current transform matrix.
		public abstract void translate(float x, float y, float z);

		public abstract void translate(float x, float y);

		public abstract void scale(float sx, float sy, float sz);

		public abstract void rotate(float angle, float x, float y, float z);

		public abstract void multiplyMatrix(float[] mMatrix, int offset);

		// Pushes the configuration state (matrix, and alpha) onto
		// a private stack.
		public abstract void save();

		// Same as save(), but only save those specified in saveFlags.
		public abstract void save(int saveFlags);

		public static final int SAVE_FLAG_ALL = 0xFFFFFFFF;
		public static final int SAVE_FLAG_ALPHA = 0x01;
		public static final int SAVE_FLAG_MATRIX = 0x02;

		// Pops from the top of the stack as current configuration state (matrix,
		@@ -78,64 +55,22 @@ public interface GLCanvas {
		// last save call.
		public abstract void restore();

		// Draws a line using the specified paint from (x1, y1) to (x2, y2).
		// (Both end points are included).
		public abstract void drawLine(float x1, float y1, float x2, float y2, GLPaint paint);

		// Draws a rectangle using the specified paint from (x1, y1) to (x2, y2).
		// (Both end points are included).
		public abstract void drawRect(float x1, float y1, float x2, float y2, GLPaint paint);

		// Fills the specified rectangle with the specified color.
		public abstract void fillRect(float x, float y, float width, float height, int color);

		// Draws a texture to the specified rectangle.
		public abstract void drawTexture(
		BasicTexture texture, int x, int y, int width, int height);

		public abstract void drawMesh(BasicTexture tex, int x, int y, int xyBuffer,
		int uvBuffer, int indexBuffer, int indexCount);
		public abstract void drawTexture(BasicTexture texture, int x, int y, int width, int height);

		// Draws the source rectangle part of the texture to the target rectangle.
		public abstract void drawTexture(BasicTexture texture, RectF source, RectF target);

		// Draw a texture with a specified texture transform.
		public abstract void drawTexture(BasicTexture texture, float[] mTextureTransform,
		int x, int y, int w, int h);

		// Draw two textures to the specified rectangle. The actual texture used is
		// from * (1 - ratio) + to * ratio
		// The two textures must have the same size.
		public abstract void drawMixed(BasicTexture from, int toColor,
		float ratio, int x, int y, int w, int h);

		// Draw a region of a texture and a specified color to the specified
		// rectangle. The actual color used is from * (1 - ratio) + to * ratio.
		// The region of the texture is defined by parameter "src". The target
		// rectangle is specified by parameter "target".
		public abstract void drawMixed(BasicTexture from, int toColor,
		float ratio, RectF src, RectF target);

		// Unloads the specified texture from the canvas. The resource allocated
		// to draw the texture will be released. The specified texture will return
		// to the unloaded state. This function should be called only from
		// BasicTexture or its descendant
		public abstract boolean unloadTexture(BasicTexture texture);

		// Delete the specified buffer object, similar to unloadTexture.
		public abstract void deleteBuffer(int bufferId);

		// Delete the textures and buffers in GL side. This function should only be
		// called in the GL thread.
		public abstract void deleteRecycledResources();

		// Dump statistics information and clear the counters. For debug only.
		public abstract void dumpStatisticsAndClear();

		public abstract void beginRenderTarget(RawTexture texture);

		public abstract void endRenderTarget();

		/**
		* Sets texture parameters to use GL_CLAMP_TO_EDGE for both
		* GL_TEXTURE_WRAP_S and GL_TEXTURE_WRAP_T. Sets texture parameters to be
		@@ -185,31 +120,4 @@ public interface GLCanvas {
		* @return The buffer ID that was generated.
		*/
		public abstract int uploadBuffer(java.nio.FloatBuffer buffer);

		/**
		* Generates buffers and uploads the element array buffer data.
		*
		* @param buffer The buffer to upload
		* @return The buffer ID that was generated.
		*/
		public abstract int uploadBuffer(java.nio.ByteBuffer buffer);

		/**
		* After LightCycle makes GL calls, this method is called to restore the GL
		* configuration to the one expected by GLCanvas.
		*/
		public abstract void recoverFromLightCycle();

		/**
		* Gets the bounds given by x, y, width, and height as well as the internal
		* matrix state. There is no special handling for non-90-degree rotations.
		* It only considers the lower-left and upper-right corners as the bounds.
		*
		* @param bounds The output bounds to write to.
		* @param x The left side of the input rectangle.
		* @param y The bottom of the input rectangle.
		* @param width The width of the input rectangle.
		* @param height The height of the input rectangle.
		*/
		public abstract void getBounds(Rect bounds, int x, int y, int width, int height);
		}

WallpaperPicker/src/com/android/gallery3d/glrenderer/GLES20Canvas.java

+25 −512

File changed.

Preview size limit exceeded, changes collapsed.

WallpaperPicker/src/com/android/gallery3d/glrenderer/GLPaint.java

deleted100644 → 0

+0 −41

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.gallery3d.glrenderer;

		import com.android.gallery3d.common.Utils;

		public class GLPaint {
		private float mLineWidth = 1f;
		private int mColor = 0;

		public void setColor(int color) {
		mColor = color;
		}

		public int getColor() {
		return mColor;
		}

		public void setLineWidth(float width) {
		Utils.assertTrue(width >= 0);
		mLineWidth = width;
		}

		public float getLineWidth() {
		return mLineWidth;
		}
		}