Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ensure that bitmaps are valid prior to attempting to upload them"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-08-23 18:24:59 +00:00
committed by Android (Google) Code Review
parent a6b1edc322 fa9b4e48cc
commit 2de914ddae
1 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
core/jni/android/opengl/util.cpp
View File

@@ -720,19 +720,22 @@ static jint util_texImage2D(JNIEnv *env, jclass clazz, jint target, jint level,
jint internalformat, jobject bitmapObj, jint type, jint border)
{
graphics::Bitmap bitmap(env, bitmapObj);
AndroidBitmapInfo bitmapInfo = bitmap.getInfo();
if (bitmap.isValid() && bitmap.getPixels() != nullptr) {
AndroidBitmapInfo bitmapInfo = bitmap.getInfo();
if (internalformat < 0) {
internalformat = getInternalFormat(bitmapInfo.format);
}
if (type < 0) {
type = getType(bitmapInfo.format);
}
if (internalformat < 0) {
internalformat = getInternalFormat(bitmapInfo.format);
}
if (type < 0) {
type = getType(bitmapInfo.format);
}
if (checkInternalFormat(bitmapInfo.format, internalformat, type)) {
glTexImage2D(target, level, internalformat, bitmapInfo.width, bitmapInfo.height, border,
getPixelFormatFromInternalFormat(internalformat), type, bitmap.getPixels());
return 0;
if (checkInternalFormat(bitmapInfo.format, internalformat, type)) {
glTexImage2D(target, level, internalformat, bitmapInfo.width, bitmapInfo.height, border,
getPixelFormatFromInternalFormat(internalformat), type,
bitmap.getPixels());
return 0;
}
}
return -1;
}
@@ -741,19 +744,21 @@ static jint util_texSubImage2D(JNIEnv *env, jclass clazz, jint target, jint leve
jint xoffset, jint yoffset, jobject bitmapObj, jint format, jint type)
{
graphics::Bitmap bitmap(env, bitmapObj);
AndroidBitmapInfo bitmapInfo = bitmap.getInfo();
if (bitmap.isValid() && bitmap.getPixels() != nullptr) {
AndroidBitmapInfo bitmapInfo = bitmap.getInfo();
int internalFormat = getInternalFormat(bitmapInfo.format);
if (format < 0) {
format = getPixelFormatFromInternalFormat(internalFormat);
if (format == GL_PALETTE8_RGBA8_OES)
return -1; // glCompressedTexSubImage2D() not supported
}
int internalFormat = getInternalFormat(bitmapInfo.format);
if (format < 0) {
format = getPixelFormatFromInternalFormat(internalFormat);
if (format == GL_PALETTE8_RGBA8_OES)
return -1; // glCompressedTexSubImage2D() not supported
}
if (checkInternalFormat(bitmapInfo.format, internalFormat, type)) {
glTexSubImage2D(target, level, xoffset, yoffset, bitmapInfo.width, bitmapInfo.height,
format, type, bitmap.getPixels());
return 0;
if (checkInternalFormat(bitmapInfo.format, internalFormat, type)) {
glTexSubImage2D(target, level, xoffset, yoffset, bitmapInfo.width, bitmapInfo.height,
format, type, bitmap.getPixels());
return 0;
}
}
return -1;
}