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

Merge "Make sure we check for valid GrContext when pinning images." into sc-dev am: 351080a8f5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15156074

Change-Id: I5327e40165972f4e57dcef87455aaa38b60f4a2a
This commit is contained in:
Greg Daniel
2021-07-01 07:43:48 +00:00
committed by Automerger Merge Worker
parent 99fe1157f2 351080a8f5
commit f138e0020e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hwui/pipeline/skia/SkiaPipeline.cpp
View File

@@ -59,6 +59,10 @@ void SkiaPipeline::onDestroyHardwareResources() {
} }
bool SkiaPipeline::pinImages(std::vector<SkImage*>& mutableImages) { bool SkiaPipeline::pinImages(std::vector<SkImage*>& mutableImages) {
if (!mRenderThread.getGrContext()) {
ALOGD("Trying to pin an image with an invalid GrContext");
return false;
}
for (SkImage* image : mutableImages) { for (SkImage* image : mutableImages) {
if (SkImage_pinAsTexture(image, mRenderThread.getGrContext())) { if (SkImage_pinAsTexture(image, mRenderThread.getGrContext())) {
mPinnedImages.emplace_back(sk_ref_sp(image)); mPinnedImages.emplace_back(sk_ref_sp(image));