commit e7fb46f5efa14e9002cffc3b8e442416550bbd59
author Kevin Lubick <kjlubick@google.com> Tue Mar 28 15:46:28 2023 +0000
committer Kevin Lubick <kjlubick@google.com> Wed Mar 29 12:34:21 2023 +0000
tree 57ea4308e73d7a9c7b391d90d1556d079645b9e0
parent 167d246a659dcc93eae9abac59494fa50c7ea1e0

Use SkImages::BorrowTextureFrom

Follow-up to https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/22135940

Change-Id: Ibc95582a0de139d5d17b225aeadb8bbe6c1f5b9e
Bug: skbug.com/13983

libs/renderengine/skia/AutoBackendTexture.cpp

diff --git a/libs/renderengine/skia/AutoBackendTexture.cpp b/libs/renderengine/skia/AutoBackendTexture.cpp
index 5c122d4..73b3b9c 100644
--- a/libs/renderengine/skia/AutoBackendTexture.cpp
+++ b/libs/renderengine/skia/AutoBackendTexture.cpp
@@ -20,6 +20,9 @@
 #define LOG_TAG "RenderEngine"
 #define ATRACE_TAG ATRACE_TAG_GRAPHICS
 
+#include <SkImage.h>
+#include <include/gpu/ganesh/SkImageGanesh.h>
+
 #include "ColorSpaces.h"
 #include "log/log_main.h"
 #include "utils/Trace.h"
@@ -98,8 +101,9 @@
     }
 
     sk_sp<SkImage> image =
-            SkImage::MakeFromTexture(context, mBackendTexture, kTopLeft_GrSurfaceOrigin, colorType,
-                                     alphaType, toSkColorSpace(dataspace), releaseImageProc, this);
+            SkImages::BorrowTextureFrom(context, mBackendTexture, kTopLeft_GrSurfaceOrigin,
+                                        colorType, alphaType, toSkColorSpace(dataspace),
+                                        releaseImageProc, this);
     if (image.get()) {
         // The following ref will be counteracted by releaseProc, when SkImage is discarded.
         ref();