diff options
author | android-autoroll <android-autoroll@skia-corp.google.com.iam.gserviceaccount.com> | 2021-06-07 16:24:08 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-07 16:24:08 +0000 |
commit | 78e5e2f55c52385797376de7ef0ae9693660a64a (patch) | |
tree | 31e9d60773669abe77782b7069cf86843af64f71 | |
parent | 8d35fc6e032fc57dfa231fd476c511abacaaa8b8 (diff) | |
parent | 3c6be130bf1a9a6910ca9c992cdbf6bf9a61c84f (diff) | |
download | skia-78e5e2f55c52385797376de7ef0ae9693660a64a.tar.gz |
Roll Skia from 9969494b6df9 to 7dfe52785e6e (1 revision) am: 3c6be130bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skia/+/14843525
Change-Id: I3b11ada46d6589ce4216c08ac958dd628ff32488
-rw-r--r-- | src/image/SkImage_Gpu.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index bc56b5320c..378be7dd27 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -704,6 +704,7 @@ sk_sp<SkImage> SkImage::MakeFromAHardwareBufferWithData(GrDirectContext* dContex return nullptr; } + GrBackendFormat backendFormat = GrAHardwareBufferUtils::GetBackendFormat(dContext, hardwareBuffer, bufferDesc.format, @@ -717,11 +718,14 @@ sk_sp<SkImage> SkImage::MakeFromAHardwareBufferWithData(GrDirectContext* dContex GrAHardwareBufferUtils::UpdateImageProc updateImageProc = nullptr; GrAHardwareBufferUtils::TexImageCtx deleteImageCtx = nullptr; + const bool isRenderable = SkToBool(bufferDesc.usage & AHARDWAREBUFFER_USAGE_GPU_FRAMEBUFFER); + GrBackendTexture backendTexture = GrAHardwareBufferUtils::MakeBackendTexture(dContext, hardwareBuffer, bufferDesc.width, bufferDesc.height, &deleteImageProc, &updateImageProc, - &deleteImageCtx, false, backendFormat, true); + &deleteImageCtx, false, backendFormat, + isRenderable); if (!backendTexture.isValid()) { return nullptr; } |