commit daa9e7455d4f0f54dc07f405becba5d0c5964847
author Adlai Holler <adlai@google.com> Mon Aug 03 12:50:40 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Aug 06 14:02:56 2020 +0000
tree 83eac51be12601d5a2bef789a63685d1e1208c55
parent 066f7d6b1ada68217fba365d30f6dd766ca0139b

Migrate SkImage::MakeFromTexture to GrRecordingContext

Android migration landed in Android CL 12234077
Chrome migration is landing in Chrome CL 2335812

Note: makeFromCompressedTexture is not used by Chrome.

Bug: skia:104662
Change-Id: Ibbe6d412cf22e87188926383d10b21f780208e48
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305102
Commit-Queue: Adlai Holler <adlai@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Auto-Submit: Adlai Holler <adlai@google.com>

tests/GLBackendSurfaceTest.cpp

diff --git a/tests/GLBackendSurfaceTest.cpp b/tests/GLBackendSurfaceTest.cpp
index e748292..2c1026a 100644
--- a/tests/GLBackendSurfaceTest.cpp
+++ b/tests/GLBackendSurfaceTest.cpp
@@ -47,9 +47,9 @@
 }
 
 DEF_GPUTEST_FOR_ALL_GL_CONTEXTS(GLTextureParameters, reporter, ctxInfo) {
-    auto context = ctxInfo.directContext();
+    auto dContext = ctxInfo.directContext();
 
-    GrBackendTexture backendTex = context->createBackendTexture(
+    GrBackendTexture backendTex = dContext->createBackendTexture(
             1, 1, kRGBA_8888_SkColorType, GrMipmapped::kNo, GrRenderable::kNo, GrProtected::kNo);
     REPORTER_ASSERT(reporter, backendTex.isValid());
 
@@ -60,11 +60,11 @@
     REPORTER_ASSERT(reporter, backendTexCopy.isSameTexture(backendTex));
 
     sk_sp<SkImage> wrappedImage =
-            SkImage::MakeFromTexture(context, backendTex, kTopLeft_GrSurfaceOrigin,
+            SkImage::MakeFromTexture(dContext, backendTex, kTopLeft_GrSurfaceOrigin,
                                      kRGBA_8888_SkColorType, kPremul_SkAlphaType, nullptr);
     REPORTER_ASSERT(reporter, wrappedImage);
 
-    const GrSurfaceProxyView* view = as_IB(wrappedImage)->view(context);
+    const GrSurfaceProxyView* view = as_IB(wrappedImage)->view(dContext);
     REPORTER_ASSERT(reporter, view);
     REPORTER_ASSERT(reporter, view->proxy()->isInstantiated());
     auto texture = static_cast<GrGLTexture*>(view->proxy()->peekTexture());
@@ -80,13 +80,13 @@
     REPORTER_ASSERT(reporter, params_invalid(*parameters));
 
     auto surf = SkSurface::MakeRenderTarget(
-            context, SkBudgeted::kYes,
+            dContext, SkBudgeted::kYes,
             SkImageInfo::Make(1, 1, kRGBA_8888_SkColorType, kPremul_SkAlphaType), 1, nullptr);
     REPORTER_ASSERT(reporter, surf);
     surf->getCanvas()->drawImage(wrappedImage, 0, 0);
     surf->flushAndSubmit();
 
-    auto caps = static_cast<const GrGLCaps*>(context->priv().caps());
+    auto caps = static_cast<const GrGLCaps*>(dContext->priv().caps());
     // Now the texture should be in a known state.
     REPORTER_ASSERT(reporter, params_valid(*parameters, caps));
 
@@ -127,8 +127,8 @@
     REPORTER_ASSERT(reporter, GrBackendTexture::TestingOnly_Equals(invalidTexture, invalidTexture));
 
     wrappedImage.reset();
-    context->flush();
-    context->submit(true);
-    context->deleteBackendTexture(backendTex);
+    dContext->flush();
+    dContext->submit(true);
+    dContext->deleteBackendTexture(backendTex);
 }
 #endif