commit d2a397bcafb722423f56c1517ac472ab81dd6dee
author Jiawei Shao <jiawei.shao@intel.com> Fri Aug 04 00:16:39 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Aug 04 00:16:39 2023 +0000
tree fdb0a0487a260ebfb8a82c1c07bb0b1743ba0751
parent 0bb94304f44102c0b55eeb772d8c3e6935c4b33b

Replace dawn_native with dawn::native

Bug: dawn:824
Change-Id: I31cf206dde2409ed688ee5f5c36c3a9e641f0408
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/144541
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>
Kokoro: Kokoro <noreply+kokoro@google.com>

include/dawn/native/DawnNative.h

diff --git a/include/dawn/native/DawnNative.h b/include/dawn/native/DawnNative.h
index 51b3cc6..a53218b 100644
--- a/include/dawn/native/DawnNative.h
+++ b/include/dawn/native/DawnNative.h
@@ -302,7 +302,4 @@
 using dawn::native::DawnInstanceDescriptor;
 }  // namespace wgpu
 
-// TODO(dawn:824): Remove once the deprecation period is passed.
-namespace dawn_native = dawn::native;
-
 #endif  // INCLUDE_DAWN_NATIVE_DAWNNATIVE_H_

src/dawn/native/BindGroup.cpp

diff --git a/src/dawn/native/BindGroup.cpp b/src/dawn/native/BindGroup.cpp
index 1e91b14..22c83a6 100644
--- a/src/dawn/native/BindGroup.cpp
+++ b/src/dawn/native/BindGroup.cpp
@@ -454,7 +454,7 @@
                 externalTextureBindingEntry->externalTexture->GetParamsBuffer();
             mBindingData.bufferData[paramsBindingIndex].offset = 0;
             mBindingData.bufferData[paramsBindingIndex].size =
-                sizeof(dawn_native::ExternalTextureParams);
+                sizeof(dawn::native::ExternalTextureParams);
 
             continue;
         }

src/dawn/native/BindGroupLayoutInternal.cpp

diff --git a/src/dawn/native/BindGroupLayoutInternal.cpp b/src/dawn/native/BindGroupLayoutInternal.cpp
index eb851f8..969f636 100644
--- a/src/dawn/native/BindGroupLayoutInternal.cpp
+++ b/src/dawn/native/BindGroupLayoutInternal.cpp
@@ -223,7 +223,7 @@
                     kUnimplementedSamplersPerExternalTexture;
             }
 
-            dawn_native::ExternalTextureBindingExpansion bindingExpansion;
+            dawn::native::ExternalTextureBindingExpansion bindingExpansion;
 
             BindGroupLayoutEntry plane0Entry =
                 CreateSampledTextureBindingForExternalTexture(entry.binding, entry.visibility);

src/dawn/native/ShaderModule.cpp

diff --git a/src/dawn/native/ShaderModule.cpp b/src/dawn/native/ShaderModule.cpp
index 4ef6f54..aba2380 100644
--- a/src/dawn/native/ShaderModule.cpp
+++ b/src/dawn/native/ShaderModule.cpp
@@ -381,7 +381,7 @@
         // key in the ExternalTextureBindingExpansions map.
         ExternalTextureBindingExpansionMap expansions =
             layout->GetExternalTextureBindingExpansionMap();
-        std::map<BindingNumber, dawn_native::ExternalTextureBindingExpansion>::iterator it =
+        std::map<BindingNumber, dawn::native::ExternalTextureBindingExpansion>::iterator it =
             expansions.find(bindingNumber);
         // TODO(dawn:563): Provide info about the binding types.
         DAWN_INVALID_IF(it == expansions.end(),