commit 057c33fe63563e1c1cc38516ab1feef27f63ccc9
author Robert Phillips <robertphillips@google.com> Fri Jul 17 11:59:01 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jul 17 17:11:20 2020 +0000
tree 3ebbb85d33a29faa21aa10b049b5335b56a2cad0
parent 9f1760bf739642d89b69871c01e6611f368aea4a

Clean up some GrContext uses in the GMs

This is part of the effort to replace GrContext with the GrDirectContext/GrRecordingContext pair.

It also tries out, a bit, the context naming proposal (i.e., rContext and dContext).

Change-Id: Ib4d9881f820a7f8a8c525eba7448b1015526400c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/303627
Reviewed-by: Adlai Holler <adlai@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

tools/gpu/YUVUtils.cpp

diff --git a/tools/gpu/YUVUtils.cpp b/tools/gpu/YUVUtils.cpp
index 4b57f4c..bae564d 100644
--- a/tools/gpu/YUVUtils.cpp
+++ b/tools/gpu/YUVUtils.cpp
@@ -8,7 +8,7 @@
 #include "tools/gpu/YUVUtils.h"
 
 #include "include/core/SkData.h"
-#include "include/gpu/GrContext.h"
+#include "include/gpu/GrDirectContext.h"
 #include "src/codec/SkCodecImageGenerator.h"
 #include "src/gpu/GrContextPriv.h"
 
@@ -86,7 +86,8 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-void YUVABackendReleaseContext::Unwind(GrContext* context, YUVABackendReleaseContext* beContext,
+void YUVABackendReleaseContext::Unwind(GrDirectContext* dContext,
+                                       YUVABackendReleaseContext* beContext,
                                        bool fullFlush) {
 
     // Some backends (e.g., Vulkan) require that all work associated w/ texture
@@ -94,29 +95,28 @@
     if (fullFlush) {
         // If the release context client performed some operations other than backend texture
         // creation then we may require a full flush to ensure that all the work is completed.
-        context->flush();
-        context->submit(true);
+        dContext->flush();
+        dContext->submit(true);
     } else {
-        context->submit();
+        dContext->submit();
 
         while (!beContext->creationCompleted()) {
-            context->checkAsyncWorkCompletion();
+            dContext->checkAsyncWorkCompletion();
         }
     }
 
     delete beContext;
 }
 
-YUVABackendReleaseContext::YUVABackendReleaseContext(GrContext* context) : fContext(context) {
-    SkASSERT(context->priv().getGpu());
-    SkASSERT(context->asDirectContext());
+YUVABackendReleaseContext::YUVABackendReleaseContext(GrDirectContext* dContext)
+        : fDContext(dContext) {
 }
 
 YUVABackendReleaseContext::~YUVABackendReleaseContext() {
     for (int i = 0; i < 4; ++i) {
         if (fBETextures[i].isValid()) {
             SkASSERT(fCreationComplete[i]);
-            fContext->deleteBackendTexture(fBETextures[i]);
+            fDContext->deleteBackendTexture(fBETextures[i]);
         }
     }
 }