sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Android texture util now supports uploading a sub texture to the GPU, even as a bitmap.

Browse Source 
This makes Nifty batch rendering work on android.

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10488 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2013-03-15 20:45:36 +00:00
parent 2037ece7d8
commit 4d91089b3a
1 changed files with 258 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

353
engine/src/android/com/jme3/renderer/android/TextureUtil.java
View File

@ -18,7 +18,6 @@ import java.util.logging.Logger;
public class TextureUtil {
private static final Logger logger = Logger.getLogger(TextureUtil.class.getName());
//TODO Make this configurable through appSettings
public static boolean ENABLE_COMPRESSION = true;
private static boolean NPOT = false;
@ -50,7 +49,7 @@ public class TextureUtil {
//First of all, generate the texture from our bitmap and set it to the according level
if (compress) {
logger.log(Level.FINEST, " - Uploading LOD level {0} ({1}x{2}) with compression.", new Object[]{level, width, height});
uploadBitmapAsCompressed(GLES20.GL_TEXTURE_2D, level, bitmap);
uploadBitmapAsCompressed(GLES20.GL_TEXTURE_2D, level, bitmap, false, 0, 0);
} else {
logger.log(Level.FINEST, " - Uploading LOD level {0} ({1}x{2}) directly.", new Object[]{level, width, height});
GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, level, bitmap, 0);
@ -77,10 +76,16 @@ public class TextureUtil {
}
}
private static void uploadBitmapAsCompressed(int target, int level, Bitmap bitmap) {
private static void uploadBitmapAsCompressed(int target, int level, Bitmap bitmap, boolean subTexture, int x, int y) {
if (bitmap.hasAlpha()) {
logger.log(Level.FINEST, " - Uploading bitmap directly. Cannot compress as alpha present.");
if (subTexture) {
GLUtils.texSubImage2D(target, level, x, y, bitmap);
checkGLError();
} else {
GLUtils.texImage2D(target, level, bitmap, 0);
checkGLError();
}
} else {
// Convert to RGB565
int bytesPerPixel = 2;
@ -114,6 +119,17 @@ public class TextureUtil {
int oldSize = (bitmap.getRowBytes() * bitmap.getHeight());
int newSize = compressedImage.capacity();
logger.log(Level.FINEST, " - Uploading compressed image to GL, oldSize = {0}, newSize = {1}, ratio = {2}", new Object[]{oldSize, newSize, (float) oldSize / newSize});
if (subTexture) {
GLES20.glCompressedTexSubImage2D(target,
level,
x, y,
bitmap.getWidth(),
bitmap.getHeight(),
ETC1.ETC1_RGB8_OES,
etc1tex.getData().capacity(),
etc1tex.getData());
checkGLError();
} else {
GLES20.glCompressedTexImage2D(target,
level,
ETC1.ETC1_RGB8_OES,
@ -122,6 +138,8 @@ public class TextureUtil {
0,
etc1tex.getData().capacity(),
etc1tex.getData());
checkGLError();
}
// ETC1Util.loadTexture(target, level, 0, GLES20.GL_RGB,
// GLES20.GL_UNSIGNED_SHORT_5_6_5, etc1Texture);
@ -138,30 +156,15 @@ public class TextureUtil {
* <code>uploadTextureBitmap</code> uploads a native android bitmap
*/
public static void uploadTextureBitmap(final int target, Bitmap bitmap, boolean needMips) {
uploadTextureBitmap(target, bitmap, needMips, false, 0, 0);
}
/**
* <code>uploadTextureBitmap</code> uploads a native android bitmap
*/
public static void uploadTextureBitmap(final int target, Bitmap bitmap, boolean needMips, boolean subTexture, int x, int y) {
boolean recycleBitmap = false;
if (!NPOT || needMips) {
// Power of 2 images are not supported by this GPU.
// OR
// Mipmaps were requested to be used.
// Currently OGLES does not support NPOT textures with mipmaps.
int width = bitmap.getWidth();
int height = bitmap.getHeight();
// If the image is not power of 2, rescale it
if (!FastMath.isPowerOfTwo(width) || !FastMath.isPowerOfTwo(height)) {
// Scale to power of two.
width = FastMath.nearestPowerOfTwo(width);
height = FastMath.nearestPowerOfTwo(height);
logger.log(Level.WARNING, " - Image is not POT, so scaling it to new resolution: {0}x{1}", new Object[]{width, height});
Bitmap bitmap2 = Bitmap.createScaledBitmap(bitmap, width, height, true);
bitmap = bitmap2;
// Flag to indicate that bitmap
// should be recycled at the end.
recycleBitmap = true;
}
}
//TODO, maybe this should raise an exception when NPOT is not supported
boolean willCompress = ENABLE_COMPRESSION && ETC1support && !bitmap.hasAlpha();
if (needMips && willCompress) {
@ -172,18 +175,28 @@ public class TextureUtil {
if (willCompress) {
// Image is compressed but mipmaps are not desired, upload directly.
logger.log(Level.FINEST, " - Uploading compressed bitmap. Mipmaps are not generated.");
uploadBitmapAsCompressed(target, 0, bitmap);
uploadBitmapAsCompressed(target, 0, bitmap, subTexture, x, y);
} else {
// Image is not compressed, mipmaps may or may not be desired.
logger.log(Level.FINEST, " - Uploading bitmap directly.{0}",
(needMips ?
" Mipmaps will be generated in HARDWARE" :
" Mipmaps are not generated."));
(needMips
? " Mipmaps will be generated in HARDWARE"
: " Mipmaps are not generated."));
if (subTexture) {
System.err.println("x : " + x + " y :" + y + " , " + bitmap.getWidth() + "/" + bitmap.getHeight());
GLUtils.texSubImage2D(target, 0, x, y, bitmap);
checkGLError();
} else {
GLUtils.texImage2D(target, 0, bitmap, 0);
checkGLError();
}
if (needMips) {
// No pregenerated mips available,
// generate from base level if required
GLES20.glGenerateMipmap(target);
checkGLError();
}
}
}
@ -209,9 +222,9 @@ public class TextureUtil {
// Upload using slower path
logger.log(Level.FINEST, " - Uploading bitmap directly.{0}",
(wantGeneratedMips ?
" Mipmaps will be generated in HARDWARE" :
" Mipmaps are not generated."));
(wantGeneratedMips
? " Mipmaps will be generated in HARDWARE"
: " Mipmaps are not generated."));
uploadTexture(img, target, index);
// Image was uploaded using slower path, since it is not compressed,
@ -228,6 +241,90 @@ public class TextureUtil {
throw new UnsupportedOperationException("The image format '" + fmt + "' is unsupported by the video hardware.");
}
private static AndroidGLImageFormat getImageFormat(Format fmt) throws UnsupportedOperationException {
AndroidGLImageFormat imageFormat = new AndroidGLImageFormat();
switch (fmt) {
case RGBA16:
case RGB16:
case RGB10:
case Luminance16:
case Luminance16Alpha16:
case Alpha16:
case Depth32:
case Depth32F:
throw new UnsupportedOperationException("The image format '"
+ fmt + "' is not supported by OpenGL ES 2.0 specification.");
case Alpha8:
imageFormat.format = GLES20.GL_ALPHA;
imageFormat.dataType = GLES20.GL_UNSIGNED_BYTE;
break;
case Luminance8:
imageFormat.format = GLES20.GL_LUMINANCE;
imageFormat.dataType = GLES20.GL_UNSIGNED_BYTE;
break;
case Luminance8Alpha8:
imageFormat.format = GLES20.GL_LUMINANCE_ALPHA;
imageFormat.dataType = GLES20.GL_UNSIGNED_BYTE;
break;
case RGB565:
imageFormat.format = GLES20.GL_RGB;
imageFormat.dataType = GLES20.GL_UNSIGNED_SHORT_5_6_5;
break;
case ARGB4444:
imageFormat.format = GLES20.GL_RGBA4;
imageFormat.dataType = GLES20.GL_UNSIGNED_SHORT_4_4_4_4;
break;
case RGB5A1:
imageFormat.format = GLES20.GL_RGBA;
imageFormat.dataType = GLES20.GL_UNSIGNED_SHORT_5_5_5_1;
break;
case RGB8:
imageFormat.format = GLES20.GL_RGB;
imageFormat.dataType = GLES20.GL_UNSIGNED_BYTE;
break;
case BGR8:
imageFormat.format = GLES20.GL_RGB;
imageFormat.dataType = GLES20.GL_UNSIGNED_BYTE;
break;
case RGBA8:
imageFormat.format = GLES20.GL_RGBA;
imageFormat.dataType = GLES20.GL_UNSIGNED_BYTE;
break;
case Depth:
case Depth16:
case Depth24:
imageFormat.format = GLES20.GL_DEPTH_COMPONENT;
imageFormat.dataType = GLES20.GL_UNSIGNED_BYTE;
break;
case DXT1:
if (!DXT1) {
unsupportedFormat(fmt);
}
imageFormat.format = 0x83F0;
imageFormat.dataType = GLES20.GL_UNSIGNED_BYTE;
imageFormat.compress = true;
break;
case DXT1A:
if (!DXT1) {
unsupportedFormat(fmt);
}
imageFormat.format = 0x83F1;
imageFormat.dataType = GLES20.GL_UNSIGNED_BYTE;
imageFormat.compress = true;
break;
default:
throw new UnsupportedOperationException("Unrecognized format: " + fmt);
}
return imageFormat;
}
private static class AndroidGLImageFormat {
boolean compress = false;
int format = -1;
int dataType = -1;
}
private static void uploadTexture(Image img,
int target,
int index) {
@ -249,7 +346,6 @@ public class TextureUtil {
int width = img.getWidth();
int height = img.getHeight();
int depth = img.getDepth();
if (!NPOT) {
// Check if texture is POT
@ -259,83 +355,7 @@ public class TextureUtil {
+ "and no scaling path available for image: " + img);
}
}
boolean compress = false;
int format = -1;
int dataType = -1;
switch (fmt){
case RGBA16:
case RGB16:
case RGB10:
case Luminance16:
case Luminance16Alpha16:
case Alpha16:
case Depth32:
case Depth32F:
throw new UnsupportedOperationException("The image format '"
+ fmt + "' is not supported by OpenGL ES 2.0 specification.");
case Alpha8:
format = GLES20.GL_ALPHA;
dataType = GLES20.GL_UNSIGNED_BYTE;
break;
case Luminance8:
format = GLES20.GL_LUMINANCE;
dataType = GLES20.GL_UNSIGNED_BYTE;
break;
case Luminance8Alpha8:
format = GLES20.GL_LUMINANCE_ALPHA;
dataType = GLES20.GL_UNSIGNED_BYTE;
break;
case RGB565:
format = GLES20.GL_RGB;
dataType = GLES20.GL_UNSIGNED_SHORT_5_6_5;
break;
case ARGB4444:
format = GLES20.GL_RGBA4;
dataType = GLES20.GL_UNSIGNED_SHORT_4_4_4_4;
break;
case RGB5A1:
format = GLES20.GL_RGBA;
dataType = GLES20.GL_UNSIGNED_SHORT_5_5_5_1;
break;
case RGB8:
format = GLES20.GL_RGB;
dataType = GLES20.GL_UNSIGNED_BYTE;
break;
case BGR8:
format = GLES20.GL_RGB;
dataType = GLES20.GL_UNSIGNED_BYTE;
break;
case RGBA8:
format = GLES20.GL_RGBA;
dataType = GLES20.GL_UNSIGNED_BYTE;
break;
case Depth:
case Depth16:
case Depth24:
format = GLES20.GL_DEPTH_COMPONENT;
dataType = GLES20.GL_UNSIGNED_BYTE;
break;
case DXT1:
if (!DXT1) {
unsupportedFormat(fmt);
}
format = 0x83F0;
dataType = GLES20.GL_UNSIGNED_BYTE;
compress = true;
break;
case DXT1A:
if (!DXT1) {
unsupportedFormat(fmt);
}
format = 0x83F1;
dataType = GLES20.GL_UNSIGNED_BYTE;
compress = true;
break;
default:
throw new UnsupportedOperationException("Unrecognized format: " + fmt);
}
AndroidGLImageFormat imageFormat = getImageFormat(fmt);
if (data != null) {
GLES20.glPixelStorei(GLES20.GL_UNPACK_ALIGNMENT, 1);
@ -344,42 +364,26 @@ public class TextureUtil {
int[] mipSizes = img.getMipMapSizes();
int pos = 0;
if (mipSizes == null) {
if (data != null)
if (data != null) {
mipSizes = new int[]{data.capacity()};
else
} else {
mipSizes = new int[]{width * height * fmt.getBitsPerPixel() / 8};
}
// XXX: might want to change that when support
// of more than paletted compressions is added..
/// NOTE: Doesn't support mipmaps
// if (compress){
// data.clear();
// GLES20.glCompressedTexImage2D(target,
// 1 - mipSizes.length,
// format,
// width,
// height,
// 0,
// data.capacity(),
// data);
// return;
// }
}
for (int i = 0; i < mipSizes.length; i++) {
int mipWidth = Math.max(1, width >> i);
int mipHeight = Math.max(1, height >> i);
// int mipDepth = Math.max(1, depth >> i);
if (data != null) {
data.position(pos);
data.limit(pos + mipSizes[i]);
}
if (compress && data != null){
if (imageFormat.compress && data != null) {
GLES20.glCompressedTexImage2D(target,
i,
format,
imageFormat.format,
mipWidth,
mipHeight,
0,
@ -388,12 +392,12 @@ public class TextureUtil {
} else {
GLES20.glTexImage2D(target,
i,
format,
imageFormat.format,
mipWidth,
mipHeight,
0,
format,
dataType,
imageFormat.format,
imageFormat.dataType,
data);
}
@ -401,23 +405,92 @@ public class TextureUtil {
}
}
private static void checkGLError() {
int error;
while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
throw new RendererException("OpenGL Error " + error);
}
}
/**
* Update the texture currently bound to target at with data from the given Image at position x and y. The parameter
* index is used as the zoffset in case a 3d texture or texture 2d array is being updated.
* Update the texture currently bound to target at with data from the given
* Image at position x and y. The parameter index is used as the zoffset in
* case a 3d texture or texture 2d array is being updated.
*
* @param image Image with the source data (this data will be put into the texture)
* @param image Image with the source data (this data will be put into the
* texture)
* @param target the target texture
* @param index the mipmap level to update
* @param x the x position where to put the image in the texture
* @param y the y position where to put the image in the texture
*/
public static void uploadSubTexture(
Image image,
Image img,
int target,
int index,
int x,
int y) {
// FIXME and implement this!
if (img.getEfficentData() instanceof AndroidImageInfo) {
AndroidImageInfo imageInfo = (AndroidImageInfo) img.getEfficentData();
uploadTextureBitmap(target, imageInfo.getBitmap(), true, true, x, y);
return;
}
// Otherwise upload image directly.
// Prefer to only use power of 2 textures here to avoid errors.
Image.Format fmt = img.getFormat();
ByteBuffer data;
if (index >= 0 || img.getData() != null && img.getData().size() > 0) {
data = img.getData(index);
} else {
data = null;
}
int width = img.getWidth();
int height = img.getHeight();
if (!NPOT) {
// Check if texture is POT
if (!FastMath.isPowerOfTwo(width) || !FastMath.isPowerOfTwo(height)) {
throw new RendererException("Non-power-of-2 textures "
+ "are not supported by the video hardware "
+ "and no scaling path available for image: " + img);
}
}
AndroidGLImageFormat imageFormat = getImageFormat(fmt);
if (data != null) {
GLES20.glPixelStorei(GLES20.GL_UNPACK_ALIGNMENT, 1);
}
int[] mipSizes = img.getMipMapSizes();
int pos = 0;
if (mipSizes == null) {
if (data != null) {
mipSizes = new int[]{data.capacity()};
} else {
mipSizes = new int[]{width * height * fmt.getBitsPerPixel() / 8};
}
}
for (int i = 0; i < mipSizes.length; i++) {
int mipWidth = Math.max(1, width >> i);
int mipHeight = Math.max(1, height >> i);
if (data != null) {
data.position(pos);
data.limit(pos + mipSizes[i]);
}
if (imageFormat.compress && data != null) {
GLES20.glCompressedTexSubImage2D(target, i, x, y, mipWidth, mipHeight, imageFormat.format, data.remaining(), data);
checkGLError();
} else {
GLES20.glTexSubImage2D(target, i, x, y, mipWidth, mipHeight, imageFormat.format, imageFormat.dataType, data);
checkGLError();
}
pos += mipSizes[i];
}
}
}