Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base (91d1079d) · Commits · e / os / android_frameworks_base

opengl/java/android/opengl/GLUtils.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,9 @@ public final class GLUtils {
		if (bitmap == null) {
		throw new NullPointerException("getInternalFormat can't be used with a null Bitmap");
		}
		if (bitmap.isRecycled()) {
		throw new IllegalArgumentException("bitmap is recycled");
		}
		int result = native_getInternalFormat(bitmap);
		if (result < 0) {
		throw new IllegalArgumentException("Unknown internalformat");
		@@ -66,6 +69,9 @@ public final class GLUtils {
		if (bitmap == null) {
		throw new NullPointerException("getType can't be used with a null Bitmap");
		}
		if (bitmap.isRecycled()) {
		throw new IllegalArgumentException("bitmap is recycled");
		}
		int result = native_getType(bitmap);
		if (result < 0) {
		throw new IllegalArgumentException("Unknown type");
		@@ -100,6 +106,9 @@ public final class GLUtils {
		if (bitmap == null) {
		throw new NullPointerException("texImage2D can't be used with a null Bitmap");
		}
		if (bitmap.isRecycled()) {
		throw new IllegalArgumentException("bitmap is recycled");
		}
		if (native_texImage2D(target, level, internalformat, bitmap, -1, border)!=0) {
		throw new IllegalArgumentException("invalid Bitmap format");
		}
		@@ -123,6 +132,9 @@ public final class GLUtils {
		if (bitmap == null) {
		throw new NullPointerException("texImage2D can't be used with a null Bitmap");
		}
		if (bitmap.isRecycled()) {
		throw new IllegalArgumentException("bitmap is recycled");
		}
		if (native_texImage2D(target, level, internalformat, bitmap, type, border)!=0) {
		throw new IllegalArgumentException("invalid Bitmap format");
		}
		@@ -177,6 +189,9 @@ public final class GLUtils {
		if (bitmap == null) {
		throw new NullPointerException("texSubImage2D can't be used with a null Bitmap");
		}
		if (bitmap.isRecycled()) {
		throw new IllegalArgumentException("bitmap is recycled");
		}
		int type = getType(bitmap);
		if (native_texSubImage2D(target, level, xoffset, yoffset, bitmap, -1, type)!=0) {
		throw new IllegalArgumentException("invalid Bitmap format");
		@@ -199,6 +214,9 @@ public final class GLUtils {
		if (bitmap == null) {
		throw new NullPointerException("texSubImage2D can't be used with a null Bitmap");
		}
		if (bitmap.isRecycled()) {
		throw new IllegalArgumentException("bitmap is recycled");
		}
		if (native_texSubImage2D(target, level, xoffset, yoffset, bitmap, format, type)!=0) {
		throw new IllegalArgumentException("invalid Bitmap format");
		}