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/GrDDLImageTest.cpp

diff --git a/tests/GrDDLImageTest.cpp b/tests/GrDDLImageTest.cpp
index 55da002..9a9cce5 100644
--- a/tests/GrDDLImageTest.cpp
+++ b/tests/GrDDLImageTest.cpp
@@ -14,8 +14,8 @@
     sk_gpu_test::GrContextFactory factory(options);
     for (int ct = 0; ct < sk_gpu_test::GrContextFactory::kContextTypeCnt; ++ct) {
         auto contextType = static_cast<sk_gpu_test::GrContextFactory::ContextType>(ct);
-        auto direct = factory.get(contextType);
-        if (!direct) {
+        auto dContext = factory.get(contextType);
+        if (!dContext) {
             continue;
         }
         SkIRect subsetBounds = SkIRect::MakeLTRB(4,4,8,8);
@@ -31,32 +31,32 @@
         REPORTER_ASSERT(reporter, rasterImg->isValid(static_cast<GrRecordingContext*>(nullptr)));
 
         // raster + context:
-        auto subImg1 = rasterImg->makeSubset(subsetBounds, direct);
-        REPORTER_ASSERT(reporter, subImg1->isValid(direct));
+        auto subImg1 = rasterImg->makeSubset(subsetBounds, dContext);
+        REPORTER_ASSERT(reporter, subImg1->isValid(dContext));
 
         // raster + no context:
         auto subImg2 = rasterImg->makeSubset(subsetBounds, nullptr);
         REPORTER_ASSERT(reporter, subImg2->isValid(static_cast<GrRecordingContext*>(nullptr)));
 
         // Texture image:
-        auto surf = SkSurface::MakeRenderTarget(direct, SkBudgeted::kNo, ii);
+        auto surf = SkSurface::MakeRenderTarget(dContext, SkBudgeted::kNo, ii);
         SkSurfaceCharacterization sc;
         REPORTER_ASSERT(reporter, surf->characterize(&sc));
-        GrBackendTexture tex = direct->createBackendTexture(sc);
-        auto gpuImage = SkImage::MakeFromTexture(direct, tex, kTopLeft_GrSurfaceOrigin,
+        GrBackendTexture tex = dContext->createBackendTexture(sc);
+        auto gpuImage = SkImage::MakeFromTexture(dContext, tex, kTopLeft_GrSurfaceOrigin,
                                                  ii.colorType(), ii.alphaType(),
                                                  ii.refColorSpace());
-        REPORTER_ASSERT(reporter, gpuImage->isValid(direct));
+        REPORTER_ASSERT(reporter, gpuImage->isValid(dContext));
 
         // gpu image + context:
-        auto subImg5 = gpuImage->makeSubset(subsetBounds, direct);
-        REPORTER_ASSERT(reporter, subImg5->isValid(direct));
+        auto subImg5 = gpuImage->makeSubset(subsetBounds, dContext);
+        REPORTER_ASSERT(reporter, subImg5->isValid(dContext));
 
         // gpu image + nullptr:
         REPORTER_ASSERT(reporter, !gpuImage->makeSubset(subsetBounds, nullptr));
 
-        direct->flush();
-        direct->submit(true);
-        direct->deleteBackendTexture(tex);
+        dContext->flush();
+        dContext->submit(true);
+        dContext->deleteBackendTexture(tex);
     }
 }