commit cc44feb654fdfedebab36ac89e3367dfa0beb1e0
author Robert Phillips <robertphillips@google.com> Tue Jul 06 12:21:37 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 06 18:28:54 2021 +0000
tree ed47bc32a8904807a65e17cda84ed2c33205db56
parent 943108b0b25d0e13e615dbbdcf712640548d2d0f

Start using skgpu::v1 and skgpu::v2 namespaces

Bug: skia:11837
Change-Id: I042775dae34c99c20048d6d70aa6f06b2a6a268b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/424117
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrDirectContextPriv.h

diff --git a/src/gpu/GrDirectContextPriv.h b/src/gpu/GrDirectContextPriv.h
index fd8f9af..c3cb84a 100644
--- a/src/gpu/GrDirectContextPriv.h
+++ b/src/gpu/GrDirectContextPriv.h
@@ -11,7 +11,7 @@
 #include "include/core/SkSpan.h"
 #include "include/core/SkSurface.h"
 #include "include/gpu/GrDirectContext.h"
-#include "src/gpu/SkBaseGpuDevice.h"
+#include "src/gpu/BaseDevice.h"
 
 class GrAtlasManager;
 class GrBackendFormat;
@@ -146,21 +146,21 @@
         return fContext->fMappedBufferManager.get();
     }
 
-    sk_sp<SkBaseGpuDevice> createDevice(GrColorType,
-                                        sk_sp<GrSurfaceProxy>,
-                                        sk_sp<SkColorSpace>,
-                                        GrSurfaceOrigin,
-                                        const SkSurfaceProps&,
-                                        SkBaseGpuDevice::InitContents);
-    sk_sp<SkBaseGpuDevice> createDevice(SkBudgeted,
-                                        const SkImageInfo&,
-                                        SkBackingFit,
-                                        int sampleCount,
-                                        GrMipmapped,
-                                        GrProtected,
-                                        GrSurfaceOrigin,
-                                        const SkSurfaceProps&,
-                                        SkBaseGpuDevice::InitContents);
+    sk_sp<skgpu::BaseDevice> createDevice(GrColorType,
+                                          sk_sp<GrSurfaceProxy>,
+                                          sk_sp<SkColorSpace>,
+                                          GrSurfaceOrigin,
+                                          const SkSurfaceProps&,
+                                          skgpu::BaseDevice::InitContents);
+    sk_sp<skgpu::BaseDevice> createDevice(SkBudgeted,
+                                          const SkImageInfo&,
+                                          SkBackingFit,
+                                          int sampleCount,
+                                          GrMipmapped,
+                                          GrProtected,
+                                          GrSurfaceOrigin,
+                                          const SkSurfaceProps&,
+                                          skgpu::BaseDevice::InitContents);
 
 #if GR_TEST_UTILS
     /** Reset GPU stats */