tint->dawn: Move src/utils -> src/dawn/utils

Also remove stuttering from the target names by dropping the 'dawn_' prefix.

Bug: dawn:1275
Change-Id: I3263f1236f71bf23795b4b12670ad3535822a537
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/79062
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

CMakeLists.txt

@@ -218,11 +218,11 @@ add_subdirectory(src/dawn_platform)
 add_subdirectory(src/dawn_native)
 add_subdirectory(src/dawn_wire)
 # TODO(dawn:269): Remove once the implementation-based swapchains are removed.
-add_subdirectory(src/utils)
+add_subdirectory(src/dawn/utils)
 
 if (DAWN_BUILD_EXAMPLES)
     #TODO(dawn:269): Add this once implementation-based swapchains are removed.
-    #add_subdirectory(src/utils)
+    #add_subdirectory(src/dawn/utils)
     add_subdirectory(examples)
 endif()
 

docs/dawn/overview.md

@@ -15,6 +15,7 @@ This repository contains the implementation of Dawn, which is itself composed of
 - [`src`](../src):
   - [`dawn`](../src/dawn): root directory for Dawn code
       - [`common`](../src/dawn/common): helper code that is allowed to be used by Dawn's core libraries, `dawn_native` and `dawn_wire`. Also allowed for use in all other Dawn targets.
+      - [`utils`](../src/dawn/utils): helper code to use Dawn used by tests and samples but disallowed for `dawn_native` and `dawn_wire`.
   - [`dawn_native`](../src/dawn_native): code for the implementation of WebGPU on top of graphics APIs. Files in this folder are the "frontend" while subdirectories are "backends".
       - `<backend>`: code for the implementation of the backend on a specific graphics API, for example `d3d12`, `metal` or `vulkan`.
   - [`dawn_platform`](../src/dawn_platform): definition of interfaces for dependency injection in `dawn_native` or `dawn_wire`.
@@ -27,7 +28,6 @@ This repository contains the implementation of Dawn, which is itself composed of
     - [`unittests`](../src/tests/unittests): code unittests of internal classes, but also by extension WebGPU API tests that don't require a GPU to run.
       - [`validation`](../src/tests/unittests/validation): WebGPU validation tests not using the GPU (frontend tests)
     - [`white_box`](../src/tests/white_box): tests using the GPU that need to access the internals of `dawn_native` or `dawn_wire`.
-  - [`utils`](../src/utils): helper code to use Dawn used by tests and samples but disallowed for `dawn_native` and `dawn_wire`.
 - [`third_party`](../third_party): directory where dependencies live as well as their buildfiles.
 
 ## Dawn Native (`dawn_native`)

examples/Animometer.cpp

@@ -14,10 +14,10 @@
 
 #include "SampleUtils.h"
 
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/ScopedAutoreleasePool.h"
-#include "utils/SystemUtils.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/ScopedAutoreleasePool.h"
+#include "dawn/utils/SystemUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 #include <cstdio>
 #include <cstdlib>

examples/BUILD.gn

@@ -36,11 +36,11 @@ static_library("dawn_sample_utils") {
     "${dawn_root}/src/dawn:dawn_proc",
     "${dawn_root}/src/dawn:dawncpp",
     "${dawn_root}/src/dawn/common",
+    "${dawn_root}/src/dawn/utils",
+    "${dawn_root}/src/dawn/utils:bindings",
+    "${dawn_root}/src/dawn/utils:glfw",
     "${dawn_root}/src/dawn_native",
     "${dawn_root}/src/dawn_wire",
-    "${dawn_root}/src/utils:dawn_bindings",
-    "${dawn_root}/src/utils:dawn_glfw",
-    "${dawn_root}/src/utils:dawn_utils",
   ]
   public_configs = [ "${dawn_root}/src/dawn/common:internal_config" ]
 }

examples/CHelloTriangle.cpp

@@ -14,9 +14,9 @@
 
 #include "SampleUtils.h"
 
-#include "utils/ScopedAutoreleasePool.h"
-#include "utils/SystemUtils.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ScopedAutoreleasePool.h"
+#include "dawn/utils/SystemUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 WGPUDevice device;
 WGPUQueue queue;

examples/ComputeBoids.cpp

@@ -14,10 +14,10 @@
 
 #include "SampleUtils.h"
 
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/ScopedAutoreleasePool.h"
-#include "utils/SystemUtils.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/ScopedAutoreleasePool.h"
+#include "dawn/utils/SystemUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 #include <array>
 #include <cstring>

examples/CppHelloTriangle.cpp

@@ -14,10 +14,10 @@
 
 #include "SampleUtils.h"
 
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/ScopedAutoreleasePool.h"
-#include "utils/SystemUtils.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/ScopedAutoreleasePool.h"
+#include "dawn/utils/SystemUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 #include <vector>
 

examples/ManualSwapChainTest.cpp

@@ -53,10 +53,10 @@
 
 #include "dawn/common/Assert.h"
 #include "dawn/common/Log.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/GLFWUtils.h"
-#include "utils/ScopedAutoreleasePool.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/GLFWUtils.h"
+#include "dawn/utils/ScopedAutoreleasePool.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 #include <dawn/dawn_proc.h>
 #include <dawn/webgpu_cpp.h>

examples/SampleUtils.cpp

@@ -18,9 +18,9 @@
 #include "dawn/common/Log.h"
 #include "dawn/common/Platform.h"
 #include "dawn/common/SystemUtils.h"
-#include "utils/BackendBinding.h"
-#include "utils/GLFWUtils.h"
-#include "utils/TerribleCommandBuffer.h"
+#include "dawn/utils/BackendBinding.h"
+#include "dawn/utils/GLFWUtils.h"
+#include "dawn/utils/TerribleCommandBuffer.h"
 
 #include <dawn/dawn_proc.h>
 #include <dawn/dawn_wsi.h>

src/dawn/utils/BUILD.gn

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../../scripts/dawn_overrides_with_defaults.gni")
+import("../../../scripts/dawn_overrides_with_defaults.gni")
 
 import("${dawn_root}/scripts/dawn_features.gni")
 
@@ -24,12 +24,12 @@ import("${dawn_root}/scripts/dawn_features.gni")
 # library that can be linked into the Dawn tests on these platforms. Otherwise,
 # use the real library from third_party/.
 if (dawn_supports_glfw_for_windowing) {
-  group("dawn_glfw") {
+  group("glfw") {
     public_deps = [ "${dawn_root}/third_party/gn/glfw" ]
   }
 } else if (is_fuchsia) {
   # The mock implementation of GLFW on Fuchsia
-  config("dawn_glfw_public_config") {
+  config("glfw_public_config") {
     # Allow inclusion of <GLFW/glfw3.h>
     include_dirs = [ "${dawn_glfw_dir}/include" ]
 
@@ -43,18 +43,18 @@ if (dawn_supports_glfw_for_windowing) {
     ]
   }
 
-  static_library("dawn_glfw") {
+  static_library("glfw") {
     sources = [
       # NOTE: The header below is required to pass "gn check".
       "${dawn_glfw_dir}/include/GLFW/glfw3.h",
       "Glfw3Fuchsia.cpp",
     ]
-    public_configs = [ ":dawn_glfw_public_config" ]
+    public_configs = [ ":glfw_public_config" ]
     deps = [ "${dawn_root}/src/dawn/common" ]
   }
 } else {
   # Just skip GLFW on other systems
-  group("dawn_glfw") {
+  group("glfw") {
   }
 }
 
@@ -62,7 +62,7 @@ if (dawn_supports_glfw_for_windowing) {
 # Utils for tests and samples
 ###############################################################################
 
-static_library("dawn_utils") {
+static_library("utils") {
   configs += [ "${dawn_root}/src/dawn/common:internal_config" ]
 
   sources = [
@@ -126,7 +126,7 @@ static_library("dawn_utils") {
       "GLFWUtils.cpp",
       "GLFWUtils.h",
     ]
-    deps += [ ":dawn_glfw" ]
+    deps += [ ":glfw" ]
 
     if (dawn_enable_metal) {
       sources += [ "GLFWUtils_metal.mm" ]
@@ -143,7 +143,7 @@ static_library("dawn_utils") {
 
 if (dawn_standalone) {
   # Library to handle the interaction of Dawn with GLFW windows in samples
-  static_library("dawn_bindings") {
+  static_library("bindings") {
     configs += [ "${dawn_root}/src/dawn/common:internal_config" ]
 
     sources = [
@@ -154,7 +154,7 @@ if (dawn_standalone) {
     public_deps = [ "${dawn_root}/src/dawn:dawn_headers" ]
 
     deps = [
-      ":dawn_glfw",
+      ":glfw",
       "${dawn_root}/src/dawn/common",
       "${dawn_root}/src/dawn_native",
     ]

src/dawn/utils/BackendBinding.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/BackendBinding.h"
+#include "dawn/utils/BackendBinding.h"
 
 #include "dawn/common/Compiler.h"
 

src/dawn/utils/ComboRenderBundleEncoderDescriptor.cpp

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/ComboRenderBundleEncoderDescriptor.h"
+#include "dawn/utils/ComboRenderBundleEncoderDescriptor.h"
 
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 namespace utils {
 

src/dawn/utils/ComboRenderPipelineDescriptor.cpp

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
 
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 namespace utils {
 

src/dawn/utils/D3D12Binding.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/BackendBinding.h"
+#include "dawn/utils/BackendBinding.h"
 
 #include "dawn/common/Assert.h"
 #include "dawn_native/D3D12Backend.h"

src/dawn/utils/EmptyDebugLogger.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/PlatformDebugLogger.h"
+#include "dawn/utils/PlatformDebugLogger.h"
 
 namespace utils {
 

src/dawn/utils/GLFWUtils.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/GLFWUtils.h"
+#include "dawn/utils/GLFWUtils.h"
 
 #include "GLFW/glfw3.h"
 #include "dawn/common/Platform.h"

src/dawn/utils/GLFWUtils_metal.mm

@@ -16,7 +16,7 @@
 #    error "GLFWUtils_metal.mm requires the Metal backend to be enabled."
 #endif  // !defined(DAWN_ENABLE_BACKEND_METAL)
 
-#include "utils/GLFWUtils.h"
+#include "dawn/utils/GLFWUtils.h"
 
 #import <QuartzCore/CAMetalLayer.h>
 #include "GLFW/glfw3.h"

src/dawn/utils/MetalBinding.mm

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/BackendBinding.h"
+#include "dawn/utils/BackendBinding.h"
 
 #include "dawn/common/Assert.h"
 #include "dawn/common/SwapChainUtils.h"

src/dawn/utils/NullBinding.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/BackendBinding.h"
+#include "dawn/utils/BackendBinding.h"
 
 #include "dawn/common/Assert.h"
 #include "dawn_native/NullBackend.h"

src/dawn/utils/OSXTimer.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/Timer.h"
+#include "dawn/utils/Timer.h"
 
 #include <CoreServices/CoreServices.h>
 #include <mach/mach.h>

src/dawn/utils/ObjCUtils.mm

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/ObjCUtils.h"
+#include "dawn/utils/ObjCUtils.h"
 
 #include <QuartzCore/CALayer.h>
 

src/dawn/utils/OpenGLBinding.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/BackendBinding.h"
+#include "dawn/utils/BackendBinding.h"
 
 #include "dawn/common/Assert.h"
 #include "dawn/common/Platform.h"

src/dawn/utils/PosixTimer.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/Timer.h"
+#include "dawn/utils/Timer.h"
 
 #include <stdint.h>
 #include <time.h>

src/dawn/utils/ScopedAutoreleasePool.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/ScopedAutoreleasePool.h"
+#include "dawn/utils/ScopedAutoreleasePool.h"
 
 #include "dawn/common/Compiler.h"
 

src/dawn/utils/ScopedAutoreleasePool.mm

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/ScopedAutoreleasePool.h"
+#include "dawn/utils/ScopedAutoreleasePool.h"
 
 #import <Foundation/Foundation.h>
 

src/dawn/utils/TerribleCommandBuffer.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/TerribleCommandBuffer.h"
+#include "dawn/utils/TerribleCommandBuffer.h"
 
 #include "dawn/common/Assert.h"
 

src/dawn/utils/TestUtils.cpp

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/TestUtils.h"
+#include "dawn/utils/TestUtils.h"
 
 #include "dawn/common/Assert.h"
 #include "dawn/common/Constants.h"
 #include "dawn/common/Math.h"
-#include "utils/TextureUtils.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/TextureUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 #include <vector>
 

src/dawn/utils/VulkanBinding.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/BackendBinding.h"
+#include "dawn/utils/BackendBinding.h"
 
 #include "dawn/common/Assert.h"
 #include "dawn_native/VulkanBackend.h"

src/dawn/utils/WGPUHelpers.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 #include "dawn/common/Constants.h"
 #include "dawn/common/Log.h"

src/dawn/utils/WGPUHelpers.h

@@ -22,7 +22,7 @@
 #include <vector>
 
 #include "dawn/common/Constants.h"
-#include "utils/TextureUtils.h"
+#include "dawn/utils/TextureUtils.h"
 
 namespace utils {
 

src/dawn/utils/WindowsDebugLogger.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/PlatformDebugLogger.h"
+#include "dawn/utils/PlatformDebugLogger.h"
 
 #include "dawn/common/Assert.h"
 #include "dawn/common/windows_with_undefs.h"

src/dawn/utils/WindowsTimer.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/Timer.h"
+#include "dawn/utils/Timer.h"
 
 #include <windows.h>
 

src/dawn/utils/WireHelper.cpp

@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/WireHelper.h"
+#include "dawn/utils/WireHelper.h"
 
 #include "dawn/common/Assert.h"
 #include "dawn/common/Log.h"
 #include "dawn/common/SystemUtils.h"
 #include "dawn/dawn_proc.h"
+#include "dawn/utils/TerribleCommandBuffer.h"
 #include "dawn_native/DawnNative.h"
 #include "dawn_wire/WireClient.h"
 #include "dawn_wire/WireServer.h"
-#include "utils/TerribleCommandBuffer.h"
 
 #include <algorithm>
 #include <cstring>

src/dawn_native/CreatePipelineAsyncTask.cpp

@@ -18,9 +18,9 @@
 #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 "utils/WGPUHelpers.h"
 
 namespace dawn::native {
 

src/dawn_native/Device.cpp

@@ -44,9 +44,9 @@
 #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 "utils/WGPUHelpers.h"
 
 #include <array>
 #include <mutex>

src/fuzzers/dawn/BUILD.gn

@@ -78,9 +78,9 @@ static_library("dawn_wire_server_fuzzer_common") {
     "${dawn_root}/src/dawn:dawn_proc",
     "${dawn_root}/src/dawn:dawncpp",
     "${dawn_root}/src/dawn/common",
+    "${dawn_root}/src/dawn/utils",
     "${dawn_root}/src/dawn_native:dawn_native_static",
     "${dawn_root}/src/dawn_wire:dawn_wire_static",
-    "${dawn_root}/src/utils:dawn_utils",
   ]
 }
 

src/fuzzers/dawn/DawnWireServerFuzzer.cpp

@@ -18,10 +18,10 @@
 #include "dawn/common/Log.h"
 #include "dawn/common/SystemUtils.h"
 #include "dawn/dawn_proc.h"
+#include "dawn/utils/SystemUtils.h"
 #include "dawn/webgpu_cpp.h"
 #include "dawn_native/DawnNative.h"
 #include "dawn_wire/WireServer.h"
-#include "utils/SystemUtils.h"
 
 #include <fstream>
 #include <vector>

src/tests/BUILD.gn

@@ -133,9 +133,9 @@ source_set("dawn_native_mocks_sources") {
 
   deps = [
     ":gmock_and_gtest",
+    "${dawn_root}/src/dawn/utils",
     "${dawn_root}/src/dawn_native:dawn_native_sources",
     "${dawn_root}/src/dawn_native:dawn_native_static",
-    "${dawn_root}/src/utils:dawn_utils",
   ]
 
   # Add internal dawn_native config for internal unittests.
@@ -169,10 +169,10 @@ test("dawn_unittests") {
     "${dawn_root}/src/dawn:dawn_proc",
     "${dawn_root}/src/dawn:dawncpp",
     "${dawn_root}/src/dawn/common",
+    "${dawn_root}/src/dawn/utils",
     "${dawn_root}/src/dawn_native:dawn_native_sources",
     "${dawn_root}/src/dawn_native:dawn_native_static",
     "${dawn_root}/src/dawn_wire",
-    "${dawn_root}/src/utils:dawn_utils",
   ]
 
   # Add internal dawn_native config for internal unittests.
@@ -328,9 +328,9 @@ source_set("dawn_end2end_tests_sources") {
     "${dawn_root}/src/dawn/common",
 
     # Statically linked because the end2end white_box tests use Dawn internals.
+    "${dawn_root}/src/dawn/utils",
     "${dawn_root}/src/dawn_native:dawn_native_static",
     "${dawn_root}/src/dawn_wire",
-    "${dawn_root}/src/utils:dawn_utils",
   ]
 
   sources = [
@@ -450,7 +450,7 @@ source_set("dawn_end2end_tests_sources") {
       "end2end/SwapChainValidationTests.cpp",
       "end2end/WindowSurfaceTests.cpp",
     ]
-    deps += [ "${dawn_root}/src/utils:dawn_glfw" ]
+    deps += [ "${dawn_root}/src/dawn/utils:glfw" ]
   }
 
   if (dawn_enable_d3d12 || (dawn_enable_vulkan && is_chromeos)) {
@@ -477,9 +477,9 @@ source_set("dawn_white_box_tests_sources") {
     "${dawn_root}/src/dawn_native:dawn_native_sources",
 
     # Statically linked because the end2end white_box tests use Dawn internals.
+    "${dawn_root}/src/dawn/utils",
     "${dawn_root}/src/dawn_native:dawn_native_static",
     "${dawn_root}/src/dawn_wire",
-    "${dawn_root}/src/utils:dawn_utils",
   ]
 
   sources = [
@@ -530,7 +530,7 @@ source_set("dawn_white_box_tests_sources") {
   }
 
   if (dawn_enable_opengl) {
-    deps += [ "${dawn_root}/src/utils:dawn_glfw" ]
+    deps += [ "${dawn_root}/src/dawn/utils:glfw" ]
   }
 
   if (dawn_enable_opengles) {
@@ -551,9 +551,9 @@ test("dawn_end2end_tests") {
     "${dawn_root}/src/dawn:dawn_proc",
     "${dawn_root}/src/dawn:dawncpp",
     "${dawn_root}/src/dawn/common",
+    "${dawn_root}/src/dawn/utils",
     "${dawn_root}/src/dawn_native:dawn_native_static",
     "${dawn_root}/src/dawn_wire",
-    "${dawn_root}/src/utils:dawn_utils",
   ]
 
   sources = [
@@ -572,7 +572,7 @@ test("dawn_end2end_tests") {
   }
 
   if (dawn_enable_opengl) {
-    deps += [ "${dawn_root}/src/utils:dawn_glfw" ]
+    deps += [ "${dawn_root}/src/dawn/utils:glfw" ]
   }
 
   if (is_chromeos) {
@@ -592,10 +592,10 @@ test("dawn_perf_tests") {
     "${dawn_root}/src/dawn:dawn_proc",
     "${dawn_root}/src/dawn:dawncpp",
     "${dawn_root}/src/dawn/common",
+    "${dawn_root}/src/dawn/utils",
     "${dawn_root}/src/dawn_native",
     "${dawn_root}/src/dawn_platform",
     "${dawn_root}/src/dawn_wire",
-    "${dawn_root}/src/utils:dawn_utils",
   ]
 
   sources = [
@@ -630,6 +630,6 @@ test("dawn_perf_tests") {
   }
 
   if (dawn_enable_opengl) {
-    deps += [ "${dawn_root}/src/utils:dawn_glfw" ]
+    deps += [ "${dawn_root}/src/dawn/utils:glfw" ]
   }
 }

src/tests/DawnTest.cpp

@@ -21,15 +21,15 @@
 #include "dawn/common/Platform.h"
 #include "dawn/common/SystemUtils.h"
 #include "dawn/dawn_proc.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/PlatformDebugLogger.h"
+#include "dawn/utils/SystemUtils.h"
+#include "dawn/utils/TerribleCommandBuffer.h"
+#include "dawn/utils/TestUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
+#include "dawn/utils/WireHelper.h"
 #include "dawn_wire/WireClient.h"
 #include "dawn_wire/WireServer.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/PlatformDebugLogger.h"
-#include "utils/SystemUtils.h"
-#include "utils/TerribleCommandBuffer.h"
-#include "utils/TestUtils.h"
-#include "utils/WGPUHelpers.h"
-#include "utils/WireHelper.h"
 
 #include <algorithm>
 #include <fstream>

src/tests/DawnTest.h

@@ -19,13 +19,13 @@
 #include "dawn/common/Platform.h"
 #include "dawn/common/Preprocessor.h"
 #include "dawn/dawn_proc_table.h"
+#include "dawn/utils/ScopedAutoreleasePool.h"
+#include "dawn/utils/TextureUtils.h"
 #include "dawn/webgpu_cpp.h"
 #include "dawn/webgpu_cpp_print.h"
 #include "dawn_native/DawnNative.h"
 #include "tests/ParamGenerator.h"
 #include "tests/ToggleParser.h"
-#include "utils/ScopedAutoreleasePool.h"
-#include "utils/TextureUtils.h"
 
 #include <dawn_platform/DawnPlatform.h>
 #include <gmock/gmock.h>

src/tests/end2end/BasicTests.cpp

@@ -14,7 +14,7 @@
 
 #include "tests/DawnTest.h"
 
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 class BasicTests : public DawnTest {};
 

src/tests/end2end/BindGroupTests.cpp

@@ -15,9 +15,9 @@
 #include "dawn/common/Assert.h"
 #include "dawn/common/Constants.h"
 #include "dawn/common/Math.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 #include "tests/DawnTest.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
 
 constexpr static uint32_t kRTSize = 8;
 

src/tests/end2end/BufferZeroInitTests.cpp

@@ -15,9 +15,9 @@
 #include "tests/DawnTest.h"
 
 #include "dawn/common/Math.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/TestUtils.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/TestUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 #define EXPECT_LAZY_CLEAR(N, statement)                                                        \
     do {                                                                                       \

src/tests/end2end/ClipSpaceTests.cpp

@@ -14,8 +14,8 @@
 
 #include "tests/DawnTest.h"
 
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 class ClipSpaceTest : public DawnTest {
   protected:

src/tests/end2end/ColorStateTests.cpp

@@ -20,8 +20,8 @@
 
 #include "dawn/common/Assert.h"
 #include "dawn/common/Constants.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 constexpr static unsigned int kRTSize = 64;
 

src/tests/end2end/CommandEncoderTests.cpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "dawn/utils/WGPUHelpers.h"
 #include "tests/DawnTest.h"
-#include "utils/WGPUHelpers.h"
 
 class CommandEncoderTests : public DawnTest {};
 

src/tests/end2end/CompressedTextureFormatTests.cpp

@@ -17,10 +17,10 @@
 #include "dawn/common/Assert.h"
 #include "dawn/common/Constants.h"
 #include "dawn/common/Math.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/TestUtils.h"
-#include "utils/TextureUtils.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/TestUtils.h"
+#include "dawn/utils/TextureUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 // The helper struct to configure the copies between buffers and textures.
 struct CopyConfig {

src/tests/end2end/ComputeCopyStorageBufferTests.cpp

@@ -14,7 +14,7 @@
 
 #include "tests/DawnTest.h"
 
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 #include <array>
 

src/tests/end2end/ComputeDispatchTests.cpp

@@ -14,7 +14,7 @@
 
 #include "tests/DawnTest.h"
 
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 #include <initializer_list>
 

src/tests/end2end/ComputeLayoutMemoryBufferTests.cpp

@@ -15,7 +15,7 @@
 #include "tests/DawnTest.h"
 
 #include "dawn/common/Math.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 #include <array>
 #include <functional>

src/tests/end2end/ComputeSharedMemoryTests.cpp

@@ -14,7 +14,7 @@
 
 #include "tests/DawnTest.h"
 
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 #include <array>
 

src/tests/end2end/ComputeStorageBufferBarrierTests.cpp

@@ -14,7 +14,7 @@
 
 #include "tests/DawnTest.h"
 
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 class ComputeStorageBufferBarrierTests : public DawnTest {
   protected:

src/tests/end2end/CopyTests.cpp

@@ -17,9 +17,9 @@
 #include <array>
 #include "dawn/common/Constants.h"
 #include "dawn/common/Math.h"
-#include "utils/TestUtils.h"
-#include "utils/TextureUtils.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/TestUtils.h"
+#include "dawn/utils/TextureUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 // For MinimumBufferSpec bytesPerRow and rowsPerImage, compute a default from the copy extent.
 constexpr uint32_t kStrideComputeDefault = 0xFFFF'FFFEul;

src/tests/end2end/CopyTextureForBrowserTests.cpp

@@ -16,10 +16,10 @@
 
 #include "dawn/common/Constants.h"
 #include "dawn/common/Math.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/TestUtils.h"
-#include "utils/TextureUtils.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/TestUtils.h"
+#include "dawn/utils/TextureUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 namespace {
     static constexpr wgpu::TextureFormat kTextureFormat = wgpu::TextureFormat::RGBA8Unorm;

src/tests/end2end/CreatePipelineAsyncTests.cpp

@@ -14,8 +14,8 @@
 
 #include "tests/DawnTest.h"
 
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 namespace {
     struct CreatePipelineAsyncTask {

src/tests/end2end/CullingTests.cpp

@@ -14,8 +14,8 @@
 
 #include "tests/DawnTest.h"
 
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 class CullingTest : public DawnTest {
   protected:

src/tests/end2end/D3D12CachingTests.cpp

@@ -14,8 +14,8 @@
 
 #include "tests/DawnTest.h"
 
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 #define EXPECT_CACHE_HIT(N, statement)              \
     do {                                            \

src/tests/end2end/D3D12ResourceWrappingTests.cpp

@@ -19,9 +19,9 @@
 #include <dxgi1_4.h>
 #include <wrl/client.h>
 
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 #include "dawn_native/D3D12Backend.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
 
 using Microsoft::WRL::ComPtr;
 

src/tests/end2end/DebugMarkerTests.cpp

@@ -14,7 +14,7 @@
 
 #include "tests/DawnTest.h"
 
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 class DebugMarkerTests : public DawnTest {};
 

src/tests/end2end/DeprecatedAPITests.cpp

@@ -20,8 +20,8 @@
 #include "tests/DawnTest.h"
 
 #include "dawn/common/Constants.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 #include <cmath>
 

src/tests/end2end/DepthBiasTests.cpp

@@ -14,10 +14,10 @@
 
 #include "dawn/common/Constants.h"
 #include "dawn/common/Math.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/TextureUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
 #include "tests/DawnTest.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/TextureUtils.h"
-#include "utils/WGPUHelpers.h"
 
 constexpr static unsigned int kRTSize = 2;
 

src/tests/end2end/DepthStencilCopyTests.cpp

@@ -17,10 +17,10 @@
 #include <array>
 #include "dawn/common/Constants.h"
 #include "dawn/common/Math.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/TestUtils.h"
-#include "utils/TextureUtils.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/TestUtils.h"
+#include "dawn/utils/TextureUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 namespace {
     using TextureFormat = wgpu::TextureFormat;

src/tests/end2end/DepthStencilLoadOpTests.cpp

@@ -14,8 +14,8 @@
 
 #include "tests/DawnTest.h"
 
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 namespace {
 

src/tests/end2end/DepthStencilSamplingTests.cpp

@@ -13,9 +13,9 @@
 // limitations under the License.
 
 #include "dawn/common/Assert.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 #include "tests/DawnTest.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
 
 namespace {
     using TextureFormat = wgpu::TextureFormat;

src/tests/end2end/DepthStencilStateTests.cpp

@@ -15,8 +15,8 @@
 #include "tests/DawnTest.h"
 
 #include "dawn/common/Assert.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 constexpr static unsigned int kRTSize = 64;
 

src/tests/end2end/DestroyTests.cpp

@@ -14,8 +14,8 @@
 
 #include "tests/DawnTest.h"
 
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 using ::testing::HasSubstr;
 

src/tests/end2end/DeviceInitializationTests.cpp

@@ -13,9 +13,9 @@
 // limitations under the License.
 
 #include "dawn/dawn_proc.h"
+#include "dawn/utils/SystemUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
 #include "tests/DawnTest.h"
-#include "utils/SystemUtils.h"
-#include "utils/WGPUHelpers.h"
 
 class DeviceInitializationTest : public testing::Test {
     void SetUp() override {

src/tests/end2end/DeviceLostTests.cpp

@@ -15,9 +15,9 @@
 #include "tests/DawnTest.h"
 
 #include <gmock/gmock.h>
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 #include "tests/MockCallback.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
 
 #include <cstring>
 

src/tests/end2end/DrawIndexedIndirectTests.cpp

@@ -14,9 +14,9 @@
 
 #include "tests/DawnTest.h"
 
-#include "utils/ComboRenderBundleEncoderDescriptor.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderBundleEncoderDescriptor.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 constexpr uint32_t kRTSize = 4;
 

src/tests/end2end/DrawIndexedTests.cpp

@@ -14,8 +14,8 @@
 
 #include "tests/DawnTest.h"
 
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 constexpr uint32_t kRTSize = 4;
 

src/tests/end2end/DrawIndirectTests.cpp

@@ -14,8 +14,8 @@
 
 #include "tests/DawnTest.h"
 
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 constexpr uint32_t kRTSize = 4;
 

src/tests/end2end/DrawTests.cpp

@@ -14,8 +14,8 @@
 
 #include "tests/DawnTest.h"
 
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 constexpr uint32_t kRTSize = 4;
 

src/tests/end2end/DynamicBufferOffsetTests.cpp

@@ -15,8 +15,8 @@
 #include "tests/DawnTest.h"
 
 #include "dawn/common/Math.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 #include <numeric>
 

src/tests/end2end/EntryPointTests.cpp

@@ -14,8 +14,8 @@
 
 #include "tests/DawnTest.h"
 
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 class EntryPointTests : public DawnTest {};
 

src/tests/end2end/ExternalTextureTests.cpp

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 #include "tests/DawnTest.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
 
 namespace {
 

src/tests/end2end/FirstIndexOffsetTests.cpp

@@ -17,8 +17,8 @@
 #include <sstream>
 #include <vector>
 
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 constexpr uint32_t kRTSize = 1;
 

src/tests/end2end/GpuMemorySynchronizationTests.cpp

@@ -15,9 +15,9 @@
 #include "dawn/common/Assert.h"
 #include "dawn/common/Constants.h"
 #include "dawn/common/Math.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 #include "tests/DawnTest.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
 
 class GpuMemorySyncTests : public DawnTest {
   protected:

src/tests/end2end/IOSurfaceWrappingTests.cpp

@@ -14,9 +14,9 @@
 
 #include "tests/DawnTest.h"
 
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 #include "dawn_native/MetalBackend.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreVideo/CVPixelBuffer.h>

src/tests/end2end/IndexFormatTests.cpp

@@ -15,8 +15,8 @@
 #include "tests/DawnTest.h"
 
 #include "dawn/common/Assert.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 constexpr uint32_t kRTSize = 400;
 

src/tests/end2end/MaxLimitTests.cpp

@@ -16,7 +16,7 @@
 
 #include "dawn/common/Math.h"
 #include "dawn/common/Platform.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 class MaxLimitTests : public DawnTest {
   public:

src/tests/end2end/MultisampledRenderingTests.cpp

@@ -15,8 +15,8 @@
 #include "tests/DawnTest.h"
 
 #include "dawn/common/Assert.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 class MultisampledRenderingTest : public DawnTest {
   protected:

src/tests/end2end/MultisampledSamplingTests.cpp

@@ -15,8 +15,8 @@
 #include "tests/DawnTest.h"
 
 #include "dawn/common/Math.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 namespace {
     // https://github.com/gpuweb/gpuweb/issues/108

src/tests/end2end/NonzeroTextureCreationTests.cpp

@@ -16,9 +16,9 @@
 
 #include "dawn/common/Constants.h"
 #include "dawn/common/Math.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/TestUtils.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/TestUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
 
 namespace {