tint->dawn: Move src/dawn_native -> src/dawn/native

Bug: dawn:1275 Change-Id: Ic60a00107a015bc677ff929c492f1085ffc38482 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/79083 Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Ben Clayton <bclayton@chromium.org>
2025-12-15 08:06:19 +00:00 · 2022-02-04 17:07:46 +00:00
parent b2c4d7a244
commit 818001d32e
544 changed files with 3425 additions and 3397 deletions
--- a/src/dawn/native/Adapter.cpp
+++ b/src/dawn/native/Adapter.cpp
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/Adapter.h"
+#include "dawn/native/Adapter.h"

 #include "dawn/common/Constants.h"
-#include "dawn_native/Device.h"
-#include "dawn_native/Instance.h"
-#include "dawn_native/ValidationUtils_autogen.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/Instance.h"
+#include "dawn/native/ValidationUtils_autogen.h"

 namespace dawn::native {

--- a/src/dawn/native/Adapter.h
+++ b/src/dawn/native/Adapter.h
@@ -15,14 +15,14 @@
 #ifndef DAWNNATIVE_ADAPTER_H_
 #define DAWNNATIVE_ADAPTER_H_

-#include "dawn_native/DawnNative.h"
+#include "dawn/native/DawnNative.h"

 #include "dawn/common/RefCounted.h"
 #include "dawn/common/ityp_span.h"
-#include "dawn_native/Error.h"
-#include "dawn_native/Features.h"
-#include "dawn_native/Limits.h"
-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/Features.h"
+#include "dawn/native/Limits.h"
+#include "dawn/native/dawn_platform.h"

 #include <string>

--- a/src/dawn/native/AsyncTask.cpp
+++ b/src/dawn/native/AsyncTask.cpp
@@ -1,4 +1,4 @@
-#include "dawn_native/AsyncTask.h"
+#include "dawn/native/AsyncTask.h"

 #include "dawn/platform/DawnPlatform.h"

--- a/src/dawn/native/AsyncTask.h
+++ b/src/dawn/native/AsyncTask.h
--- a/src/dawn/native/AttachmentState.cpp
+++ b/src/dawn/native/AttachmentState.cpp
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/AttachmentState.h"
+#include "dawn/native/AttachmentState.h"

 #include "dawn/common/BitSetIterator.h"
-#include "dawn_native/Device.h"
-#include "dawn_native/ObjectContentHasher.h"
-#include "dawn_native/Texture.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/ObjectContentHasher.h"
+#include "dawn/native/Texture.h"

 namespace dawn::native {

--- a/src/dawn/native/AttachmentState.h
+++ b/src/dawn/native/AttachmentState.h
@@ -18,11 +18,11 @@
 #include "dawn/common/Constants.h"
 #include "dawn/common/ityp_array.h"
 #include "dawn/common/ityp_bitset.h"
-#include "dawn_native/CachedObject.h"
-#include "dawn_native/IntegerTypes.h"
-#include "dawn_native/ObjectBase.h"
+#include "dawn/native/CachedObject.h"
+#include "dawn/native/IntegerTypes.h"
+#include "dawn/native/ObjectBase.h"

-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/dawn_platform.h"

 #include <array>
 #include <bitset>
--- a/src/dawn/native/BUILD.gn
+++ b/src/dawn/native/BUILD.gn
@@ -0,0 +1,776 @@
+# Copyright 2020 The Dawn Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("../../../scripts/dawn_overrides_with_defaults.gni")
+
+import("//build_overrides/build.gni")
+import("${dawn_root}/generator/dawn_generator.gni")
+import("${dawn_root}/scripts/dawn_component.gni")
+import("${dawn_root}/scripts/dawn_features.gni")
+
+# Import mac_deployment_target
+if (is_mac) {
+  if (dawn_has_build) {
+    import("//build/config/mac/mac_sdk.gni")
+  } else {
+    mac_deployment_target = "10.11.0"
+  }
+}
+
+# The VVLs are an optional dependency, only use it if the path has been set.
+enable_vulkan_validation_layers = dawn_enable_vulkan_validation_layers &&
+                                  dawn_vulkan_validation_layers_dir != ""
+if (enable_vulkan_validation_layers) {
+  import("//build_overrides/vulkan_validation_layers.gni")
+}
+
+# ANGLE is an optional dependency; only use it if the path has been set.
+use_angle = dawn_use_angle && defined(dawn_angle_dir)
+
+# Swiftshader is an optional dependency, only use it if the path has been set.
+use_swiftshader = dawn_use_swiftshader && dawn_swiftshader_dir != ""
+if (use_swiftshader) {
+  assert(dawn_enable_vulkan,
+         "dawn_use_swiftshader requires dawn_enable_vulkan=true")
+  import("${dawn_swiftshader_dir}/src/Vulkan/vulkan.gni")
+}
+
+# The Vulkan loader is an optional dependency, only use it if the path has been
+# set.
+if (dawn_enable_vulkan) {
+  enable_vulkan_loader =
+      dawn_enable_vulkan_loader && dawn_vulkan_loader_dir != ""
+}
+
+group("abseil") {
+  # When build_with_chromium=true we need to include "//third_party/abseil-cpp:absl" while
+  # it's beneficial to be more specific with standalone Dawn, especially when it comes to
+  # including it as a dependency in other projects (such as Skia).
+  if (build_with_chromium) {
+    public_deps = [ "$dawn_abseil_dir:absl" ]
+  } else {
+    public_deps = [ "${dawn_root}/third_party/gn/abseil-cpp:str_format" ]
+  }
+}
+
+config("internal") {
+  configs = [ "${dawn_root}/src/dawn/common:internal_config" ]
+
+  # Suppress warnings that Metal isn't in the deployment target of Chrome:
+  # initialization of the Metal backend is behind a IsMetalSupported check so
+  # Dawn won't call Metal functions on macOS 10.10.
+  # At the time this is written Chromium supports 10.10.0 and above, so if we
+  # aren't on 10.11 it means we are on 10.11 and above, and Metal is available.
+  # Skipping this check on 10.11 and above is important as it allows getting
+  # proper compilation warning when using 10.12 and above feature for example.
+  # TODO(crbug.com/1004024): Consider using API_AVAILABLE annotations on all
+  # metal code in dawn once crbug.com/1004024 is sorted out if Chromium still
+  # supports 10.10 then.
+  if (is_mac && mac_deployment_target == "10.10.0") {
+    cflags_objcc = [ "-Wno-unguarded-availability" ]
+  }
+}
+
+config("weak_framework") {
+  if (is_mac && dawn_enable_metal) {
+    weak_frameworks = [ "Metal.framework" ]
+  }
+}
+
+# Config that adds the @executable_path rpath if needed so that Swiftshader or the Vulkan loader are found.
+config("vulkan_rpath") {
+  if (is_mac && dawn_enable_vulkan &&
+      (use_swiftshader || enable_vulkan_loader)) {
+    ldflags = [
+      "-rpath",
+      "@executable_path/",
+    ]
+  }
+}
+
+dawn_json_generator("utils_gen") {
+  target = "native_utils"
+  outputs = [
+    "src/dawn/native/ChainUtils_autogen.h",
+    "src/dawn/native/ChainUtils_autogen.cpp",
+    "src/dawn/native/ProcTable.cpp",
+    "src/dawn/native/dawn_platform_autogen.h",
+    "src/dawn/native/wgpu_structs_autogen.h",
+    "src/dawn/native/wgpu_structs_autogen.cpp",
+    "src/dawn/native/ValidationUtils_autogen.h",
+    "src/dawn/native/ValidationUtils_autogen.cpp",
+    "src/dawn/native/webgpu_absl_format_autogen.h",
+    "src/dawn/native/webgpu_absl_format_autogen.cpp",
+    "src/dawn/native/ObjectType_autogen.h",
+    "src/dawn/native/ObjectType_autogen.cpp",
+  ]
+}
+
+if (dawn_enable_opengl) {
+  dawn_generator("opengl_loader_gen") {
+    script = "${dawn_root}/generator/opengl_loader_generator.py"
+    args = [
+      "--gl-xml",
+      rebase_path("${dawn_root}/third_party/khronos/gl.xml", root_build_dir),
+      "--supported-extensions",
+      rebase_path("opengl/supported_extensions.json", root_build_dir),
+    ]
+    outputs = [
+      "src/dawn/native/opengl/OpenGLFunctionsBase_autogen.cpp",
+      "src/dawn/native/opengl/OpenGLFunctionsBase_autogen.h",
+      "src/dawn/native/opengl/opengl_platform_autogen.h",
+    ]
+  }
+}
+
+# Public dawn native headers so they can be publicly visible for
+# dependencies of dawn native
+source_set("headers") {
+  public_deps = [ "${dawn_root}/src/dawn:dawncpp_headers" ]
+  all_dependent_configs = [ "${dawn_root}/src/dawn/common:public_include_dirs" ]
+  sources = [
+    "${dawn_root}/src/include/dawn/native/DawnNative.h",
+    "${dawn_root}/src/include/dawn/native/dawn_native_export.h",
+
+    # Include all backend's public headers so that dependencies can include
+    # them even when the backends are disabled.
+    "${dawn_root}/src/include/dawn/native/D3D12Backend.h",
+    "${dawn_root}/src/include/dawn/native/MetalBackend.h",
+    "${dawn_root}/src/include/dawn/native/NullBackend.h",
+    "${dawn_root}/src/include/dawn/native/OpenGLBackend.h",
+    "${dawn_root}/src/include/dawn/native/VulkanBackend.h",
+  ]
+}
+
+# The meat of the compilation for dawn native so that we can cheaply have
+# shared_library / static_library versions of it. It compiles all the files
+# except those that define exported symbols.
+source_set("sources") {
+  deps = [
+    ":headers",
+    ":utils_gen",
+    "${dawn_root}/src/dawn/common",
+    "${dawn_spirv_tools_dir}:spvtools_opt",
+    "${dawn_spirv_tools_dir}:spvtools_val",
+    "${dawn_tint_dir}/src:libtint",
+  ]
+  if (dawn_use_spirv_cross) {
+    deps += [ "${dawn_root}/third_party/gn/spirv_cross:spirv_cross" ]
+  }
+  defines = []
+  libs = []
+  data_deps = []
+
+  configs += [ ":internal" ]
+
+  # Dependencies that are needed to compile dawn native entry points in
+  # FooBackend.cpp need to be public deps so they are propagated to the
+  # dawn native target
+  public_deps = [
+    ":abseil",
+    "${dawn_root}/src/dawn/platform",
+  ]
+
+  sources = get_target_outputs(":utils_gen")
+  sources += [
+    "Adapter.cpp",
+    "Adapter.h",
+    "AsyncTask.cpp",
+    "AsyncTask.h",
+    "AttachmentState.cpp",
+    "AttachmentState.h",
+    "BackendConnection.cpp",
+    "BackendConnection.h",
+    "BindGroup.cpp",
+    "BindGroup.h",
+    "BindGroupLayout.cpp",
+    "BindGroupLayout.h",
+    "BindGroupTracker.h",
+    "BindingInfo.cpp",
+    "BindingInfo.h",
+    "BuddyAllocator.cpp",
+    "BuddyAllocator.h",
+    "BuddyMemoryAllocator.cpp",
+    "BuddyMemoryAllocator.h",
+    "Buffer.cpp",
+    "Buffer.h",
+    "CachedObject.cpp",
+    "CachedObject.h",
+    "CallbackTaskManager.cpp",
+    "CallbackTaskManager.h",
+    "CommandAllocator.cpp",
+    "CommandAllocator.h",
+    "CommandBuffer.cpp",
+    "CommandBuffer.h",
+    "CommandBufferStateTracker.cpp",
+    "CommandBufferStateTracker.h",
+    "CommandEncoder.cpp",
+    "CommandEncoder.h",
+    "CommandValidation.cpp",
+    "CommandValidation.h",
+    "Commands.cpp",
+    "Commands.h",
+    "CompilationMessages.cpp",
+    "CompilationMessages.h",
+    "ComputePassEncoder.cpp",
+    "ComputePassEncoder.h",
+    "ComputePipeline.cpp",
+    "ComputePipeline.h",
+    "CopyTextureForBrowserHelper.cpp",
+    "CopyTextureForBrowserHelper.h",
+    "CreatePipelineAsyncTask.cpp",
+    "CreatePipelineAsyncTask.h",
+    "Device.cpp",
+    "Device.h",
+    "DynamicUploader.cpp",
+    "DynamicUploader.h",
+    "EncodingContext.cpp",
+    "EncodingContext.h",
+    "EnumClassBitmasks.h",
+    "EnumMaskIterator.h",
+    "Error.cpp",
+    "Error.h",
+    "ErrorData.cpp",
+    "ErrorData.h",
+    "ErrorInjector.cpp",
+    "ErrorInjector.h",
+    "ErrorScope.cpp",
+    "ErrorScope.h",
+    "ExternalTexture.cpp",
+    "ExternalTexture.h",
+    "Features.cpp",
+    "Features.h",
+    "Format.cpp",
+    "Format.h",
+    "Forward.h",
+    "IndirectDrawMetadata.cpp",
+    "IndirectDrawMetadata.h",
+    "IndirectDrawValidationEncoder.cpp",
+    "IndirectDrawValidationEncoder.h",
+    "Instance.cpp",
+    "Instance.h",
+    "IntegerTypes.h",
+    "InternalPipelineStore.cpp",
+    "InternalPipelineStore.h",
+    "Limits.cpp",
+    "Limits.h",
+    "ObjectBase.cpp",
+    "ObjectBase.h",
+    "ObjectContentHasher.cpp",
+    "ObjectContentHasher.h",
+    "PassResourceUsage.h",
+    "PassResourceUsageTracker.cpp",
+    "PassResourceUsageTracker.h",
+    "PerStage.cpp",
+    "PerStage.h",
+    "PersistentCache.cpp",
+    "PersistentCache.h",
+    "Pipeline.cpp",
+    "Pipeline.h",
+    "PipelineLayout.cpp",
+    "PipelineLayout.h",
+    "PooledResourceMemoryAllocator.cpp",
+    "PooledResourceMemoryAllocator.h",
+    "ProgrammableEncoder.cpp",
+    "ProgrammableEncoder.h",
+    "QueryHelper.cpp",
+    "QueryHelper.h",
+    "QuerySet.cpp",
+    "QuerySet.h",
+    "Queue.cpp",
+    "Queue.h",
+    "RenderBundle.cpp",
+    "RenderBundle.h",
+    "RenderBundleEncoder.cpp",
+    "RenderBundleEncoder.h",
+    "RenderEncoderBase.cpp",
+    "RenderEncoderBase.h",
+    "RenderPassEncoder.cpp",
+    "RenderPassEncoder.h",
+    "RenderPipeline.cpp",
+    "RenderPipeline.h",
+    "ResourceHeap.h",
+    "ResourceHeapAllocator.h",
+    "ResourceMemoryAllocation.cpp",
+    "ResourceMemoryAllocation.h",
+    "RingBufferAllocator.cpp",
+    "RingBufferAllocator.h",
+    "Sampler.cpp",
+    "Sampler.h",
+    "ScratchBuffer.cpp",
+    "ScratchBuffer.h",
+    "ShaderModule.cpp",
+    "ShaderModule.h",
+    "StagingBuffer.cpp",
+    "StagingBuffer.h",
+    "Subresource.cpp",
+    "Subresource.h",
+    "SubresourceStorage.h",
+    "Surface.cpp",
+    "Surface.h",
+    "SwapChain.cpp",
+    "SwapChain.h",
+    "Texture.cpp",
+    "Texture.h",
+    "TintUtils.cpp",
+    "TintUtils.h",
+    "ToBackend.h",
+    "Toggles.cpp",
+    "Toggles.h",
+    "VertexFormat.cpp",
+    "VertexFormat.h",
+    "dawn_platform.h",
+    "utils/WGPUHelpers.cpp",
+    "utils/WGPUHelpers.h",
+    "webgpu_absl_format.cpp",
+    "webgpu_absl_format.h",
+  ]
+
+  if (dawn_use_x11) {
+    libs += [ "X11" ]
+    sources += [
+      "XlibXcbFunctions.cpp",
+      "XlibXcbFunctions.h",
+    ]
+  }
+
+  # Only win32 app needs to link with user32.lib
+  # In UWP, all availiable APIs are defined in WindowsApp.lib
+  if (is_win && !dawn_is_winuwp) {
+    libs += [ "user32.lib" ]
+  }
+
+  if (dawn_is_winuwp && is_debug) {
+    # DXGIGetDebugInterface1 is defined in dxgi.lib
+    # But this API is tagged as a development-only capability
+    # which implies that linking to this function will cause
+    # the application to fail Windows store certification
+    # So we only link to it in debug build when compiling for UWP.
+    # In win32 we load dxgi.dll using LoadLibrary
+    # so no need for static linking.
+    libs += [ "dxgi.lib" ]
+  }
+
+  # TODO(dawn:766):
+  # Should link dxcompiler.lib and WinPixEventRuntime_UAP.lib in UWP
+  # Somehow use dxcompiler.lib makes CoreApp unable to activate
+  # WinPIX should be added as third party tools and linked statically
+
+  if (dawn_enable_d3d12) {
+    libs += [ "dxguid.lib" ]
+    sources += [
+      "d3d12/AdapterD3D12.cpp",
+      "d3d12/AdapterD3D12.h",
+      "d3d12/BackendD3D12.cpp",
+      "d3d12/BackendD3D12.h",
+      "d3d12/BindGroupD3D12.cpp",
+      "d3d12/BindGroupD3D12.h",
+      "d3d12/BindGroupLayoutD3D12.cpp",
+      "d3d12/BindGroupLayoutD3D12.h",
+      "d3d12/BufferD3D12.cpp",
+      "d3d12/BufferD3D12.h",
+      "d3d12/CPUDescriptorHeapAllocationD3D12.cpp",
+      "d3d12/CPUDescriptorHeapAllocationD3D12.h",
+      "d3d12/CommandAllocatorManager.cpp",
+      "d3d12/CommandAllocatorManager.h",
+      "d3d12/CommandBufferD3D12.cpp",
+      "d3d12/CommandBufferD3D12.h",
+      "d3d12/CommandRecordingContext.cpp",
+      "d3d12/CommandRecordingContext.h",
+      "d3d12/ComputePipelineD3D12.cpp",
+      "d3d12/ComputePipelineD3D12.h",
+      "d3d12/D3D11on12Util.cpp",
+      "d3d12/D3D11on12Util.h",
+      "d3d12/D3D12Error.cpp",
+      "d3d12/D3D12Error.h",
+      "d3d12/D3D12Info.cpp",
+      "d3d12/D3D12Info.h",
+      "d3d12/DeviceD3D12.cpp",
+      "d3d12/DeviceD3D12.h",
+      "d3d12/Forward.h",
+      "d3d12/GPUDescriptorHeapAllocationD3D12.cpp",
+      "d3d12/GPUDescriptorHeapAllocationD3D12.h",
+      "d3d12/HeapAllocatorD3D12.cpp",
+      "d3d12/HeapAllocatorD3D12.h",
+      "d3d12/HeapD3D12.cpp",
+      "d3d12/HeapD3D12.h",
+      "d3d12/IntegerTypes.h",
+      "d3d12/NativeSwapChainImplD3D12.cpp",
+      "d3d12/NativeSwapChainImplD3D12.h",
+      "d3d12/PageableD3D12.cpp",
+      "d3d12/PageableD3D12.h",
+      "d3d12/PipelineLayoutD3D12.cpp",
+      "d3d12/PipelineLayoutD3D12.h",
+      "d3d12/PlatformFunctions.cpp",
+      "d3d12/PlatformFunctions.h",
+      "d3d12/QuerySetD3D12.cpp",
+      "d3d12/QuerySetD3D12.h",
+      "d3d12/QueueD3D12.cpp",
+      "d3d12/QueueD3D12.h",
+      "d3d12/RenderPassBuilderD3D12.cpp",
+      "d3d12/RenderPassBuilderD3D12.h",
+      "d3d12/RenderPipelineD3D12.cpp",
+      "d3d12/RenderPipelineD3D12.h",
+      "d3d12/ResidencyManagerD3D12.cpp",
+      "d3d12/ResidencyManagerD3D12.h",
+      "d3d12/ResourceAllocatorManagerD3D12.cpp",
+      "d3d12/ResourceAllocatorManagerD3D12.h",
+      "d3d12/ResourceHeapAllocationD3D12.cpp",
+      "d3d12/ResourceHeapAllocationD3D12.h",
+      "d3d12/SamplerD3D12.cpp",
+      "d3d12/SamplerD3D12.h",
+      "d3d12/SamplerHeapCacheD3D12.cpp",
+      "d3d12/SamplerHeapCacheD3D12.h",
+      "d3d12/ShaderModuleD3D12.cpp",
+      "d3d12/ShaderModuleD3D12.h",
+      "d3d12/ShaderVisibleDescriptorAllocatorD3D12.cpp",
+      "d3d12/ShaderVisibleDescriptorAllocatorD3D12.h",
+      "d3d12/StagingBufferD3D12.cpp",
+      "d3d12/StagingBufferD3D12.h",
+      "d3d12/StagingDescriptorAllocatorD3D12.cpp",
+      "d3d12/StagingDescriptorAllocatorD3D12.h",
+      "d3d12/SwapChainD3D12.cpp",
+      "d3d12/SwapChainD3D12.h",
+      "d3d12/TextureCopySplitter.cpp",
+      "d3d12/TextureCopySplitter.h",
+      "d3d12/TextureD3D12.cpp",
+      "d3d12/TextureD3D12.h",
+      "d3d12/UtilsD3D12.cpp",
+      "d3d12/UtilsD3D12.h",
+      "d3d12/d3d12_platform.h",
+    ]
+  }
+
+  if (dawn_enable_metal) {
+    frameworks = [
+      "Cocoa.framework",
+      "IOKit.framework",
+      "IOSurface.framework",
+      "QuartzCore.framework",
+    ]
+    sources += [
+      "Surface_metal.mm",
+      "metal/BackendMTL.h",
+      "metal/BackendMTL.mm",
+      "metal/BindGroupLayoutMTL.h",
+      "metal/BindGroupLayoutMTL.mm",
+      "metal/BindGroupMTL.h",
+      "metal/BindGroupMTL.mm",
+      "metal/BufferMTL.h",
+      "metal/BufferMTL.mm",
+      "metal/CommandBufferMTL.h",
+      "metal/CommandBufferMTL.mm",
+      "metal/CommandRecordingContext.h",
+      "metal/CommandRecordingContext.mm",
+      "metal/ComputePipelineMTL.h",
+      "metal/ComputePipelineMTL.mm",
+      "metal/DeviceMTL.h",
+      "metal/DeviceMTL.mm",
+      "metal/Forward.h",
+      "metal/PipelineLayoutMTL.h",
+      "metal/PipelineLayoutMTL.mm",
+      "metal/QuerySetMTL.h",
+      "metal/QuerySetMTL.mm",
+      "metal/QueueMTL.h",
+      "metal/QueueMTL.mm",
+      "metal/RenderPipelineMTL.h",
+      "metal/RenderPipelineMTL.mm",
+      "metal/SamplerMTL.h",
+      "metal/SamplerMTL.mm",
+      "metal/ShaderModuleMTL.h",
+      "metal/ShaderModuleMTL.mm",
+      "metal/StagingBufferMTL.h",
+      "metal/StagingBufferMTL.mm",
+      "metal/SwapChainMTL.h",
+      "metal/SwapChainMTL.mm",
+      "metal/TextureMTL.h",
+      "metal/TextureMTL.mm",
+      "metal/UtilsMetal.h",
+      "metal/UtilsMetal.mm",
+    ]
+  }
+
+  if (dawn_enable_null) {
+    sources += [
+      "null/DeviceNull.cpp",
+      "null/DeviceNull.h",
+    ]
+  }
+
+  if (dawn_enable_opengl || dawn_enable_vulkan) {
+    sources += [
+      "SpirvValidation.cpp",
+      "SpirvValidation.h",
+    ]
+  }
+
+  if (dawn_enable_opengl) {
+    public_deps += [
+      ":opengl_loader_gen",
+      "${dawn_root}/third_party/khronos:khronos_platform",
+    ]
+    sources += get_target_outputs(":opengl_loader_gen")
+    sources += [
+      "opengl/BackendGL.cpp",
+      "opengl/BackendGL.h",
+      "opengl/BindGroupGL.cpp",
+      "opengl/BindGroupGL.h",
+      "opengl/BindGroupLayoutGL.cpp",
+      "opengl/BindGroupLayoutGL.h",
+      "opengl/BufferGL.cpp",
+      "opengl/BufferGL.h",
+      "opengl/CommandBufferGL.cpp",
+      "opengl/CommandBufferGL.h",
+      "opengl/ComputePipelineGL.cpp",
+      "opengl/ComputePipelineGL.h",
+      "opengl/DeviceGL.cpp",
+      "opengl/DeviceGL.h",
+      "opengl/Forward.h",
+      "opengl/GLFormat.cpp",
+      "opengl/GLFormat.h",
+      "opengl/NativeSwapChainImplGL.cpp",
+      "opengl/NativeSwapChainImplGL.h",
+      "opengl/OpenGLFunctions.cpp",
+      "opengl/OpenGLFunctions.h",
+      "opengl/OpenGLVersion.cpp",
+      "opengl/OpenGLVersion.h",
+      "opengl/PersistentPipelineStateGL.cpp",
+      "opengl/PersistentPipelineStateGL.h",
+      "opengl/PipelineGL.cpp",
+      "opengl/PipelineGL.h",
+      "opengl/PipelineLayoutGL.cpp",
+      "opengl/PipelineLayoutGL.h",
+      "opengl/QuerySetGL.cpp",
+      "opengl/QuerySetGL.h",
+      "opengl/QueueGL.cpp",
+      "opengl/QueueGL.h",
+      "opengl/RenderPipelineGL.cpp",
+      "opengl/RenderPipelineGL.h",
+      "opengl/SamplerGL.cpp",
+      "opengl/SamplerGL.h",
+      "opengl/ShaderModuleGL.cpp",
+      "opengl/ShaderModuleGL.h",
+      "opengl/SpirvUtils.cpp",
+      "opengl/SpirvUtils.h",
+      "opengl/SwapChainGL.cpp",
+      "opengl/SwapChainGL.h",
+      "opengl/TextureGL.cpp",
+      "opengl/TextureGL.h",
+      "opengl/UtilsGL.cpp",
+      "opengl/UtilsGL.h",
+      "opengl/opengl_platform.h",
+    ]
+  }
+
+  if (dawn_enable_vulkan) {
+    public_deps += [ "${dawn_root}/third_party/khronos:vulkan_headers" ]
+    sources += [
+      "vulkan/AdapterVk.cpp",
+      "vulkan/AdapterVk.h",
+      "vulkan/BackendVk.cpp",
+      "vulkan/BackendVk.h",
+      "vulkan/BindGroupLayoutVk.cpp",
+      "vulkan/BindGroupLayoutVk.h",
+      "vulkan/BindGroupVk.cpp",
+      "vulkan/BindGroupVk.h",
+      "vulkan/BufferVk.cpp",
+      "vulkan/BufferVk.h",
+      "vulkan/CommandBufferVk.cpp",
+      "vulkan/CommandBufferVk.h",
+      "vulkan/CommandRecordingContext.h",
+      "vulkan/ComputePipelineVk.cpp",
+      "vulkan/ComputePipelineVk.h",
+      "vulkan/DescriptorSetAllocation.h",
+      "vulkan/DescriptorSetAllocator.cpp",
+      "vulkan/DescriptorSetAllocator.h",
+      "vulkan/DeviceVk.cpp",
+      "vulkan/DeviceVk.h",
+      "vulkan/ExternalHandle.h",
+      "vulkan/FencedDeleter.cpp",
+      "vulkan/FencedDeleter.h",
+      "vulkan/Forward.h",
+      "vulkan/NativeSwapChainImplVk.cpp",
+      "vulkan/NativeSwapChainImplVk.h",
+      "vulkan/PipelineLayoutVk.cpp",
+      "vulkan/PipelineLayoutVk.h",
+      "vulkan/QuerySetVk.cpp",
+      "vulkan/QuerySetVk.h",
+      "vulkan/QueueVk.cpp",
+      "vulkan/QueueVk.h",
+      "vulkan/RenderPassCache.cpp",
+      "vulkan/RenderPassCache.h",
+      "vulkan/RenderPipelineVk.cpp",
+      "vulkan/RenderPipelineVk.h",
+      "vulkan/ResourceHeapVk.cpp",
+      "vulkan/ResourceHeapVk.h",
+      "vulkan/ResourceMemoryAllocatorVk.cpp",
+      "vulkan/ResourceMemoryAllocatorVk.h",
+      "vulkan/SamplerVk.cpp",
+      "vulkan/SamplerVk.h",
+      "vulkan/ShaderModuleVk.cpp",
+      "vulkan/ShaderModuleVk.h",
+      "vulkan/StagingBufferVk.cpp",
+      "vulkan/StagingBufferVk.h",
+      "vulkan/SwapChainVk.cpp",
+      "vulkan/SwapChainVk.h",
+      "vulkan/TextureVk.cpp",
+      "vulkan/TextureVk.h",
+      "vulkan/UtilsVulkan.cpp",
+      "vulkan/UtilsVulkan.h",
+      "vulkan/VulkanError.cpp",
+      "vulkan/VulkanError.h",
+      "vulkan/VulkanExtensions.cpp",
+      "vulkan/VulkanExtensions.h",
+      "vulkan/VulkanFunctions.cpp",
+      "vulkan/VulkanFunctions.h",
+      "vulkan/VulkanInfo.cpp",
+      "vulkan/VulkanInfo.h",
+      "vulkan/external_memory/MemoryService.h",
+      "vulkan/external_semaphore/SemaphoreService.h",
+    ]
+
+    if (is_chromeos) {
+      sources += [
+        "vulkan/external_memory/MemoryServiceDmaBuf.cpp",
+        "vulkan/external_semaphore/SemaphoreServiceFD.cpp",
+      ]
+      defines += [ "DAWN_USE_SYNC_FDS" ]
+    } else if (is_linux) {
+      sources += [
+        "vulkan/external_memory/MemoryServiceOpaqueFD.cpp",
+        "vulkan/external_semaphore/SemaphoreServiceFD.cpp",
+      ]
+    } else if (is_fuchsia) {
+      sources += [
+        "vulkan/external_memory/MemoryServiceZirconHandle.cpp",
+        "vulkan/external_semaphore/SemaphoreServiceZirconHandle.cpp",
+      ]
+    } else {
+      sources += [
+        "vulkan/external_memory/MemoryServiceNull.cpp",
+        "vulkan/external_semaphore/SemaphoreServiceNull.cpp",
+      ]
+    }
+    if (build_with_chromium && is_fuchsia) {
+      # Necessary to ensure that the Vulkan libraries will be in the
+      # final Fuchsia package.
+      data_deps = [
+        "//third_party/fuchsia-sdk:vulkan_base",
+        "//third_party/fuchsia-sdk:vulkan_validation",
+
+        # NOTE: The line below is a work around for http://crbug.com/1001081
+        "//third_party/fuchsia-sdk/sdk:trace_engine",
+      ]
+    }
+    if (dawn_is_winuwp) {
+      defines += [ "DAWN_IS_WINUWP" ]
+    }
+    if (enable_vulkan_validation_layers) {
+      defines += [
+        "DAWN_ENABLE_VULKAN_VALIDATION_LAYERS",
+        "DAWN_VK_DATA_DIR=\"$vulkan_data_subdir\"",
+      ]
+    }
+    if (enable_vulkan_loader) {
+      data_deps += [ "${dawn_vulkan_loader_dir}:libvulkan" ]
+    }
+    if (use_swiftshader) {
+      data_deps +=
+          [ "${dawn_swiftshader_dir}/src/Vulkan:swiftshader_libvulkan" ]
+      defines += [ "DAWN_ENABLE_SWIFTSHADER" ]
+    }
+  }
+
+  if (use_angle) {
+    data_deps += [
+      "${dawn_angle_dir}:libEGL",
+      "${dawn_angle_dir}:libGLESv2",
+    ]
+  }
+}
+
+# The static and shared libraries for dawn_native. Most of the files are
+# already compiled in dawn_native_sources, but we still need to compile
+# files defining exported symbols.
+dawn_component("native") {
+  DEFINE_PREFIX = "DAWN_NATIVE"
+
+  #Make headers publically visible
+  public_deps = [ ":headers" ]
+
+  deps = [
+    ":sources",
+    "${dawn_root}/src/dawn/common",
+  ]
+  sources = [ "DawnNative.cpp" ]
+  configs = [ ":internal" ]
+  public_configs = [
+    ":weak_framework",
+    ":vulkan_rpath",
+  ]
+
+  if (dawn_enable_d3d12) {
+    sources += [ "d3d12/D3D12Backend.cpp" ]
+  }
+  if (dawn_enable_metal) {
+    sources += [ "metal/MetalBackend.mm" ]
+  }
+  if (dawn_enable_null) {
+    sources += [ "null/NullBackend.cpp" ]
+  }
+  if (dawn_enable_opengl) {
+    sources += [ "opengl/OpenGLBackend.cpp" ]
+  }
+  if (dawn_enable_vulkan) {
+    sources += [ "vulkan/VulkanBackend.cpp" ]
+
+    if (enable_vulkan_validation_layers) {
+      data_deps =
+          [ "${dawn_vulkan_validation_layers_dir}:vulkan_validation_layers" ]
+      if (!is_android) {
+        data_deps +=
+            [ "${dawn_vulkan_validation_layers_dir}:vulkan_gen_json_files" ]
+      }
+    }
+  }
+}
+
+dawn_json_generator("webgpu_dawn_native_proc_gen") {
+  target = "webgpu_dawn_native_proc"
+  outputs = [ "src/dawn/native/webgpu_dawn_native_proc.cpp" ]
+}
+
+dawn_component("webgpu_dawn") {
+  # For a single library - build `webgpu_dawn_shared` with GN args:
+  #   dawn_complete_static_libs = true - to package a single lib
+  #
+  #   is_debug = false
+  #    - setting this to true makes library over 50Mb
+  #
+  #   use_custom_libcxx = false
+  #    - Otherwise, libc++ symbols may conflict if the
+  #      library is used outside of Chromium.
+  #
+  #   dawn_use_swiftshader = false
+  #   angle_enable_swiftshader = false
+  #    - SwiftShader can't be built without use_custom_libcxx.
+  #      It should be built separately.
+  DEFINE_PREFIX = "WGPU"
+
+  sources = get_target_outputs(":webgpu_dawn_native_proc_gen")
+  deps = [
+    ":static",
+    ":webgpu_dawn_native_proc_gen",
+  ]
+}
--- a/src/dawn/native/BackendConnection.cpp
+++ b/src/dawn/native/BackendConnection.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/BackendConnection.h"
+#include "dawn/native/BackendConnection.h"

 namespace dawn::native {

--- a/src/dawn/native/BackendConnection.h
+++ b/src/dawn/native/BackendConnection.h
@@ -15,8 +15,8 @@
 #ifndef DAWNNATIVE_BACKENDCONNECTION_H_
 #define DAWNNATIVE_BACKENDCONNECTION_H_

-#include "dawn_native/Adapter.h"
-#include "dawn_native/DawnNative.h"
+#include "dawn/native/Adapter.h"
+#include "dawn/native/DawnNative.h"

 #include <memory>

--- a/src/dawn/native/BindGroup.cpp
+++ b/src/dawn/native/BindGroup.cpp
@@ -12,20 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/BindGroup.h"
+#include "dawn/native/BindGroup.h"

 #include "dawn/common/Assert.h"
 #include "dawn/common/Math.h"
 #include "dawn/common/ityp_bitset.h"
-#include "dawn_native/BindGroupLayout.h"
-#include "dawn_native/Buffer.h"
-#include "dawn_native/ChainUtils_autogen.h"
-#include "dawn_native/Device.h"
-#include "dawn_native/ExternalTexture.h"
-#include "dawn_native/ObjectBase.h"
-#include "dawn_native/ObjectType_autogen.h"
-#include "dawn_native/Sampler.h"
-#include "dawn_native/Texture.h"
+#include "dawn/native/BindGroupLayout.h"
+#include "dawn/native/Buffer.h"
+#include "dawn/native/ChainUtils_autogen.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/ExternalTexture.h"
+#include "dawn/native/ObjectBase.h"
+#include "dawn/native/ObjectType_autogen.h"
+#include "dawn/native/Sampler.h"
+#include "dawn/native/Texture.h"

 namespace dawn::native {

--- a/src/dawn/native/BindGroup.h
+++ b/src/dawn/native/BindGroup.h
@@ -17,12 +17,12 @@

 #include "dawn/common/Constants.h"
 #include "dawn/common/Math.h"
-#include "dawn_native/BindGroupLayout.h"
-#include "dawn_native/Error.h"
-#include "dawn_native/Forward.h"
-#include "dawn_native/ObjectBase.h"
+#include "dawn/native/BindGroupLayout.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/Forward.h"
+#include "dawn/native/ObjectBase.h"

-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/dawn_platform.h"

 #include <array>

--- a/src/dawn/native/BindGroupLayout.cpp
+++ b/src/dawn/native/BindGroupLayout.cpp
@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/BindGroupLayout.h"
+#include "dawn/native/BindGroupLayout.h"

 #include "dawn/common/BitSetIterator.h"

-#include "dawn_native/ChainUtils_autogen.h"
-#include "dawn_native/Device.h"
-#include "dawn_native/ObjectBase.h"
-#include "dawn_native/ObjectContentHasher.h"
-#include "dawn_native/ObjectType_autogen.h"
-#include "dawn_native/PerStage.h"
-#include "dawn_native/ValidationUtils_autogen.h"
+#include "dawn/native/ChainUtils_autogen.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/ObjectBase.h"
+#include "dawn/native/ObjectContentHasher.h"
+#include "dawn/native/ObjectType_autogen.h"
+#include "dawn/native/PerStage.h"
+#include "dawn/native/ValidationUtils_autogen.h"

 #include <algorithm>
 #include <functional>
--- a/src/dawn/native/BindGroupLayout.h
+++ b/src/dawn/native/BindGroupLayout.h
@@ -20,13 +20,13 @@
 #include "dawn/common/SlabAllocator.h"
 #include "dawn/common/ityp_span.h"
 #include "dawn/common/ityp_vector.h"
-#include "dawn_native/BindingInfo.h"
-#include "dawn_native/CachedObject.h"
-#include "dawn_native/Error.h"
-#include "dawn_native/Forward.h"
-#include "dawn_native/ObjectBase.h"
+#include "dawn/native/BindingInfo.h"
+#include "dawn/native/CachedObject.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/Forward.h"
+#include "dawn/native/ObjectBase.h"

-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/dawn_platform.h"

 #include <bitset>
 #include <map>
--- a/src/dawn/native/BindGroupTracker.h
+++ b/src/dawn/native/BindGroupTracker.h
@@ -16,9 +16,9 @@
 #define DAWNNATIVE_BINDGROUPTRACKER_H_

 #include "dawn/common/Constants.h"
-#include "dawn_native/BindGroupLayout.h"
-#include "dawn_native/Pipeline.h"
-#include "dawn_native/PipelineLayout.h"
+#include "dawn/native/BindGroupLayout.h"
+#include "dawn/native/Pipeline.h"
+#include "dawn/native/PipelineLayout.h"

 #include <array>
 #include <bitset>
--- a/src/dawn/native/BindingInfo.cpp
+++ b/src/dawn/native/BindingInfo.cpp
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/BindingInfo.h"
+#include "dawn/native/BindingInfo.h"

-#include "dawn_native/ChainUtils_autogen.h"
+#include "dawn/native/ChainUtils_autogen.h"

 namespace dawn::native {

--- a/src/dawn/native/BindingInfo.h
+++ b/src/dawn/native/BindingInfo.h
@@ -17,12 +17,12 @@

 #include "dawn/common/Constants.h"
 #include "dawn/common/ityp_array.h"
-#include "dawn_native/Error.h"
-#include "dawn_native/Format.h"
-#include "dawn_native/IntegerTypes.h"
-#include "dawn_native/PerStage.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/Format.h"
+#include "dawn/native/IntegerTypes.h"
+#include "dawn/native/PerStage.h"

-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/dawn_platform.h"

 #include <cstdint>

--- a/src/dawn/native/BuddyAllocator.cpp
+++ b/src/dawn/native/BuddyAllocator.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/BuddyAllocator.h"
+#include "dawn/native/BuddyAllocator.h"

 #include "dawn/common/Assert.h"
 #include "dawn/common/Math.h"
--- a/src/dawn/native/BuddyAllocator.h
+++ b/src/dawn/native/BuddyAllocator.h
--- a/src/dawn/native/BuddyMemoryAllocator.cpp
+++ b/src/dawn/native/BuddyMemoryAllocator.cpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/BuddyMemoryAllocator.h"
+#include "dawn/native/BuddyMemoryAllocator.h"

 #include "dawn/common/Math.h"
-#include "dawn_native/ResourceHeapAllocator.h"
+#include "dawn/native/ResourceHeapAllocator.h"

 namespace dawn::native {

--- a/src/dawn/native/BuddyMemoryAllocator.h
+++ b/src/dawn/native/BuddyMemoryAllocator.h
@@ -15,9 +15,9 @@
 #ifndef DAWNNATIVE_BUDDYMEMORYALLOCATOR_H_
 #define DAWNNATIVE_BUDDYMEMORYALLOCATOR_H_

-#include "dawn_native/BuddyAllocator.h"
-#include "dawn_native/Error.h"
-#include "dawn_native/ResourceMemoryAllocation.h"
+#include "dawn/native/BuddyAllocator.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/ResourceMemoryAllocation.h"

 #include <memory>
 #include <vector>
--- a/src/dawn/native/Buffer.cpp
+++ b/src/dawn/native/Buffer.cpp
@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/Buffer.h"
+#include "dawn/native/Buffer.h"

 #include "dawn/common/Alloc.h"
 #include "dawn/common/Assert.h"
-#include "dawn_native/Commands.h"
-#include "dawn_native/Device.h"
-#include "dawn_native/DynamicUploader.h"
-#include "dawn_native/ErrorData.h"
-#include "dawn_native/ObjectType_autogen.h"
-#include "dawn_native/Queue.h"
-#include "dawn_native/ValidationUtils_autogen.h"
+#include "dawn/native/Commands.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/DynamicUploader.h"
+#include "dawn/native/ErrorData.h"
+#include "dawn/native/ObjectType_autogen.h"
+#include "dawn/native/Queue.h"
+#include "dawn/native/ValidationUtils_autogen.h"

 #include <cstdio>
 #include <cstring>
--- a/src/dawn/native/Buffer.h
+++ b/src/dawn/native/Buffer.h
@@ -15,12 +15,12 @@
 #ifndef DAWNNATIVE_BUFFER_H_
 #define DAWNNATIVE_BUFFER_H_

-#include "dawn_native/Error.h"
-#include "dawn_native/Forward.h"
-#include "dawn_native/IntegerTypes.h"
-#include "dawn_native/ObjectBase.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/Forward.h"
+#include "dawn/native/IntegerTypes.h"
+#include "dawn/native/ObjectBase.h"

-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/dawn_platform.h"

 #include <memory>

--- a/src/dawn/native/CMakeLists.txt
+++ b/src/dawn/native/CMakeLists.txt
@@ -13,7 +13,7 @@
 # limitations under the License.

 DawnJSONGenerator(
-    TARGET "dawn_native_utils"
+    TARGET "native_utils"
    PRINT_NAME "Dawn native utilities"
    RESULT_VARIABLE "DAWN_NATIVE_UTILS_GEN_SOURCES"
 )
@@ -26,8 +26,8 @@ if(BUILD_SHARED_LIBS)
 endif()

 target_sources(dawn_native PRIVATE
-    "${DAWN_INCLUDE_DIR}/dawn_native/DawnNative.h"
-    "${DAWN_INCLUDE_DIR}/dawn_native/dawn_native_export.h"
+    "${DAWN_INCLUDE_DIR}/dawn/native/DawnNative.h"
+    "${DAWN_INCLUDE_DIR}/dawn/native/dawn_native_export.h"
    ${DAWN_NATIVE_UTILS_GEN_SOURCES}
    "Adapter.cpp"
    "Adapter.h"
@@ -231,7 +231,7 @@ endif()

 if (DAWN_ENABLE_D3D12)
    target_sources(dawn_native PRIVATE
-        "${DAWN_INCLUDE_DIR}/dawn_native/D3D12Backend.h"
+        "${DAWN_INCLUDE_DIR}/dawn/native/D3D12Backend.h"
        "d3d12/AdapterD3D12.cpp"
        "d3d12/AdapterD3D12.h"
        "d3d12/BackendD3D12.cpp"
@@ -317,7 +317,7 @@ endif()

 if (DAWN_ENABLE_METAL)
    target_sources(dawn_native PRIVATE
-        "${DAWN_INCLUDE_DIR}/dawn_native/MetalBackend.h"
+        "${DAWN_INCLUDE_DIR}/dawn/native/MetalBackend.h"
        "Surface_metal.mm"
        "metal/BackendMTL.h"
        "metal/BackendMTL.mm"
@@ -368,7 +368,7 @@ endif()

 if (DAWN_ENABLE_NULL)
    target_sources(dawn_native PRIVATE
-        "${DAWN_INCLUDE_DIR}/dawn_native/NullBackend.h"
+        "${DAWN_INCLUDE_DIR}/dawn/native/NullBackend.h"
        "null/DeviceNull.cpp"
        "null/DeviceNull.h"
    )
@@ -388,12 +388,12 @@ if (DAWN_ENABLE_OPENGL)
        ARGS "--gl-xml"
             "${Dawn_SOURCE_DIR}/third_party/khronos/gl.xml"
             "--supported-extensions"
-             "${Dawn_SOURCE_DIR}/src/dawn_native/opengl/supported_extensions.json"
+             "${Dawn_SOURCE_DIR}/src/dawn/native/opengl/supported_extensions.json"
        RESULT_VARIABLE "DAWN_NATIVE_OPENGL_AUTOGEN_SOURCES"
    )

    target_sources(dawn_native PRIVATE
-        "${DAWN_INCLUDE_DIR}/dawn_native/OpenGLBackend.h"
+        "${DAWN_INCLUDE_DIR}/dawn/native/OpenGLBackend.h"
        ${DAWN_NATIVE_OPENGL_AUTOGEN_SOURCES}
        "opengl/BackendGL.cpp"
        "opengl/BackendGL.h"
@@ -450,7 +450,7 @@ endif()

 if (DAWN_ENABLE_VULKAN)
    target_sources(dawn_native PRIVATE
-        "${DAWN_INCLUDE_DIR}/dawn_native/VulkanBackend.h"
+        "${DAWN_INCLUDE_DIR}/dawn/native/VulkanBackend.h"
        "vulkan/AdapterVk.cpp"
        "vulkan/AdapterVk.h"
        "vulkan/BackendVk.cpp"
--- a/src/dawn/native/CachedObject.cpp
+++ b/src/dawn/native/CachedObject.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/CachedObject.h"
+#include "dawn/native/CachedObject.h"

 #include "dawn/common/Assert.h"

--- a/src/dawn/native/CachedObject.h
+++ b/src/dawn/native/CachedObject.h
--- a/src/dawn/native/CallbackTaskManager.cpp
+++ b/src/dawn/native/CallbackTaskManager.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/CallbackTaskManager.h"
+#include "dawn/native/CallbackTaskManager.h"

 namespace dawn::native {

--- a/src/dawn/native/CallbackTaskManager.h
+++ b/src/dawn/native/CallbackTaskManager.h
--- a/src/dawn/native/CommandAllocator.cpp
+++ b/src/dawn/native/CommandAllocator.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/CommandAllocator.h"
+#include "dawn/native/CommandAllocator.h"

 #include "dawn/common/Assert.h"
 #include "dawn/common/Math.h"
--- a/src/dawn/native/CommandAllocator.h
+++ b/src/dawn/native/CommandAllocator.h
--- a/src/dawn/native/CommandBuffer.cpp
+++ b/src/dawn/native/CommandBuffer.cpp
@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/CommandBuffer.h"
+#include "dawn/native/CommandBuffer.h"

 #include "dawn/common/BitSetIterator.h"
-#include "dawn_native/Buffer.h"
-#include "dawn_native/CommandEncoder.h"
-#include "dawn_native/CommandValidation.h"
-#include "dawn_native/Commands.h"
-#include "dawn_native/Format.h"
-#include "dawn_native/ObjectType_autogen.h"
-#include "dawn_native/Texture.h"
+#include "dawn/native/Buffer.h"
+#include "dawn/native/CommandEncoder.h"
+#include "dawn/native/CommandValidation.h"
+#include "dawn/native/Commands.h"
+#include "dawn/native/Format.h"
+#include "dawn/native/ObjectType_autogen.h"
+#include "dawn/native/Texture.h"

 namespace dawn::native {

--- a/src/dawn/native/CommandBuffer.h
+++ b/src/dawn/native/CommandBuffer.h
@@ -15,14 +15,14 @@
 #ifndef DAWNNATIVE_COMMANDBUFFER_H_
 #define DAWNNATIVE_COMMANDBUFFER_H_

-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/dawn_platform.h"

-#include "dawn_native/CommandAllocator.h"
-#include "dawn_native/Error.h"
-#include "dawn_native/Forward.h"
-#include "dawn_native/ObjectBase.h"
-#include "dawn_native/PassResourceUsage.h"
-#include "dawn_native/Texture.h"
+#include "dawn/native/CommandAllocator.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/Forward.h"
+#include "dawn/native/ObjectBase.h"
+#include "dawn/native/PassResourceUsage.h"
+#include "dawn/native/Texture.h"

 namespace dawn::native {

--- a/src/dawn/native/CommandBufferStateTracker.cpp
+++ b/src/dawn/native/CommandBufferStateTracker.cpp
@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/CommandBufferStateTracker.h"
+#include "dawn/native/CommandBufferStateTracker.h"

 #include "dawn/common/Assert.h"
 #include "dawn/common/BitSetIterator.h"
-#include "dawn_native/BindGroup.h"
-#include "dawn_native/ComputePassEncoder.h"
-#include "dawn_native/ComputePipeline.h"
-#include "dawn_native/Forward.h"
-#include "dawn_native/ObjectType_autogen.h"
-#include "dawn_native/PipelineLayout.h"
-#include "dawn_native/RenderPipeline.h"
+#include "dawn/native/BindGroup.h"
+#include "dawn/native/ComputePassEncoder.h"
+#include "dawn/native/ComputePipeline.h"
+#include "dawn/native/Forward.h"
+#include "dawn/native/ObjectType_autogen.h"
+#include "dawn/native/PipelineLayout.h"
+#include "dawn/native/RenderPipeline.h"

 // TODO(dawn:563): None of the error messages in this file include the buffer objects they are
 // validating against. It would be nice to improve that, but difficult to do without incurring
--- a/src/dawn/native/CommandBufferStateTracker.h
+++ b/src/dawn/native/CommandBufferStateTracker.h
@@ -18,9 +18,9 @@
 #include "dawn/common/Constants.h"
 #include "dawn/common/ityp_array.h"
 #include "dawn/common/ityp_bitset.h"
-#include "dawn_native/BindingInfo.h"
-#include "dawn_native/Error.h"
-#include "dawn_native/Forward.h"
+#include "dawn/native/BindingInfo.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/Forward.h"

 namespace dawn::native {

--- a/src/dawn/native/CommandEncoder.cpp
+++ b/src/dawn/native/CommandEncoder.cpp
@@ -12,29 +12,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/CommandEncoder.h"
+#include "dawn/native/CommandEncoder.h"

 #include "dawn/common/BitSetIterator.h"
 #include "dawn/common/Math.h"
+#include "dawn/native/BindGroup.h"
+#include "dawn/native/Buffer.h"
+#include "dawn/native/ChainUtils_autogen.h"
+#include "dawn/native/CommandBuffer.h"
+#include "dawn/native/CommandBufferStateTracker.h"
+#include "dawn/native/CommandValidation.h"
+#include "dawn/native/Commands.h"
+#include "dawn/native/ComputePassEncoder.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/ErrorData.h"
+#include "dawn/native/ObjectType_autogen.h"
+#include "dawn/native/QueryHelper.h"
+#include "dawn/native/QuerySet.h"
+#include "dawn/native/Queue.h"
+#include "dawn/native/RenderPassEncoder.h"
+#include "dawn/native/RenderPipeline.h"
+#include "dawn/native/ValidationUtils_autogen.h"
 #include "dawn/platform/DawnPlatform.h"
 #include "dawn/platform/tracing/TraceEvent.h"
-#include "dawn_native/BindGroup.h"
-#include "dawn_native/Buffer.h"
-#include "dawn_native/ChainUtils_autogen.h"
-#include "dawn_native/CommandBuffer.h"
-#include "dawn_native/CommandBufferStateTracker.h"
-#include "dawn_native/CommandValidation.h"
-#include "dawn_native/Commands.h"
-#include "dawn_native/ComputePassEncoder.h"
-#include "dawn_native/Device.h"
-#include "dawn_native/ErrorData.h"
-#include "dawn_native/ObjectType_autogen.h"
-#include "dawn_native/QueryHelper.h"
-#include "dawn_native/QuerySet.h"
-#include "dawn_native/Queue.h"
-#include "dawn_native/RenderPassEncoder.h"
-#include "dawn_native/RenderPipeline.h"
-#include "dawn_native/ValidationUtils_autogen.h"

 #include <cmath>
 #include <map>
--- a/src/dawn/native/CommandEncoder.h
+++ b/src/dawn/native/CommandEncoder.h
@@ -15,12 +15,12 @@
 #ifndef DAWNNATIVE_COMMANDENCODER_H_
 #define DAWNNATIVE_COMMANDENCODER_H_

-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/dawn_platform.h"

-#include "dawn_native/EncodingContext.h"
-#include "dawn_native/Error.h"
-#include "dawn_native/ObjectBase.h"
-#include "dawn_native/PassResourceUsage.h"
+#include "dawn/native/EncodingContext.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/ObjectBase.h"
+#include "dawn/native/PassResourceUsage.h"

 #include <string>

--- a/src/dawn/native/CommandValidation.cpp
+++ b/src/dawn/native/CommandValidation.cpp
@@ -12,19 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/CommandValidation.h"
+#include "dawn/native/CommandValidation.h"

 #include "dawn/common/BitSetIterator.h"
-#include "dawn_native/BindGroup.h"
-#include "dawn_native/Buffer.h"
-#include "dawn_native/CommandBufferStateTracker.h"
-#include "dawn_native/Commands.h"
-#include "dawn_native/Device.h"
-#include "dawn_native/PassResourceUsage.h"
-#include "dawn_native/QuerySet.h"
-#include "dawn_native/RenderBundle.h"
-#include "dawn_native/RenderPipeline.h"
-#include "dawn_native/ValidationUtils_autogen.h"
+#include "dawn/native/BindGroup.h"
+#include "dawn/native/Buffer.h"
+#include "dawn/native/CommandBufferStateTracker.h"
+#include "dawn/native/Commands.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/PassResourceUsage.h"
+#include "dawn/native/QuerySet.h"
+#include "dawn/native/RenderBundle.h"
+#include "dawn/native/RenderPipeline.h"
+#include "dawn/native/ValidationUtils_autogen.h"

 namespace dawn::native {

--- a/src/dawn/native/CommandValidation.h
+++ b/src/dawn/native/CommandValidation.h
@@ -15,9 +15,9 @@
 #ifndef DAWNNATIVE_COMMANDVALIDATION_H_
 #define DAWNNATIVE_COMMANDVALIDATION_H_

-#include "dawn_native/CommandAllocator.h"
-#include "dawn_native/Error.h"
-#include "dawn_native/Texture.h"
+#include "dawn/native/CommandAllocator.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/Texture.h"

 #include <vector>

--- a/src/dawn/native/Commands.cpp
+++ b/src/dawn/native/Commands.cpp
@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/Commands.h"
+#include "dawn/native/Commands.h"

-#include "dawn_native/BindGroup.h"
-#include "dawn_native/Buffer.h"
-#include "dawn_native/CommandAllocator.h"
-#include "dawn_native/ComputePipeline.h"
-#include "dawn_native/QuerySet.h"
-#include "dawn_native/RenderBundle.h"
-#include "dawn_native/RenderPipeline.h"
-#include "dawn_native/Texture.h"
+#include "dawn/native/BindGroup.h"
+#include "dawn/native/Buffer.h"
+#include "dawn/native/CommandAllocator.h"
+#include "dawn/native/ComputePipeline.h"
+#include "dawn/native/QuerySet.h"
+#include "dawn/native/RenderBundle.h"
+#include "dawn/native/RenderPipeline.h"
+#include "dawn/native/Texture.h"

 namespace dawn::native {

--- a/src/dawn/native/Commands.h
+++ b/src/dawn/native/Commands.h
@@ -17,11 +17,11 @@

 #include "dawn/common/Constants.h"

-#include "dawn_native/AttachmentState.h"
-#include "dawn_native/BindingInfo.h"
-#include "dawn_native/Texture.h"
+#include "dawn/native/AttachmentState.h"
+#include "dawn/native/BindingInfo.h"
+#include "dawn/native/Texture.h"

-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/dawn_platform.h"

 #include <array>
 #include <bitset>
--- a/src/dawn/native/CompilationMessages.cpp
+++ b/src/dawn/native/CompilationMessages.cpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/CompilationMessages.h"
+#include "dawn/native/CompilationMessages.h"

 #include "dawn/common/Assert.h"
-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/dawn_platform.h"

 #include <tint/tint.h>

--- a/src/dawn/native/CompilationMessages.h
+++ b/src/dawn/native/CompilationMessages.h
@@ -15,7 +15,7 @@
 #ifndef DAWNNATIVE_COMPILATIONMESSAGES_H_
 #define DAWNNATIVE_COMPILATIONMESSAGES_H_

-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/dawn_platform.h"

 #include "dawn/common/NonCopyable.h"

--- a/src/dawn/native/ComputePassEncoder.cpp
+++ b/src/dawn/native/ComputePassEncoder.cpp
@@ -12,21 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/ComputePassEncoder.h"
+#include "dawn/native/ComputePassEncoder.h"

-#include "dawn_native/BindGroup.h"
-#include "dawn_native/BindGroupLayout.h"
-#include "dawn_native/Buffer.h"
-#include "dawn_native/CommandEncoder.h"
-#include "dawn_native/CommandValidation.h"
-#include "dawn_native/Commands.h"
-#include "dawn_native/ComputePipeline.h"
-#include "dawn_native/Device.h"
-#include "dawn_native/InternalPipelineStore.h"
-#include "dawn_native/ObjectType_autogen.h"
-#include "dawn_native/PassResourceUsageTracker.h"
-#include "dawn_native/QuerySet.h"
-#include "dawn_native/utils/WGPUHelpers.h"
+#include "dawn/native/BindGroup.h"
+#include "dawn/native/BindGroupLayout.h"
+#include "dawn/native/Buffer.h"
+#include "dawn/native/CommandEncoder.h"
+#include "dawn/native/CommandValidation.h"
+#include "dawn/native/Commands.h"
+#include "dawn/native/ComputePipeline.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/InternalPipelineStore.h"
+#include "dawn/native/ObjectType_autogen.h"
+#include "dawn/native/PassResourceUsageTracker.h"
+#include "dawn/native/QuerySet.h"
+#include "dawn/native/utils/WGPUHelpers.h"

 namespace dawn::native {

--- a/src/dawn/native/ComputePassEncoder.h
+++ b/src/dawn/native/ComputePassEncoder.h
@@ -15,11 +15,11 @@
 #ifndef DAWNNATIVE_COMPUTEPASSENCODER_H_
 #define DAWNNATIVE_COMPUTEPASSENCODER_H_

-#include "dawn_native/CommandBufferStateTracker.h"
-#include "dawn_native/Error.h"
-#include "dawn_native/Forward.h"
-#include "dawn_native/PassResourceUsageTracker.h"
-#include "dawn_native/ProgrammableEncoder.h"
+#include "dawn/native/CommandBufferStateTracker.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/Forward.h"
+#include "dawn/native/PassResourceUsageTracker.h"
+#include "dawn/native/ProgrammableEncoder.h"

 namespace dawn::native {

--- a/src/dawn/native/ComputePipeline.cpp
+++ b/src/dawn/native/ComputePipeline.cpp
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/ComputePipeline.h"
+#include "dawn/native/ComputePipeline.h"

-#include "dawn_native/Device.h"
-#include "dawn_native/ObjectContentHasher.h"
-#include "dawn_native/ObjectType_autogen.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/ObjectContentHasher.h"
+#include "dawn/native/ObjectType_autogen.h"

 namespace dawn::native {

--- a/src/dawn/native/ComputePipeline.h
+++ b/src/dawn/native/ComputePipeline.h
@@ -16,8 +16,8 @@
 #define DAWNNATIVE_COMPUTEPIPELINE_H_

 #include "dawn/common/NonCopyable.h"
-#include "dawn_native/Forward.h"
-#include "dawn_native/Pipeline.h"
+#include "dawn/native/Forward.h"
+#include "dawn/native/Pipeline.h"

 namespace dawn::native {

--- a/src/dawn/native/CopyTextureForBrowserHelper.cpp
+++ b/src/dawn/native/CopyTextureForBrowserHelper.cpp
@@ -12,24 +12,24 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/CopyTextureForBrowserHelper.h"
+#include "dawn/native/CopyTextureForBrowserHelper.h"

 #include "dawn/common/Log.h"
-#include "dawn_native/BindGroup.h"
-#include "dawn_native/BindGroupLayout.h"
-#include "dawn_native/Buffer.h"
-#include "dawn_native/CommandBuffer.h"
-#include "dawn_native/CommandEncoder.h"
-#include "dawn_native/CommandValidation.h"
-#include "dawn_native/Device.h"
-#include "dawn_native/InternalPipelineStore.h"
-#include "dawn_native/Queue.h"
-#include "dawn_native/RenderPassEncoder.h"
-#include "dawn_native/RenderPipeline.h"
-#include "dawn_native/Sampler.h"
-#include "dawn_native/Texture.h"
-#include "dawn_native/ValidationUtils_autogen.h"
-#include "dawn_native/utils/WGPUHelpers.h"
+#include "dawn/native/BindGroup.h"
+#include "dawn/native/BindGroupLayout.h"
+#include "dawn/native/Buffer.h"
+#include "dawn/native/CommandBuffer.h"
+#include "dawn/native/CommandEncoder.h"
+#include "dawn/native/CommandValidation.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/InternalPipelineStore.h"
+#include "dawn/native/Queue.h"
+#include "dawn/native/RenderPassEncoder.h"
+#include "dawn/native/RenderPipeline.h"
+#include "dawn/native/Sampler.h"
+#include "dawn/native/Texture.h"
+#include "dawn/native/ValidationUtils_autogen.h"
+#include "dawn/native/utils/WGPUHelpers.h"

 #include <unordered_set>

--- a/src/dawn/native/CopyTextureForBrowserHelper.h
+++ b/src/dawn/native/CopyTextureForBrowserHelper.h
@@ -15,8 +15,8 @@
 #ifndef DAWNNATIVE_COPYTEXTUREFORBROWSERHELPER_H_
 #define DAWNNATIVE_COPYTEXTUREFORBROWSERHELPER_H_

-#include "dawn_native/Error.h"
-#include "dawn_native/ObjectBase.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/ObjectBase.h"

 namespace dawn::native {
    class DeviceBase;
--- a/src/dawn/native/CreatePipelineAsyncTask.cpp
+++ b/src/dawn/native/CreatePipelineAsyncTask.cpp
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/CreatePipelineAsyncTask.h"
+#include "dawn/native/CreatePipelineAsyncTask.h"

+#include "dawn/native/AsyncTask.h"
+#include "dawn/native/ComputePipeline.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/RenderPipeline.h"
+#include "dawn/native/utils/WGPUHelpers.h"
 #include "dawn/platform/DawnPlatform.h"
 #include "dawn/platform/tracing/TraceEvent.h"
-#include "dawn_native/AsyncTask.h"
-#include "dawn_native/ComputePipeline.h"
-#include "dawn_native/Device.h"
-#include "dawn_native/RenderPipeline.h"
-#include "dawn_native/utils/WGPUHelpers.h"

 namespace dawn::native {

--- a/src/dawn/native/CreatePipelineAsyncTask.h
+++ b/src/dawn/native/CreatePipelineAsyncTask.h
@@ -16,9 +16,9 @@
 #define DAWNNATIVE_CREATEPIPELINEASYNCTASK_H_

 #include "dawn/common/RefCounted.h"
+#include "dawn/native/CallbackTaskManager.h"
+#include "dawn/native/Error.h"
 #include "dawn/webgpu.h"
-#include "dawn_native/CallbackTaskManager.h"
-#include "dawn_native/Error.h"

 namespace dawn::native {

--- a/src/dawn/native/DawnNative.cpp
+++ b/src/dawn/native/DawnNative.cpp
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/DawnNative.h"
+#include "dawn/native/DawnNative.h"

 #include "dawn/common/Log.h"
+#include "dawn/native/BindGroupLayout.h"
+#include "dawn/native/Buffer.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/Instance.h"
+#include "dawn/native/Texture.h"
 #include "dawn/platform/DawnPlatform.h"
-#include "dawn_native/BindGroupLayout.h"
-#include "dawn_native/Buffer.h"
-#include "dawn_native/Device.h"
-#include "dawn_native/Instance.h"
-#include "dawn_native/Texture.h"

 // Contains the entry-points into dawn_native

--- a/src/dawn/native/Device.cpp
+++ b/src/dawn/native/Device.cpp
@@ -12,41 +12,41 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/Device.h"
+#include "dawn/native/Device.h"

 #include "dawn/common/Log.h"
+#include "dawn/native/Adapter.h"
+#include "dawn/native/AsyncTask.h"
+#include "dawn/native/AttachmentState.h"
+#include "dawn/native/BindGroup.h"
+#include "dawn/native/BindGroupLayout.h"
+#include "dawn/native/Buffer.h"
+#include "dawn/native/ChainUtils_autogen.h"
+#include "dawn/native/CommandBuffer.h"
+#include "dawn/native/CommandEncoder.h"
+#include "dawn/native/CompilationMessages.h"
+#include "dawn/native/CreatePipelineAsyncTask.h"
+#include "dawn/native/DynamicUploader.h"
+#include "dawn/native/ErrorData.h"
+#include "dawn/native/ErrorInjector.h"
+#include "dawn/native/ErrorScope.h"
+#include "dawn/native/ExternalTexture.h"
+#include "dawn/native/Instance.h"
+#include "dawn/native/InternalPipelineStore.h"
+#include "dawn/native/ObjectType_autogen.h"
+#include "dawn/native/PersistentCache.h"
+#include "dawn/native/QuerySet.h"
+#include "dawn/native/Queue.h"
+#include "dawn/native/RenderBundleEncoder.h"
+#include "dawn/native/RenderPipeline.h"
+#include "dawn/native/Sampler.h"
+#include "dawn/native/Surface.h"
+#include "dawn/native/SwapChain.h"
+#include "dawn/native/Texture.h"
+#include "dawn/native/ValidationUtils_autogen.h"
+#include "dawn/native/utils/WGPUHelpers.h"
 #include "dawn/platform/DawnPlatform.h"
 #include "dawn/platform/tracing/TraceEvent.h"
-#include "dawn_native/Adapter.h"
-#include "dawn_native/AsyncTask.h"
-#include "dawn_native/AttachmentState.h"
-#include "dawn_native/BindGroup.h"
-#include "dawn_native/BindGroupLayout.h"
-#include "dawn_native/Buffer.h"
-#include "dawn_native/ChainUtils_autogen.h"
-#include "dawn_native/CommandBuffer.h"
-#include "dawn_native/CommandEncoder.h"
-#include "dawn_native/CompilationMessages.h"
-#include "dawn_native/CreatePipelineAsyncTask.h"
-#include "dawn_native/DynamicUploader.h"
-#include "dawn_native/ErrorData.h"
-#include "dawn_native/ErrorInjector.h"
-#include "dawn_native/ErrorScope.h"
-#include "dawn_native/ExternalTexture.h"
-#include "dawn_native/Instance.h"
-#include "dawn_native/InternalPipelineStore.h"
-#include "dawn_native/ObjectType_autogen.h"
-#include "dawn_native/PersistentCache.h"
-#include "dawn_native/QuerySet.h"
-#include "dawn_native/Queue.h"
-#include "dawn_native/RenderBundleEncoder.h"
-#include "dawn_native/RenderPipeline.h"
-#include "dawn_native/Sampler.h"
-#include "dawn_native/Surface.h"
-#include "dawn_native/SwapChain.h"
-#include "dawn_native/Texture.h"
-#include "dawn_native/ValidationUtils_autogen.h"
-#include "dawn_native/utils/WGPUHelpers.h"

 #include <array>
 #include <mutex>
--- a/src/dawn/native/Device.h
+++ b/src/dawn/native/Device.h
@@ -15,20 +15,20 @@
 #ifndef DAWNNATIVE_DEVICE_H_
 #define DAWNNATIVE_DEVICE_H_

-#include "dawn_native/Commands.h"
-#include "dawn_native/ComputePipeline.h"
-#include "dawn_native/Error.h"
-#include "dawn_native/Features.h"
-#include "dawn_native/Format.h"
-#include "dawn_native/Forward.h"
-#include "dawn_native/Limits.h"
-#include "dawn_native/ObjectBase.h"
-#include "dawn_native/ObjectType_autogen.h"
-#include "dawn_native/StagingBuffer.h"
-#include "dawn_native/Toggles.h"
+#include "dawn/native/Commands.h"
+#include "dawn/native/ComputePipeline.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/Features.h"
+#include "dawn/native/Format.h"
+#include "dawn/native/Forward.h"
+#include "dawn/native/Limits.h"
+#include "dawn/native/ObjectBase.h"
+#include "dawn/native/ObjectType_autogen.h"
+#include "dawn/native/StagingBuffer.h"
+#include "dawn/native/Toggles.h"

-#include "dawn_native/DawnNative.h"
-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/DawnNative.h"
+#include "dawn/native/dawn_platform.h"

 #include <mutex>
 #include <utility>
@@ -202,10 +202,9 @@ namespace dawn::native {
            const CommandEncoderDescriptor* descriptor);
        ResultOrError<Ref<ComputePipelineBase>> CreateComputePipeline(
            const ComputePipelineDescriptor* descriptor);
-        MaybeError CreateComputePipelineAsync(
-            const ComputePipelineDescriptor* descriptor,
-            WGPUCreateComputePipelineAsyncCallback callback,
-            void* userdata);
+        MaybeError CreateComputePipelineAsync(const ComputePipelineDescriptor* descriptor,
+                                              WGPUCreateComputePipelineAsyncCallback callback,
+                                              void* userdata);

        ResultOrError<Ref<PipelineLayoutBase>> CreatePipelineLayout(
            const PipelineLayoutDescriptor* descriptor);
--- a/src/dawn/native/DynamicUploader.cpp
+++ b/src/dawn/native/DynamicUploader.cpp
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/DynamicUploader.h"
+#include "dawn/native/DynamicUploader.h"
 #include "dawn/common/Math.h"
-#include "dawn_native/Device.h"
+#include "dawn/native/Device.h"

 namespace dawn::native {

--- a/src/dawn/native/DynamicUploader.h
+++ b/src/dawn/native/DynamicUploader.h
@@ -15,10 +15,10 @@
 #ifndef DAWNNATIVE_DYNAMICUPLOADER_H_
 #define DAWNNATIVE_DYNAMICUPLOADER_H_

-#include "dawn_native/Forward.h"
-#include "dawn_native/IntegerTypes.h"
-#include "dawn_native/RingBufferAllocator.h"
-#include "dawn_native/StagingBuffer.h"
+#include "dawn/native/Forward.h"
+#include "dawn/native/IntegerTypes.h"
+#include "dawn/native/RingBufferAllocator.h"
+#include "dawn/native/StagingBuffer.h"

 // DynamicUploader is the front-end implementation used to manage multiple ring buffers for upload
 // usage.
--- a/src/dawn/native/EncodingContext.cpp
+++ b/src/dawn/native/EncodingContext.cpp
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/EncodingContext.h"
+#include "dawn/native/EncodingContext.h"

 #include "dawn/common/Assert.h"
-#include "dawn_native/CommandEncoder.h"
-#include "dawn_native/Commands.h"
-#include "dawn_native/Device.h"
-#include "dawn_native/ErrorData.h"
-#include "dawn_native/IndirectDrawValidationEncoder.h"
-#include "dawn_native/RenderBundleEncoder.h"
+#include "dawn/native/CommandEncoder.h"
+#include "dawn/native/Commands.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/ErrorData.h"
+#include "dawn/native/IndirectDrawValidationEncoder.h"
+#include "dawn/native/RenderBundleEncoder.h"

 namespace dawn::native {

--- a/src/dawn/native/EncodingContext.h
+++ b/src/dawn/native/EncodingContext.h
@@ -15,12 +15,12 @@
 #ifndef DAWNNATIVE_ENCODINGCONTEXT_H_
 #define DAWNNATIVE_ENCODINGCONTEXT_H_

-#include "dawn_native/CommandAllocator.h"
-#include "dawn_native/Error.h"
-#include "dawn_native/ErrorData.h"
-#include "dawn_native/IndirectDrawMetadata.h"
-#include "dawn_native/PassResourceUsageTracker.h"
-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/CommandAllocator.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/ErrorData.h"
+#include "dawn/native/IndirectDrawMetadata.h"
+#include "dawn/native/PassResourceUsageTracker.h"
+#include "dawn/native/dawn_platform.h"

 #include <string>

--- a/src/dawn/native/EnumClassBitmasks.h
+++ b/src/dawn/native/EnumClassBitmasks.h
--- a/src/dawn/native/EnumMaskIterator.h
+++ b/src/dawn/native/EnumMaskIterator.h
@@ -16,7 +16,7 @@
 #define DAWNNATIVE_ENUMMASKITERATOR_H_

 #include "dawn/common/BitSetIterator.h"
-#include "dawn_native/EnumClassBitmasks.h"
+#include "dawn/native/EnumClassBitmasks.h"

 namespace dawn::native {

--- a/src/dawn/native/Error.cpp
+++ b/src/dawn/native/Error.cpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/Error.h"
+#include "dawn/native/Error.h"

-#include "dawn_native/ErrorData.h"
-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/ErrorData.h"
+#include "dawn/native/dawn_platform.h"

 namespace dawn::native {

--- a/src/dawn/native/Error.h
+++ b/src/dawn/native/Error.h
@@ -17,8 +17,8 @@

 #include "absl/strings/str_format.h"
 #include "dawn/common/Result.h"
-#include "dawn_native/ErrorData.h"
-#include "dawn_native/webgpu_absl_format.h"
+#include "dawn/native/ErrorData.h"
+#include "dawn/native/webgpu_absl_format.h"

 #include <string>

--- a/src/dawn/native/ErrorData.cpp
+++ b/src/dawn/native/ErrorData.cpp
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/ErrorData.h"
+#include "dawn/native/ErrorData.h"

-#include "dawn_native/Error.h"
-#include "dawn_native/ObjectBase.h"
-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/ObjectBase.h"
+#include "dawn/native/dawn_platform.h"

 namespace dawn::native {

--- a/src/dawn/native/ErrorData.h
+++ b/src/dawn/native/ErrorData.h
--- a/src/dawn/native/ErrorInjector.cpp
+++ b/src/dawn/native/ErrorInjector.cpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/ErrorInjector.h"
+#include "dawn/native/ErrorInjector.h"

 #include "dawn/common/Assert.h"
-#include "dawn_native/DawnNative.h"
+#include "dawn/native/DawnNative.h"

 namespace dawn::native {

--- a/src/dawn/native/ErrorInjector.h
+++ b/src/dawn/native/ErrorInjector.h
--- a/src/dawn/native/ErrorScope.cpp
+++ b/src/dawn/native/ErrorScope.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/ErrorScope.h"
+#include "dawn/native/ErrorScope.h"

 #include "dawn/common/Assert.h"

--- a/src/dawn/native/ErrorScope.h
+++ b/src/dawn/native/ErrorScope.h
@@ -15,7 +15,7 @@
 #ifndef DAWNNATIVE_ERRORSCOPE_H_
 #define DAWNNATIVE_ERRORSCOPE_H_

-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/dawn_platform.h"

 #include <string>
 #include <vector>
--- a/src/dawn/native/ExternalTexture.cpp
+++ b/src/dawn/native/ExternalTexture.cpp
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/ExternalTexture.h"
+#include "dawn/native/ExternalTexture.h"

-#include "dawn_native/Buffer.h"
-#include "dawn_native/Device.h"
-#include "dawn_native/ObjectType_autogen.h"
-#include "dawn_native/Queue.h"
-#include "dawn_native/Texture.h"
+#include "dawn/native/Buffer.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/ObjectType_autogen.h"
+#include "dawn/native/Queue.h"
+#include "dawn/native/Texture.h"

-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/dawn_platform.h"

 namespace dawn::native {

--- a/src/dawn/native/ExternalTexture.h
+++ b/src/dawn/native/ExternalTexture.h
@@ -15,10 +15,10 @@
 #ifndef DAWNNATIVE_EXTERNALTEXTURE_H_
 #define DAWNNATIVE_EXTERNALTEXTURE_H_

-#include "dawn_native/Error.h"
-#include "dawn_native/Forward.h"
-#include "dawn_native/ObjectBase.h"
-#include "dawn_native/Subresource.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/Forward.h"
+#include "dawn/native/ObjectBase.h"
+#include "dawn/native/Subresource.h"

 #include <array>

--- a/src/dawn/native/Features.cpp
+++ b/src/dawn/native/Features.cpp
@@ -16,7 +16,7 @@

 #include "dawn/common/Assert.h"
 #include "dawn/common/BitSetIterator.h"
-#include "dawn_native/Features.h"
+#include "dawn/native/Features.h"

 namespace dawn::native {
    namespace {
--- a/src/dawn/native/Features.h
+++ b/src/dawn/native/Features.h
@@ -20,8 +20,8 @@
 #include <vector>

 #include "dawn/common/ityp_bitset.h"
+#include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "dawn_native/DawnNative.h"

 namespace dawn::native {

--- a/src/dawn/native/Format.cpp
+++ b/src/dawn/native/Format.cpp
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/Format.h"
+#include "dawn/native/Format.h"

-#include "dawn_native/Device.h"
-#include "dawn_native/EnumMaskIterator.h"
-#include "dawn_native/Features.h"
-#include "dawn_native/Texture.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/EnumMaskIterator.h"
+#include "dawn/native/Features.h"
+#include "dawn/native/Texture.h"

 #include <bitset>

--- a/src/dawn/native/Format.h
+++ b/src/dawn/native/Format.h
@@ -15,12 +15,12 @@
 #ifndef DAWNNATIVE_FORMAT_H_
 #define DAWNNATIVE_FORMAT_H_

-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/dawn_platform.h"

 #include "dawn/common/ityp_bitset.h"
-#include "dawn_native/EnumClassBitmasks.h"
-#include "dawn_native/Error.h"
-#include "dawn_native/Subresource.h"
+#include "dawn/native/EnumClassBitmasks.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/Subresource.h"

 #include <array>

--- a/src/dawn/native/Forward.h
+++ b/src/dawn/native/Forward.h
--- a/src/dawn/native/IndirectDrawMetadata.cpp
+++ b/src/dawn/native/IndirectDrawMetadata.cpp
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/IndirectDrawMetadata.h"
+#include "dawn/native/IndirectDrawMetadata.h"

 #include "dawn/common/Constants.h"
 #include "dawn/common/RefCounted.h"
-#include "dawn_native/IndirectDrawValidationEncoder.h"
-#include "dawn_native/Limits.h"
-#include "dawn_native/RenderBundle.h"
+#include "dawn/native/IndirectDrawValidationEncoder.h"
+#include "dawn/native/Limits.h"
+#include "dawn/native/RenderBundle.h"

 #include <algorithm>
 #include <utility>
--- a/src/dawn/native/IndirectDrawMetadata.h
+++ b/src/dawn/native/IndirectDrawMetadata.h
@@ -17,9 +17,9 @@

 #include "dawn/common/NonCopyable.h"
 #include "dawn/common/RefCounted.h"
-#include "dawn_native/Buffer.h"
-#include "dawn_native/CommandBufferStateTracker.h"
-#include "dawn_native/Commands.h"
+#include "dawn/native/Buffer.h"
+#include "dawn/native/CommandBufferStateTracker.h"
+#include "dawn/native/Commands.h"

 #include <cstdint>
 #include <map>
--- a/src/dawn/native/IndirectDrawValidationEncoder.cpp
+++ b/src/dawn/native/IndirectDrawValidationEncoder.cpp
@@ -12,19 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/IndirectDrawValidationEncoder.h"
+#include "dawn/native/IndirectDrawValidationEncoder.h"

 #include "dawn/common/Constants.h"
 #include "dawn/common/Math.h"
-#include "dawn_native/BindGroup.h"
-#include "dawn_native/BindGroupLayout.h"
-#include "dawn_native/CommandEncoder.h"
-#include "dawn_native/ComputePassEncoder.h"
-#include "dawn_native/ComputePipeline.h"
-#include "dawn_native/Device.h"
-#include "dawn_native/InternalPipelineStore.h"
-#include "dawn_native/Queue.h"
-#include "dawn_native/utils/WGPUHelpers.h"
+#include "dawn/native/BindGroup.h"
+#include "dawn/native/BindGroupLayout.h"
+#include "dawn/native/CommandEncoder.h"
+#include "dawn/native/ComputePassEncoder.h"
+#include "dawn/native/ComputePipeline.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/InternalPipelineStore.h"
+#include "dawn/native/Queue.h"
+#include "dawn/native/utils/WGPUHelpers.h"

 #include <cstdlib>
 #include <limits>
--- a/src/dawn/native/IndirectDrawValidationEncoder.h
+++ b/src/dawn/native/IndirectDrawValidationEncoder.h
@@ -15,8 +15,8 @@
 #ifndef DAWNNATIVE_INDIRECTDRAWVALIDATIONENCODER_H_
 #define DAWNNATIVE_INDIRECTDRAWVALIDATIONENCODER_H_

-#include "dawn_native/Error.h"
-#include "dawn_native/IndirectDrawMetadata.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/IndirectDrawMetadata.h"

 namespace dawn::native {

--- a/src/dawn/native/Instance.cpp
+++ b/src/dawn/native/Instance.cpp
@@ -12,25 +12,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/Instance.h"
+#include "dawn/native/Instance.h"

 #include "dawn/common/Assert.h"
 #include "dawn/common/GPUInfo.h"
 #include "dawn/common/Log.h"
 #include "dawn/common/SystemUtils.h"
+#include "dawn/native/ChainUtils_autogen.h"
+#include "dawn/native/ErrorData.h"
+#include "dawn/native/Surface.h"
+#include "dawn/native/ValidationUtils_autogen.h"
 #include "dawn/platform/DawnPlatform.h"
-#include "dawn_native/ChainUtils_autogen.h"
-#include "dawn_native/ErrorData.h"
-#include "dawn_native/Surface.h"
-#include "dawn_native/ValidationUtils_autogen.h"

 // For SwiftShader fallback
 #if defined(DAWN_ENABLE_BACKEND_VULKAN)
-#    include "dawn_native/VulkanBackend.h"
+#    include "dawn/native/VulkanBackend.h"
 #endif  // defined(DAWN_ENABLE_BACKEND_VULKAN)

 #if defined(DAWN_USE_X11)
-#    include "dawn_native/XlibXcbFunctions.h"
+#    include "dawn/native/XlibXcbFunctions.h"
 #endif  // defined(DAWN_USE_X11)

 #include <optional>
--- a/src/dawn/native/Instance.h
+++ b/src/dawn/native/Instance.h
@@ -17,11 +17,11 @@

 #include "dawn/common/RefCounted.h"
 #include "dawn/common/ityp_bitset.h"
-#include "dawn_native/Adapter.h"
-#include "dawn_native/BackendConnection.h"
-#include "dawn_native/Features.h"
-#include "dawn_native/Toggles.h"
-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/Adapter.h"
+#include "dawn/native/BackendConnection.h"
+#include "dawn/native/Features.h"
+#include "dawn/native/Toggles.h"
+#include "dawn/native/dawn_platform.h"

 #include <array>
 #include <memory>
--- a/src/dawn/native/IntegerTypes.h
+++ b/src/dawn/native/IntegerTypes.h
--- a/src/dawn/native/InternalPipelineStore.cpp
+++ b/src/dawn/native/InternalPipelineStore.cpp
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/InternalPipelineStore.h"
+#include "dawn/native/InternalPipelineStore.h"

-#include "dawn_native/ComputePipeline.h"
-#include "dawn_native/Device.h"
-#include "dawn_native/RenderPipeline.h"
-#include "dawn_native/ShaderModule.h"
+#include "dawn/native/ComputePipeline.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/RenderPipeline.h"
+#include "dawn/native/ShaderModule.h"

 #include <unordered_map>

--- a/src/dawn/native/InternalPipelineStore.h
+++ b/src/dawn/native/InternalPipelineStore.h
@@ -15,9 +15,9 @@
 #ifndef DAWNNATIVE_INTERNALPIPELINESTORE_H_
 #define DAWNNATIVE_INTERNALPIPELINESTORE_H_

-#include "dawn_native/ObjectBase.h"
-#include "dawn_native/ScratchBuffer.h"
-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/ObjectBase.h"
+#include "dawn/native/ScratchBuffer.h"
+#include "dawn/native/dawn_platform.h"

 #include <unordered_map>

--- a/src/dawn/native/Limits.cpp
+++ b/src/dawn/native/Limits.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/Limits.h"
+#include "dawn/native/Limits.h"

 #include "dawn/common/Assert.h"

--- a/src/dawn/native/Limits.h
+++ b/src/dawn/native/Limits.h
@@ -15,8 +15,8 @@
 #ifndef DAWNNATIVE_LIMITS_H_
 #define DAWNNATIVE_LIMITS_H_

-#include "dawn_native/Error.h"
-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/dawn_platform.h"

 namespace dawn::native {

--- a/src/dawn/native/ObjectBase.cpp
+++ b/src/dawn/native/ObjectBase.cpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/ObjectBase.h"
-#include "dawn_native/Device.h"
+#include "dawn/native/ObjectBase.h"
+#include "dawn/native/Device.h"

 #include <mutex>

--- a/src/dawn/native/ObjectBase.h
+++ b/src/dawn/native/ObjectBase.h
@@ -17,7 +17,7 @@

 #include "dawn/common/LinkedList.h"
 #include "dawn/common/RefCounted.h"
-#include "dawn_native/Forward.h"
+#include "dawn/native/Forward.h"

 #include <string>

--- a/src/dawn/native/ObjectContentHasher.cpp
+++ b/src/dawn/native/ObjectContentHasher.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/ObjectContentHasher.h"
+#include "dawn/native/ObjectContentHasher.h"

 namespace dawn::native {

--- a/src/dawn/native/ObjectContentHasher.h
+++ b/src/dawn/native/ObjectContentHasher.h
--- a/src/dawn/native/PassResourceUsage.h
+++ b/src/dawn/native/PassResourceUsage.h
@@ -15,8 +15,8 @@
 #ifndef DAWNNATIVE_PASSRESOURCEUSAGE_H
 #define DAWNNATIVE_PASSRESOURCEUSAGE_H

-#include "dawn_native/SubresourceStorage.h"
-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/SubresourceStorage.h"
+#include "dawn/native/dawn_platform.h"

 #include <set>
 #include <vector>
--- a/src/dawn/native/PassResourceUsageTracker.cpp
+++ b/src/dawn/native/PassResourceUsageTracker.cpp
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/PassResourceUsageTracker.h"
+#include "dawn/native/PassResourceUsageTracker.h"

-#include "dawn_native/BindGroup.h"
-#include "dawn_native/Buffer.h"
-#include "dawn_native/EnumMaskIterator.h"
-#include "dawn_native/ExternalTexture.h"
-#include "dawn_native/Format.h"
-#include "dawn_native/QuerySet.h"
-#include "dawn_native/Texture.h"
+#include "dawn/native/BindGroup.h"
+#include "dawn/native/Buffer.h"
+#include "dawn/native/EnumMaskIterator.h"
+#include "dawn/native/ExternalTexture.h"
+#include "dawn/native/Format.h"
+#include "dawn/native/QuerySet.h"
+#include "dawn/native/Texture.h"

 #include <utility>

--- a/src/dawn/native/PassResourceUsageTracker.h
+++ b/src/dawn/native/PassResourceUsageTracker.h
@@ -15,9 +15,9 @@
 #ifndef DAWNNATIVE_PASSRESOURCEUSAGETRACKER_H_
 #define DAWNNATIVE_PASSRESOURCEUSAGETRACKER_H_

-#include "dawn_native/PassResourceUsage.h"
+#include "dawn/native/PassResourceUsage.h"

-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/dawn_platform.h"

 #include <map>

--- a/src/dawn/native/PerStage.cpp
+++ b/src/dawn/native/PerStage.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/PerStage.h"
+#include "dawn/native/PerStage.h"

 namespace dawn::native {

--- a/src/dawn/native/PerStage.h
+++ b/src/dawn/native/PerStage.h
@@ -18,9 +18,9 @@
 #include "dawn/common/Assert.h"
 #include "dawn/common/BitSetIterator.h"
 #include "dawn/common/Constants.h"
-#include "dawn_native/Error.h"
+#include "dawn/native/Error.h"

-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/dawn_platform.h"

 #include <array>

--- a/src/dawn/native/PersistentCache.cpp
+++ b/src/dawn/native/PersistentCache.cpp
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/PersistentCache.h"
+#include "dawn/native/PersistentCache.h"

 #include "dawn/common/Assert.h"
+#include "dawn/native/Device.h"
 #include "dawn/platform/DawnPlatform.h"
-#include "dawn_native/Device.h"

 namespace dawn::native {

--- a/src/dawn/native/PersistentCache.h
+++ b/src/dawn/native/PersistentCache.h
@@ -15,7 +15,7 @@
 #ifndef DAWNNATIVE_PERSISTENTCACHE_H_
 #define DAWNNATIVE_PERSISTENTCACHE_H_

-#include "dawn_native/Error.h"
+#include "dawn/native/Error.h"

 #include <mutex>
 #include <vector>
--- a/src/dawn/native/Pipeline.cpp
+++ b/src/dawn/native/Pipeline.cpp
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/Pipeline.h"
+#include "dawn/native/Pipeline.h"

-#include "dawn_native/BindGroupLayout.h"
-#include "dawn_native/Device.h"
-#include "dawn_native/ObjectBase.h"
-#include "dawn_native/ObjectContentHasher.h"
-#include "dawn_native/PipelineLayout.h"
-#include "dawn_native/ShaderModule.h"
+#include "dawn/native/BindGroupLayout.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/ObjectBase.h"
+#include "dawn/native/ObjectContentHasher.h"
+#include "dawn/native/PipelineLayout.h"
+#include "dawn/native/ShaderModule.h"

 namespace dawn::native {
    MaybeError ValidateProgrammableStage(DeviceBase* device,
--- a/src/dawn/native/Pipeline.h
+++ b/src/dawn/native/Pipeline.h
@@ -15,14 +15,14 @@
 #ifndef DAWNNATIVE_PIPELINE_H_
 #define DAWNNATIVE_PIPELINE_H_

-#include "dawn_native/CachedObject.h"
-#include "dawn_native/Forward.h"
-#include "dawn_native/ObjectBase.h"
-#include "dawn_native/PerStage.h"
-#include "dawn_native/PipelineLayout.h"
-#include "dawn_native/ShaderModule.h"
+#include "dawn/native/CachedObject.h"
+#include "dawn/native/Forward.h"
+#include "dawn/native/ObjectBase.h"
+#include "dawn/native/PerStage.h"
+#include "dawn/native/PipelineLayout.h"
+#include "dawn/native/ShaderModule.h"

-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/dawn_platform.h"

 #include <array>
 #include <bitset>
--- a/src/dawn/native/PipelineLayout.cpp
+++ b/src/dawn/native/PipelineLayout.cpp
@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/PipelineLayout.h"
+#include "dawn/native/PipelineLayout.h"

 #include "dawn/common/Assert.h"
 #include "dawn/common/BitSetIterator.h"
 #include "dawn/common/ityp_stack_vec.h"
-#include "dawn_native/BindGroupLayout.h"
-#include "dawn_native/Device.h"
-#include "dawn_native/ObjectContentHasher.h"
-#include "dawn_native/ObjectType_autogen.h"
-#include "dawn_native/ShaderModule.h"
+#include "dawn/native/BindGroupLayout.h"
+#include "dawn/native/Device.h"
+#include "dawn/native/ObjectContentHasher.h"
+#include "dawn/native/ObjectType_autogen.h"
+#include "dawn/native/ShaderModule.h"

 namespace dawn::native {

--- a/src/dawn/native/PipelineLayout.h
+++ b/src/dawn/native/PipelineLayout.h
@@ -18,13 +18,13 @@
 #include "dawn/common/Constants.h"
 #include "dawn/common/ityp_array.h"
 #include "dawn/common/ityp_bitset.h"
-#include "dawn_native/BindingInfo.h"
-#include "dawn_native/CachedObject.h"
-#include "dawn_native/Error.h"
-#include "dawn_native/Forward.h"
-#include "dawn_native/ObjectBase.h"
+#include "dawn/native/BindingInfo.h"
+#include "dawn/native/CachedObject.h"
+#include "dawn/native/Error.h"
+#include "dawn/native/Forward.h"
+#include "dawn/native/ObjectBase.h"

-#include "dawn_native/dawn_platform.h"
+#include "dawn/native/dawn_platform.h"

 #include <array>
 #include <bitset>
--- a/src/dawn/native/PooledResourceMemoryAllocator.cpp
+++ b/src/dawn/native/PooledResourceMemoryAllocator.cpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "dawn_native/PooledResourceMemoryAllocator.h"
-#include "dawn_native/Device.h"
+#include "dawn/native/PooledResourceMemoryAllocator.h"
+#include "dawn/native/Device.h"

 namespace dawn::native {

--- a/Show More
+++ b/Show More