Skip to content

Commit 0c487eb

Browse files
Sally QiAndroid (Google) Code Review
authored andcommitted
Merge "[Lut Shader] Skip the Lut if the Lut building process fails." into main
2 parents 942d768 + 544a431 commit 0c487eb

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

libs/renderengine/skia/filters/LutShader.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,16 @@ sk_sp<SkShader> LutShader::generateLutShader(sk_sp<SkShader> input,
187187
SkBitmap bitmap;
188188
bitmap.allocPixels(info);
189189
if (!bitmap.installPixels(info, buffer.data(), info.minRowBytes())) {
190-
LOG_ALWAYS_FATAL("unable to install pixels");
190+
ALOGW("bitmap.installPixels failed, skip this Lut!");
191+
return input;
191192
}
192193

193194
sk_sp<SkImage> lutImage = SkImages::RasterFromBitmap(bitmap);
195+
if (!lutImage) {
196+
ALOGW("Got a nullptr from SkImages::RasterFromBitmap, skip this Lut!");
197+
return input;
198+
}
199+
194200
mBuilder->child("image") = input;
195201
mBuilder->child("lut") =
196202
lutImage->makeRawShader(SkTileMode::kClamp, SkTileMode::kClamp,

0 commit comments

Comments
 (0)