commit 00f78de60063547347b680585bf3717a7ab9554c
author Robert Phillips <robertphillips@google.com> Wed Jul 01 16:09:43 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jul 01 20:42:25 2020 +0000
tree 765173a3d5a2f36f46f93bf62479c2593f1d8248
parent eba29589225f06c3f22816c4d66a6681b7fc4b52

Update additional tools to take a GrDirectContext

GM was updated in:
https://skia-review.googlesource.com/c/skia/+/300172 (Make GM::onGpuSetup take a GrDirectContext)

This CL updates: skpbench, nanobench, and some testing infrastructure.

Only minor changes were made to the unit tests as they will be updated
en masse in a follow up cl.

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

tools/gpu/ProxyUtils.h

diff --git a/tools/gpu/ProxyUtils.h b/tools/gpu/ProxyUtils.h
index 44b670b..4c83c20 100644
--- a/tools/gpu/ProxyUtils.h
+++ b/tools/gpu/ProxyUtils.h
@@ -13,12 +13,13 @@
 #include "src/gpu/GrPipeline.h"
 #include "src/gpu/GrTextureProxy.h"
 
+class GrDirectContext;
 class GrProgramInfo;
 
 namespace sk_gpu_test {
 
 /** Makes a texture proxy containing the passed in color data. */
-sk_sp<GrTextureProxy> MakeTextureProxyFromData(GrContext*,
+sk_sp<GrTextureProxy> MakeTextureProxyFromData(GrDirectContext*,
                                                GrRenderable,
                                                GrSurfaceOrigin,
                                                const GrImageInfo&,