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
3.0
rem..om 12 years ago
parent 2037ece7d8
commit 4d91089b3a
1 changed files with 258 additions and 185 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 345
      engine/src/android/com/jme3/renderer/android/TextureUtil.java

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

@ -18,7 +18,6 @@ import java.util.logging.Logger;
public class TextureUtil { public class TextureUtil {
private static final Logger logger = Logger.getLogger(TextureUtil.class.getName()); private static final Logger logger = Logger.getLogger(TextureUtil.class.getName());
//TODO Make this configurable through appSettings //TODO Make this configurable through appSettings
public static boolean ENABLE_COMPRESSION = true; public static boolean ENABLE_COMPRESSION = true;
private static boolean NPOT = false; 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 //First of all, generate the texture from our bitmap and set it to the according level
if (compress) { if (compress) {
logger.log(Level.FINEST, " - Uploading LOD level {0} ({1}x{2}) with compression.", new Object[]{level, width, height}); 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 { } else {
logger.log(Level.FINEST, " - Uploading LOD level {0} ({1}x{2}) directly.", new Object[]{level, width, height}); 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); GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, level, bitmap, 0);
@ -67,7 +66,7 @@ public class TextureUtil {
// Recycle any bitmaps created as a result of scaling the bitmap. // Recycle any bitmaps created as a result of scaling the bitmap.
// Do not recycle the original image (mipmap level 0) // Do not recycle the original image (mipmap level 0)
if (level != 0){ if (level != 0) {
bitmap.recycle(); bitmap.recycle();
} }
@ -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()) { if (bitmap.hasAlpha()) {
logger.log(Level.FINEST, " - Uploading bitmap directly. Cannot compress as alpha present."); 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); GLUtils.texImage2D(target, level, bitmap, 0);
checkGLError();
}
} else { } else {
// Convert to RGB565 // Convert to RGB565
int bytesPerPixel = 2; int bytesPerPixel = 2;
@ -113,7 +118,18 @@ public class TextureUtil {
if (bytesPerPixel == 2) { if (bytesPerPixel == 2) {
int oldSize = (bitmap.getRowBytes() * bitmap.getHeight()); int oldSize = (bitmap.getRowBytes() * bitmap.getHeight());
int newSize = compressedImage.capacity(); 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}); 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, GLES20.glCompressedTexImage2D(target,
level, level,
ETC1.ETC1_RGB8_OES, ETC1.ETC1_RGB8_OES,
@ -122,6 +138,8 @@ public class TextureUtil {
0, 0,
etc1tex.getData().capacity(), etc1tex.getData().capacity(),
etc1tex.getData()); etc1tex.getData());
checkGLError();
}
// ETC1Util.loadTexture(target, level, 0, GLES20.GL_RGB, // ETC1Util.loadTexture(target, level, 0, GLES20.GL_RGB,
// GLES20.GL_UNSIGNED_SHORT_5_6_5, etc1Texture); // GLES20.GL_UNSIGNED_SHORT_5_6_5, etc1Texture);
@ -138,31 +156,16 @@ public class TextureUtil {
* <code>uploadTextureBitmap</code> uploads a native android bitmap * <code>uploadTextureBitmap</code> uploads a native android bitmap
*/ */
public static void uploadTextureBitmap(final int target, Bitmap bitmap, boolean needMips) { public static void uploadTextureBitmap(final int target, Bitmap bitmap, boolean needMips) {
boolean recycleBitmap = false; uploadTextureBitmap(target, bitmap, needMips, false, 0, 0);
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;
}
} }
/**
* <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;
//TODO, maybe this should raise an exception when NPOT is not supported
boolean willCompress = ENABLE_COMPRESSION && ETC1support && !bitmap.hasAlpha(); boolean willCompress = ENABLE_COMPRESSION && ETC1support && !bitmap.hasAlpha();
if (needMips && willCompress) { if (needMips && willCompress) {
// Image is compressed and mipmaps are desired, generate them // Image is compressed and mipmaps are desired, generate them
@ -172,18 +175,28 @@ public class TextureUtil {
if (willCompress) { if (willCompress) {
// Image is compressed but mipmaps are not desired, upload directly. // Image is compressed but mipmaps are not desired, upload directly.
logger.log(Level.FINEST, " - Uploading compressed bitmap. Mipmaps are not generated."); logger.log(Level.FINEST, " - Uploading compressed bitmap. Mipmaps are not generated.");
uploadBitmapAsCompressed(target, 0, bitmap); uploadBitmapAsCompressed(target, 0, bitmap, subTexture, x, y);
} else { } else {
// Image is not compressed, mipmaps may or may not be desired. // Image is not compressed, mipmaps may or may not be desired.
logger.log(Level.FINEST, " - Uploading bitmap directly.{0}", logger.log(Level.FINEST, " - Uploading bitmap directly.{0}",
(needMips ? (needMips
" Mipmaps will be generated in HARDWARE" : ? " Mipmaps will be generated in HARDWARE"
" Mipmaps are not generated.")); : " 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); GLUtils.texImage2D(target, 0, bitmap, 0);
checkGLError();
}
if (needMips) { if (needMips) {
// No pregenerated mips available, // No pregenerated mips available,
// generate from base level if required // generate from base level if required
GLES20.glGenerateMipmap(target); GLES20.glGenerateMipmap(target);
checkGLError();
} }
} }
} }
@ -194,7 +207,7 @@ public class TextureUtil {
} }
public static void uploadTextureAny(Image img, int target, int index, boolean needMips) { public static void uploadTextureAny(Image img, int target, int index, boolean needMips) {
if (img.getEfficentData() instanceof AndroidImageInfo){ if (img.getEfficentData() instanceof AndroidImageInfo) {
logger.log(Level.FINEST, " === Uploading image {0}. Using BITMAP PATH === ", img); logger.log(Level.FINEST, " === Uploading image {0}. Using BITMAP PATH === ", img);
// If image was loaded from asset manager, use fast path // If image was loaded from asset manager, use fast path
AndroidImageInfo imageInfo = (AndroidImageInfo) img.getEfficentData(); AndroidImageInfo imageInfo = (AndroidImageInfo) img.getEfficentData();
@ -209,9 +222,9 @@ public class TextureUtil {
// Upload using slower path // Upload using slower path
logger.log(Level.FINEST, " - Uploading bitmap directly.{0}", logger.log(Level.FINEST, " - Uploading bitmap directly.{0}",
(wantGeneratedMips ? (wantGeneratedMips
" Mipmaps will be generated in HARDWARE" : ? " Mipmaps will be generated in HARDWARE"
" Mipmaps are not generated.")); : " Mipmaps are not generated."));
uploadTexture(img, target, index); uploadTexture(img, target, index);
// Image was uploaded using slower path, since it is not compressed, // Image was uploaded using slower path, since it is not compressed,
@ -228,43 +241,9 @@ public class TextureUtil {
throw new UnsupportedOperationException("The image format '" + fmt + "' is unsupported by the video hardware."); throw new UnsupportedOperationException("The image format '" + fmt + "' is unsupported by the video hardware.");
} }
private static void uploadTexture(Image img, private static AndroidGLImageFormat getImageFormat(Format fmt) throws UnsupportedOperationException {
int target, AndroidGLImageFormat imageFormat = new AndroidGLImageFormat();
int index){ switch (fmt) {
if (img.getEfficentData() instanceof AndroidImageInfo){
throw new RendererException("This image uses efficient data. "
+ "Use uploadTextureBitmap instead.");
}
// 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();
int depth = img.getDepth();
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);
}
}
boolean compress = false;
int format = -1;
int dataType = -1;
switch (fmt){
case RGBA16: case RGBA16:
case RGB16: case RGB16:
case RGB10: case RGB10:
@ -276,66 +255,107 @@ public class TextureUtil {
throw new UnsupportedOperationException("The image format '" throw new UnsupportedOperationException("The image format '"
+ fmt + "' is not supported by OpenGL ES 2.0 specification."); + fmt + "' is not supported by OpenGL ES 2.0 specification.");
case Alpha8: case Alpha8:
format = GLES20.GL_ALPHA; imageFormat.format = GLES20.GL_ALPHA;
dataType = GLES20.GL_UNSIGNED_BYTE; imageFormat.dataType = GLES20.GL_UNSIGNED_BYTE;
break; break;
case Luminance8: case Luminance8:
format = GLES20.GL_LUMINANCE; imageFormat.format = GLES20.GL_LUMINANCE;
dataType = GLES20.GL_UNSIGNED_BYTE; imageFormat.dataType = GLES20.GL_UNSIGNED_BYTE;
break; break;
case Luminance8Alpha8: case Luminance8Alpha8:
format = GLES20.GL_LUMINANCE_ALPHA; imageFormat.format = GLES20.GL_LUMINANCE_ALPHA;
dataType = GLES20.GL_UNSIGNED_BYTE; imageFormat.dataType = GLES20.GL_UNSIGNED_BYTE;
break; break;
case RGB565: case RGB565:
format = GLES20.GL_RGB; imageFormat.format = GLES20.GL_RGB;
dataType = GLES20.GL_UNSIGNED_SHORT_5_6_5; imageFormat.dataType = GLES20.GL_UNSIGNED_SHORT_5_6_5;
break; break;
case ARGB4444: case ARGB4444:
format = GLES20.GL_RGBA4; imageFormat.format = GLES20.GL_RGBA4;
dataType = GLES20.GL_UNSIGNED_SHORT_4_4_4_4; imageFormat.dataType = GLES20.GL_UNSIGNED_SHORT_4_4_4_4;
break; break;
case RGB5A1: case RGB5A1:
format = GLES20.GL_RGBA; imageFormat.format = GLES20.GL_RGBA;
dataType = GLES20.GL_UNSIGNED_SHORT_5_5_5_1; imageFormat.dataType = GLES20.GL_UNSIGNED_SHORT_5_5_5_1;
break; break;
case RGB8: case RGB8:
format = GLES20.GL_RGB; imageFormat.format = GLES20.GL_RGB;
dataType = GLES20.GL_UNSIGNED_BYTE; imageFormat.dataType = GLES20.GL_UNSIGNED_BYTE;
break; break;
case BGR8: case BGR8:
format = GLES20.GL_RGB; imageFormat.format = GLES20.GL_RGB;
dataType = GLES20.GL_UNSIGNED_BYTE; imageFormat.dataType = GLES20.GL_UNSIGNED_BYTE;
break; break;
case RGBA8: case RGBA8:
format = GLES20.GL_RGBA; imageFormat.format = GLES20.GL_RGBA;
dataType = GLES20.GL_UNSIGNED_BYTE; imageFormat.dataType = GLES20.GL_UNSIGNED_BYTE;
break; break;
case Depth: case Depth:
case Depth16: case Depth16:
case Depth24: case Depth24:
format = GLES20.GL_DEPTH_COMPONENT; imageFormat.format = GLES20.GL_DEPTH_COMPONENT;
dataType = GLES20.GL_UNSIGNED_BYTE; imageFormat.dataType = GLES20.GL_UNSIGNED_BYTE;
break; break;
case DXT1: case DXT1:
if (!DXT1) { if (!DXT1) {
unsupportedFormat(fmt); unsupportedFormat(fmt);
} }
format = 0x83F0; imageFormat.format = 0x83F0;
dataType = GLES20.GL_UNSIGNED_BYTE; imageFormat.dataType = GLES20.GL_UNSIGNED_BYTE;
compress = true; imageFormat.compress = true;
break; break;
case DXT1A: case DXT1A:
if (!DXT1) { if (!DXT1) {
unsupportedFormat(fmt); unsupportedFormat(fmt);
} }
format = 0x83F1; imageFormat.format = 0x83F1;
dataType = GLES20.GL_UNSIGNED_BYTE; imageFormat.dataType = GLES20.GL_UNSIGNED_BYTE;
compress = true; imageFormat.compress = true;
break; break;
default: default:
throw new UnsupportedOperationException("Unrecognized format: " + fmt); 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) {
if (img.getEfficentData() instanceof AndroidImageInfo) {
throw new RendererException("This image uses efficient data. "
+ "Use uploadTextureBitmap instead.");
}
// 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) { if (data != null) {
GLES20.glPixelStorei(GLES20.GL_UNPACK_ALIGNMENT, 1); GLES20.glPixelStorei(GLES20.GL_UNPACK_ALIGNMENT, 1);
@ -343,57 +363,41 @@ public class TextureUtil {
int[] mipSizes = img.getMipMapSizes(); int[] mipSizes = img.getMipMapSizes();
int pos = 0; int pos = 0;
if (mipSizes == null){ if (mipSizes == null) {
if (data != null) if (data != null) {
mipSizes = new int[]{ data.capacity() }; mipSizes = new int[]{data.capacity()};
else } else {
mipSizes = new int[]{ width * height * fmt.getBitsPerPixel() / 8 }; mipSizes = new int[]{width * height * fmt.getBitsPerPixel() / 8};
} }
}
// XXX: might want to change that when support
// of more than paletted compressions is added.. for (int i = 0; i < mipSizes.length; i++) {
/// 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 mipWidth = Math.max(1, width >> i);
int mipHeight = Math.max(1, height >> i); int mipHeight = Math.max(1, height >> i);
// int mipDepth = Math.max(1, depth >> i);
if (data != null){ if (data != null) {
data.position(pos); data.position(pos);
data.limit(pos + mipSizes[i]); data.limit(pos + mipSizes[i]);
} }
if (compress && data != null){ if (imageFormat.compress && data != null) {
GLES20.glCompressedTexImage2D(target, GLES20.glCompressedTexImage2D(target,
i, i,
format, imageFormat.format,
mipWidth, mipWidth,
mipHeight, mipHeight,
0, 0,
data.remaining(), data.remaining(),
data); data);
}else{ } else {
GLES20.glTexImage2D(target, GLES20.glTexImage2D(target,
i, i,
format, imageFormat.format,
mipWidth, mipWidth,
mipHeight, mipHeight,
0, 0,
format, imageFormat.format,
dataType, imageFormat.dataType,
data); 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 * Update the texture currently bound to target at with data from the given
* index is used as the zoffset in case a 3d texture or texture 2d array is being updated. * 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 target the target texture
* @param index the mipmap level to update * @param index the mipmap level to update
* @param x the x position where to put the image in the texture * @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 * @param y the y position where to put the image in the texture
*/ */
public static void uploadSubTexture( public static void uploadSubTexture(
Image image, Image img,
int target, int target,
int index, int index,
int x, int x,
int y) { 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];
}
}
} }

Write Preview
Loading…
Cancel
Save