commit cade5e1a7eb18d9dddb3fd4a7dd5ca1d73864571
author Jiawei Shao <jiawei.shao@intel.com> Tue Sep 05 03:09:56 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Sep 05 03:09:56 2023 +0000
tree 357aeeffab273c7610d21094cb7ab3db2a650c1d
parent 39289b7d9605e05d4be55a0f042522d6059f1030

Remove wgpu::DawnInstanceDescriptor

Bug: dawn:1374
Change-Id: I33cc7526b40909f17356bd246ae22c7d788d198b
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/149227
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

include/dawn/native/DawnNative.h

diff --git a/include/dawn/native/DawnNative.h b/include/dawn/native/DawnNative.h
index 755f7ec..cf9bd2c 100644
--- a/include/dawn/native/DawnNative.h
+++ b/include/dawn/native/DawnNative.h
@@ -290,10 +290,4 @@
 
 }  // namespace dawn::native
 
-// Alias the DawnInstanceDescriptor up to wgpu.
-// TODO(dawn:1374) Remove this aliasing once the usages are updated.
-namespace wgpu {
-using dawn::native::DawnInstanceDescriptor;
-}  // namespace wgpu
-
 #endif  // INCLUDE_DAWN_NATIVE_DAWNNATIVE_H_

src/dawn/tests/DawnNativeTest.cpp

diff --git a/src/dawn/tests/DawnNativeTest.cpp b/src/dawn/tests/DawnNativeTest.cpp
index 6b912ef..251a85e 100644
--- a/src/dawn/tests/DawnNativeTest.cpp
+++ b/src/dawn/tests/DawnNativeTest.cpp
@@ -54,7 +54,7 @@
     instanceToggles.enabledToggles = &allowUnsafeApisToggle;
 
     platform = CreateTestPlatform();
-    wgpu::DawnInstanceDescriptor dawnInstanceDesc;
+    dawn::native::DawnInstanceDescriptor dawnInstanceDesc;
     dawnInstanceDesc.platform = platform.get();
     dawnInstanceDesc.nextInChain = &instanceToggles;
 

src/dawn/tests/DawnTest.cpp

diff --git a/src/dawn/tests/DawnTest.cpp b/src/dawn/tests/DawnTest.cpp
index 14ee3c5..374bb69 100644
--- a/src/dawn/tests/DawnTest.cpp
+++ b/src/dawn/tests/DawnTest.cpp
@@ -396,7 +396,7 @@
     instanceToggles.enabledToggleCount = 1;
     instanceToggles.enabledToggles = &allowUnsafeApisToggle;
 
-    wgpu::DawnInstanceDescriptor dawnInstanceDesc;
+    dawn::native::DawnInstanceDescriptor dawnInstanceDesc;
     dawnInstanceDesc.platform = platform;
     dawnInstanceDesc.nextInChain = &instanceToggles;