commit 3cc8d4fb7ffe2e3466deb12a49fa202b0691148e
author Stephen White <senorblanco@chromium.org> Wed Oct 30 09:56:23 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 30 14:29:46 2019 +0000
tree e12a1a6071288f51021f86402d33b4e450d2a566
parent d2baa3d0f8c30abb90410035a72394729874ca93

Dawn: s/dawn::/wgpu::/g.

The new webgpu_cpp.h hotness for native apps brings with it a new
namespace: wgpu. This is a straight substitution.

Note: no Skia API changes.
Change-Id: I12b26417e76838cd8fa2b39b8161cbaa2cd8fa78
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/251660
Commit-Queue: Stephen White <senorblanco@chromium.org>
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

tools/gpu/dawn/DawnTestContext.cpp

diff --git a/tools/gpu/dawn/DawnTestContext.cpp b/tools/gpu/dawn/DawnTestContext.cpp
index 97ed871..5ab7af9 100644
--- a/tools/gpu/dawn/DawnTestContext.cpp
+++ b/tools/gpu/dawn/DawnTestContext.cpp
@@ -80,7 +80,7 @@
 
 class DawnFence {
 public:
-    DawnFence(const dawn::Device& device, const dawn::Buffer& buffer)
+    DawnFence(const wgpu::Device& device, const wgpu::Buffer& buffer)
       : fDevice(device), fBuffer(buffer), fCalled(false) {
         fBuffer.MapReadAsync(callback, this);
     }
@@ -100,11 +100,11 @@
         DawnFence* fence = static_cast<DawnFence*>(userData);
         fence->fCalled = true;
     }
-    dawn::Buffer buffer() { return fBuffer; }
+    wgpu::Buffer buffer() { return fBuffer; }
 
 private:
-    dawn::Device                   fDevice;
-    dawn::Buffer                   fBuffer;
+    wgpu::Device                   fDevice;
+    wgpu::Buffer                   fBuffer;
     bool                           fCalled;
 };
 
@@ -113,17 +113,17 @@
  */
 class DawnFenceSync : public sk_gpu_test::FenceSync {
 public:
-    DawnFenceSync(dawn::Device device) : fDevice(device) {
+    DawnFenceSync(wgpu::Device device) : fDevice(device) {
     }
 
     ~DawnFenceSync() override {
     }
 
     sk_gpu_test::PlatformFence SK_WARN_UNUSED_RESULT insertFence() const override {
-        dawn::Buffer buffer;
+        wgpu::Buffer buffer;
         if (fBuffers.empty()) {
-            dawn::BufferDescriptor desc;
-            desc.usage = dawn::BufferUsage::MapRead | dawn::BufferUsage::CopyDst;
+            wgpu::BufferDescriptor desc;
+            desc.usage = wgpu::BufferUsage::MapRead | wgpu::BufferUsage::CopyDst;
             desc.size = 1;
             buffer = fDevice.CreateBuffer(&desc);
         } else {
@@ -147,15 +147,15 @@
     }
 
 private:
-    dawn::Device                      fDevice;
-    mutable std::vector<dawn::Buffer> fBuffers;
+    wgpu::Device                      fDevice;
+    mutable std::vector<wgpu::Buffer> fBuffers;
     mutable AutoreleasePool           fAutoreleasePool;
     typedef sk_gpu_test::FenceSync INHERITED;
 };
 
 class DawnTestContextImpl : public sk_gpu_test::DawnTestContext {
 public:
-    static dawn::Device createDevice(const dawn_native::Instance& instance,
+    static wgpu::Device createDevice(const dawn_native::Instance& instance,
                                      dawn_native::BackendType type) {
         DawnProcTable backendProcs = dawn_native::GetProcs();
         dawnProcSetProcs(&backendProcs);
@@ -171,7 +171,7 @@
 
     static DawnTestContext* Create(DawnTestContext* sharedContext) {
         std::unique_ptr<dawn_native::Instance> instance = std::make_unique<dawn_native::Instance>();
-        dawn::Device device;
+        wgpu::Device device;
         if (sharedContext) {
             device = sharedContext->getDevice();
         } else {
@@ -227,7 +227,7 @@
 
 private:
     DawnTestContextImpl(std::unique_ptr<dawn_native::Instance> instance,
-                        const dawn::Device& device)
+                        const wgpu::Device& device)
             : DawnTestContext(device)
             , fInstance(std::move(instance)) {
         fFenceSync.reset(new DawnFenceSync(fDevice));