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>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9309de..d561428 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -218,11 +218,11 @@
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()
diff --git a/docs/dawn/overview.md b/docs/dawn/overview.md
index 65d0bce..110d1d8 100644
--- a/docs/dawn/overview.md
+++ b/docs/dawn/overview.md
@@ -15,6 +15,7 @@
- [`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 @@
- [`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`)
diff --git a/examples/Animometer.cpp b/examples/Animometer.cpp
index 29e273d..0669ffc 100644
--- a/examples/Animometer.cpp
+++ b/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>
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 13607af..92c79ed 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -36,11 +36,11 @@
"${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" ]
}
diff --git a/examples/CHelloTriangle.cpp b/examples/CHelloTriangle.cpp
index 1426406..6d8b47e 100644
--- a/examples/CHelloTriangle.cpp
+++ b/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;
diff --git a/examples/ComputeBoids.cpp b/examples/ComputeBoids.cpp
index edde7eb..b92a395 100644
--- a/examples/ComputeBoids.cpp
+++ b/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>
diff --git a/examples/CppHelloTriangle.cpp b/examples/CppHelloTriangle.cpp
index 83699ac..270a054 100644
--- a/examples/CppHelloTriangle.cpp
+++ b/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>
diff --git a/examples/ManualSwapChainTest.cpp b/examples/ManualSwapChainTest.cpp
index 1dc0afc..0e9239f 100644
--- a/examples/ManualSwapChainTest.cpp
+++ b/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>
diff --git a/examples/SampleUtils.cpp b/examples/SampleUtils.cpp
index 9e41d8c..2cfc370 100644
--- a/examples/SampleUtils.cpp
+++ b/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>
diff --git a/src/utils/BUILD.gn b/src/dawn/utils/BUILD.gn
similarity index 93%
rename from src/utils/BUILD.gn
rename to src/dawn/utils/BUILD.gn
index 3d3f2fe..2b911fe 100644
--- a/src/utils/BUILD.gn
+++ b/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 @@
# 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 @@
]
}
- 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 @@
# 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 @@
"GLFWUtils.cpp",
"GLFWUtils.h",
]
- deps += [ ":dawn_glfw" ]
+ deps += [ ":glfw" ]
if (dawn_enable_metal) {
sources += [ "GLFWUtils_metal.mm" ]
@@ -143,7 +143,7 @@
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 @@
public_deps = [ "${dawn_root}/src/dawn:dawn_headers" ]
deps = [
- ":dawn_glfw",
+ ":glfw",
"${dawn_root}/src/dawn/common",
"${dawn_root}/src/dawn_native",
]
diff --git a/src/utils/BackendBinding.cpp b/src/dawn/utils/BackendBinding.cpp
similarity index 98%
rename from src/utils/BackendBinding.cpp
rename to src/dawn/utils/BackendBinding.cpp
index e1aef2c..d1f1789 100644
--- a/src/utils/BackendBinding.cpp
+++ b/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"
diff --git a/src/utils/BackendBinding.h b/src/dawn/utils/BackendBinding.h
similarity index 100%
rename from src/utils/BackendBinding.h
rename to src/dawn/utils/BackendBinding.h
diff --git a/src/utils/CMakeLists.txt b/src/dawn/utils/CMakeLists.txt
similarity index 100%
rename from src/utils/CMakeLists.txt
rename to src/dawn/utils/CMakeLists.txt
diff --git a/src/utils/ComboRenderBundleEncoderDescriptor.cpp b/src/dawn/utils/ComboRenderBundleEncoderDescriptor.cpp
similarity index 90%
rename from src/utils/ComboRenderBundleEncoderDescriptor.cpp
rename to src/dawn/utils/ComboRenderBundleEncoderDescriptor.cpp
index 8b076e1..9c413d2 100644
--- a/src/utils/ComboRenderBundleEncoderDescriptor.cpp
+++ b/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 {
diff --git a/src/utils/ComboRenderBundleEncoderDescriptor.h b/src/dawn/utils/ComboRenderBundleEncoderDescriptor.h
similarity index 100%
rename from src/utils/ComboRenderBundleEncoderDescriptor.h
rename to src/dawn/utils/ComboRenderBundleEncoderDescriptor.h
diff --git a/src/utils/ComboRenderPipelineDescriptor.cpp b/src/dawn/utils/ComboRenderPipelineDescriptor.cpp
similarity index 98%
rename from src/utils/ComboRenderPipelineDescriptor.cpp
rename to src/dawn/utils/ComboRenderPipelineDescriptor.cpp
index 3906830..1114af4 100644
--- a/src/utils/ComboRenderPipelineDescriptor.cpp
+++ b/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 {
diff --git a/src/utils/ComboRenderPipelineDescriptor.h b/src/dawn/utils/ComboRenderPipelineDescriptor.h
similarity index 100%
rename from src/utils/ComboRenderPipelineDescriptor.h
rename to src/dawn/utils/ComboRenderPipelineDescriptor.h
diff --git a/src/utils/D3D12Binding.cpp b/src/dawn/utils/D3D12Binding.cpp
similarity index 97%
rename from src/utils/D3D12Binding.cpp
rename to src/dawn/utils/D3D12Binding.cpp
index 2f54934..7b64c29 100644
--- a/src/utils/D3D12Binding.cpp
+++ b/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"
diff --git a/src/utils/EmptyDebugLogger.cpp b/src/dawn/utils/EmptyDebugLogger.cpp
similarity index 95%
rename from src/utils/EmptyDebugLogger.cpp
rename to src/dawn/utils/EmptyDebugLogger.cpp
index ed0ad7f..b52b38f 100644
--- a/src/utils/EmptyDebugLogger.cpp
+++ b/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 {
diff --git a/src/utils/GLFWUtils.cpp b/src/dawn/utils/GLFWUtils.cpp
similarity index 98%
rename from src/utils/GLFWUtils.cpp
rename to src/dawn/utils/GLFWUtils.cpp
index 1ac5b38..de77ccd 100644
--- a/src/utils/GLFWUtils.cpp
+++ b/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"
diff --git a/src/utils/GLFWUtils.h b/src/dawn/utils/GLFWUtils.h
similarity index 100%
rename from src/utils/GLFWUtils.h
rename to src/dawn/utils/GLFWUtils.h
diff --git a/src/utils/GLFWUtils_metal.mm b/src/dawn/utils/GLFWUtils_metal.mm
similarity index 97%
rename from src/utils/GLFWUtils_metal.mm
rename to src/dawn/utils/GLFWUtils_metal.mm
index a920ec0..b574002 100644
--- a/src/utils/GLFWUtils_metal.mm
+++ b/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"
diff --git a/src/utils/Glfw3Fuchsia.cpp b/src/dawn/utils/Glfw3Fuchsia.cpp
similarity index 100%
rename from src/utils/Glfw3Fuchsia.cpp
rename to src/dawn/utils/Glfw3Fuchsia.cpp
diff --git a/src/utils/MetalBinding.mm b/src/dawn/utils/MetalBinding.mm
similarity index 98%
rename from src/utils/MetalBinding.mm
rename to src/dawn/utils/MetalBinding.mm
index d3ab144..330a6b0 100644
--- a/src/utils/MetalBinding.mm
+++ b/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"
diff --git a/src/utils/NullBinding.cpp b/src/dawn/utils/NullBinding.cpp
similarity index 97%
rename from src/utils/NullBinding.cpp
rename to src/dawn/utils/NullBinding.cpp
index 8fdc2e8..3c547f0 100644
--- a/src/utils/NullBinding.cpp
+++ b/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"
diff --git a/src/utils/OSXTimer.cpp b/src/dawn/utils/OSXTimer.cpp
similarity index 98%
rename from src/utils/OSXTimer.cpp
rename to src/dawn/utils/OSXTimer.cpp
index da41375..818b27b 100644
--- a/src/utils/OSXTimer.cpp
+++ b/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>
diff --git a/src/utils/ObjCUtils.h b/src/dawn/utils/ObjCUtils.h
similarity index 100%
rename from src/utils/ObjCUtils.h
rename to src/dawn/utils/ObjCUtils.h
diff --git a/src/utils/ObjCUtils.mm b/src/dawn/utils/ObjCUtils.mm
similarity index 95%
rename from src/utils/ObjCUtils.mm
rename to src/dawn/utils/ObjCUtils.mm
index 5eba147..c006976 100644
--- a/src/utils/ObjCUtils.mm
+++ b/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>
diff --git a/src/utils/OpenGLBinding.cpp b/src/dawn/utils/OpenGLBinding.cpp
similarity index 97%
rename from src/utils/OpenGLBinding.cpp
rename to src/dawn/utils/OpenGLBinding.cpp
index 3521b1b..0df6895 100644
--- a/src/utils/OpenGLBinding.cpp
+++ b/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"
diff --git a/src/utils/PlatformDebugLogger.h b/src/dawn/utils/PlatformDebugLogger.h
similarity index 100%
rename from src/utils/PlatformDebugLogger.h
rename to src/dawn/utils/PlatformDebugLogger.h
diff --git a/src/utils/PosixTimer.cpp b/src/dawn/utils/PosixTimer.cpp
similarity index 98%
rename from src/utils/PosixTimer.cpp
rename to src/dawn/utils/PosixTimer.cpp
index a79e7b1..18eb5e6 100644
--- a/src/utils/PosixTimer.cpp
+++ b/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>
diff --git a/src/utils/ScopedAutoreleasePool.cpp b/src/dawn/utils/ScopedAutoreleasePool.cpp
similarity index 95%
rename from src/utils/ScopedAutoreleasePool.cpp
rename to src/dawn/utils/ScopedAutoreleasePool.cpp
index b0c5d81..2f5f050 100644
--- a/src/utils/ScopedAutoreleasePool.cpp
+++ b/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"
diff --git a/src/utils/ScopedAutoreleasePool.h b/src/dawn/utils/ScopedAutoreleasePool.h
similarity index 100%
rename from src/utils/ScopedAutoreleasePool.h
rename to src/dawn/utils/ScopedAutoreleasePool.h
diff --git a/src/utils/ScopedAutoreleasePool.mm b/src/dawn/utils/ScopedAutoreleasePool.mm
similarity index 96%
rename from src/utils/ScopedAutoreleasePool.mm
rename to src/dawn/utils/ScopedAutoreleasePool.mm
index f649f3e..c4cb9a2 100644
--- a/src/utils/ScopedAutoreleasePool.mm
+++ b/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>
diff --git a/src/utils/SystemUtils.cpp b/src/dawn/utils/SystemUtils.cpp
similarity index 100%
rename from src/utils/SystemUtils.cpp
rename to src/dawn/utils/SystemUtils.cpp
diff --git a/src/utils/SystemUtils.h b/src/dawn/utils/SystemUtils.h
similarity index 100%
rename from src/utils/SystemUtils.h
rename to src/dawn/utils/SystemUtils.h
diff --git a/src/utils/TerribleCommandBuffer.cpp b/src/dawn/utils/TerribleCommandBuffer.cpp
similarity index 97%
rename from src/utils/TerribleCommandBuffer.cpp
rename to src/dawn/utils/TerribleCommandBuffer.cpp
index 975962d..b99243b 100644
--- a/src/utils/TerribleCommandBuffer.cpp
+++ b/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"
diff --git a/src/utils/TerribleCommandBuffer.h b/src/dawn/utils/TerribleCommandBuffer.h
similarity index 100%
rename from src/utils/TerribleCommandBuffer.h
rename to src/dawn/utils/TerribleCommandBuffer.h
diff --git a/src/utils/TestUtils.cpp b/src/dawn/utils/TestUtils.cpp
similarity index 98%
rename from src/utils/TestUtils.cpp
rename to src/dawn/utils/TestUtils.cpp
index a67182d..31535f2 100644
--- a/src/utils/TestUtils.cpp
+++ b/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>
diff --git a/src/utils/TestUtils.h b/src/dawn/utils/TestUtils.h
similarity index 100%
rename from src/utils/TestUtils.h
rename to src/dawn/utils/TestUtils.h
diff --git a/src/utils/TextureUtils.cpp b/src/dawn/utils/TextureUtils.cpp
similarity index 100%
rename from src/utils/TextureUtils.cpp
rename to src/dawn/utils/TextureUtils.cpp
diff --git a/src/utils/TextureUtils.h b/src/dawn/utils/TextureUtils.h
similarity index 100%
rename from src/utils/TextureUtils.h
rename to src/dawn/utils/TextureUtils.h
diff --git a/src/utils/Timer.h b/src/dawn/utils/Timer.h
similarity index 100%
rename from src/utils/Timer.h
rename to src/dawn/utils/Timer.h
diff --git a/src/utils/VulkanBinding.cpp b/src/dawn/utils/VulkanBinding.cpp
similarity index 97%
rename from src/utils/VulkanBinding.cpp
rename to src/dawn/utils/VulkanBinding.cpp
index ce856c5..564fd96 100644
--- a/src/utils/VulkanBinding.cpp
+++ b/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"
diff --git a/src/utils/WGPUHelpers.cpp b/src/dawn/utils/WGPUHelpers.cpp
similarity index 99%
rename from src/utils/WGPUHelpers.cpp
rename to src/dawn/utils/WGPUHelpers.cpp
index 4fab43f..238d403 100644
--- a/src/utils/WGPUHelpers.cpp
+++ b/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"
diff --git a/src/utils/WGPUHelpers.h b/src/dawn/utils/WGPUHelpers.h
similarity index 99%
rename from src/utils/WGPUHelpers.h
rename to src/dawn/utils/WGPUHelpers.h
index 540d171..f08c142 100644
--- a/src/utils/WGPUHelpers.h
+++ b/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 {
diff --git a/src/utils/WindowsDebugLogger.cpp b/src/dawn/utils/WindowsDebugLogger.cpp
similarity index 98%
rename from src/utils/WindowsDebugLogger.cpp
rename to src/dawn/utils/WindowsDebugLogger.cpp
index 1190339..159c71a 100644
--- a/src/utils/WindowsDebugLogger.cpp
+++ b/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"
diff --git a/src/utils/WindowsTimer.cpp b/src/dawn/utils/WindowsTimer.cpp
similarity index 98%
rename from src/utils/WindowsTimer.cpp
rename to src/dawn/utils/WindowsTimer.cpp
index 95996a1..ca165d0 100644
--- a/src/utils/WindowsTimer.cpp
+++ b/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>
diff --git a/src/utils/WireHelper.cpp b/src/dawn/utils/WireHelper.cpp
similarity index 98%
rename from src/utils/WireHelper.cpp
rename to src/dawn/utils/WireHelper.cpp
index afa4a8c..ec052cf 100644
--- a/src/utils/WireHelper.cpp
+++ b/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>
diff --git a/src/utils/WireHelper.h b/src/dawn/utils/WireHelper.h
similarity index 100%
rename from src/utils/WireHelper.h
rename to src/dawn/utils/WireHelper.h
diff --git a/src/dawn_native/CreatePipelineAsyncTask.cpp b/src/dawn_native/CreatePipelineAsyncTask.cpp
index 5683c70..1fe5d82 100644
--- a/src/dawn_native/CreatePipelineAsyncTask.cpp
+++ b/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 {
diff --git a/src/dawn_native/Device.cpp b/src/dawn_native/Device.cpp
index 9e23622..6df3f39 100644
--- a/src/dawn_native/Device.cpp
+++ b/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>
diff --git a/src/fuzzers/dawn/BUILD.gn b/src/fuzzers/dawn/BUILD.gn
index 23f6081..2efb3ec 100644
--- a/src/fuzzers/dawn/BUILD.gn
+++ b/src/fuzzers/dawn/BUILD.gn
@@ -78,9 +78,9 @@
"${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",
]
}
diff --git a/src/fuzzers/dawn/DawnWireServerFuzzer.cpp b/src/fuzzers/dawn/DawnWireServerFuzzer.cpp
index ba12da3..7d88faf 100644
--- a/src/fuzzers/dawn/DawnWireServerFuzzer.cpp
+++ b/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>
diff --git a/src/tests/BUILD.gn b/src/tests/BUILD.gn
index 9d6287e..224ac57 100644
--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -133,9 +133,9 @@
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 @@
"${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 @@
"${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 @@
"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 @@
"${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 @@
}
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 @@
"${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 @@
}
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 @@
"${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 @@
}
if (dawn_enable_opengl) {
- deps += [ "${dawn_root}/src/utils:dawn_glfw" ]
+ deps += [ "${dawn_root}/src/dawn/utils:glfw" ]
}
}
diff --git a/src/tests/DawnTest.cpp b/src/tests/DawnTest.cpp
index 30a14bd..3367fe7 100644
--- a/src/tests/DawnTest.cpp
+++ b/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>
diff --git a/src/tests/DawnTest.h b/src/tests/DawnTest.h
index f074cc0..fc13086 100644
--- a/src/tests/DawnTest.h
+++ b/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>
diff --git a/src/tests/end2end/BasicTests.cpp b/src/tests/end2end/BasicTests.cpp
index bc31656..05d536f 100644
--- a/src/tests/end2end/BasicTests.cpp
+++ b/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 {};
diff --git a/src/tests/end2end/BindGroupTests.cpp b/src/tests/end2end/BindGroupTests.cpp
index ff1a9e6..3405220 100644
--- a/src/tests/end2end/BindGroupTests.cpp
+++ b/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;
diff --git a/src/tests/end2end/BufferZeroInitTests.cpp b/src/tests/end2end/BufferZeroInitTests.cpp
index 034fbd6..c15b015 100644
--- a/src/tests/end2end/BufferZeroInitTests.cpp
+++ b/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 { \
diff --git a/src/tests/end2end/ClipSpaceTests.cpp b/src/tests/end2end/ClipSpaceTests.cpp
index fb9d73f..128348d 100644
--- a/src/tests/end2end/ClipSpaceTests.cpp
+++ b/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:
diff --git a/src/tests/end2end/ColorStateTests.cpp b/src/tests/end2end/ColorStateTests.cpp
index 69f2287..ee4b3f3 100644
--- a/src/tests/end2end/ColorStateTests.cpp
+++ b/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;
diff --git a/src/tests/end2end/CommandEncoderTests.cpp b/src/tests/end2end/CommandEncoderTests.cpp
index 589f314..4c156dc 100644
--- a/src/tests/end2end/CommandEncoderTests.cpp
+++ b/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 {};
diff --git a/src/tests/end2end/CompressedTextureFormatTests.cpp b/src/tests/end2end/CompressedTextureFormatTests.cpp
index 8110d12..ac80621 100644
--- a/src/tests/end2end/CompressedTextureFormatTests.cpp
+++ b/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 {
diff --git a/src/tests/end2end/ComputeCopyStorageBufferTests.cpp b/src/tests/end2end/ComputeCopyStorageBufferTests.cpp
index 4bb32c9..4c7ce9f 100644
--- a/src/tests/end2end/ComputeCopyStorageBufferTests.cpp
+++ b/src/tests/end2end/ComputeCopyStorageBufferTests.cpp
@@ -14,7 +14,7 @@
#include "tests/DawnTest.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
#include <array>
diff --git a/src/tests/end2end/ComputeDispatchTests.cpp b/src/tests/end2end/ComputeDispatchTests.cpp
index 05ac948..f56066d 100644
--- a/src/tests/end2end/ComputeDispatchTests.cpp
+++ b/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>
diff --git a/src/tests/end2end/ComputeLayoutMemoryBufferTests.cpp b/src/tests/end2end/ComputeLayoutMemoryBufferTests.cpp
index 3140e49..0b8b6c8 100644
--- a/src/tests/end2end/ComputeLayoutMemoryBufferTests.cpp
+++ b/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>
diff --git a/src/tests/end2end/ComputeSharedMemoryTests.cpp b/src/tests/end2end/ComputeSharedMemoryTests.cpp
index 0541746..1bc0d31 100644
--- a/src/tests/end2end/ComputeSharedMemoryTests.cpp
+++ b/src/tests/end2end/ComputeSharedMemoryTests.cpp
@@ -14,7 +14,7 @@
#include "tests/DawnTest.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
#include <array>
diff --git a/src/tests/end2end/ComputeStorageBufferBarrierTests.cpp b/src/tests/end2end/ComputeStorageBufferBarrierTests.cpp
index 3674597..8b3131d 100644
--- a/src/tests/end2end/ComputeStorageBufferBarrierTests.cpp
+++ b/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:
diff --git a/src/tests/end2end/CopyTests.cpp b/src/tests/end2end/CopyTests.cpp
index 829d7b7..17132de 100644
--- a/src/tests/end2end/CopyTests.cpp
+++ b/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;
diff --git a/src/tests/end2end/CopyTextureForBrowserTests.cpp b/src/tests/end2end/CopyTextureForBrowserTests.cpp
index cb3b0e3..2932674 100644
--- a/src/tests/end2end/CopyTextureForBrowserTests.cpp
+++ b/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;
diff --git a/src/tests/end2end/CreatePipelineAsyncTests.cpp b/src/tests/end2end/CreatePipelineAsyncTests.cpp
index cd66816..959ff6c 100644
--- a/src/tests/end2end/CreatePipelineAsyncTests.cpp
+++ b/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 {
diff --git a/src/tests/end2end/CullingTests.cpp b/src/tests/end2end/CullingTests.cpp
index 5fa34f2..fb5c4d1 100644
--- a/src/tests/end2end/CullingTests.cpp
+++ b/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:
diff --git a/src/tests/end2end/D3D12CachingTests.cpp b/src/tests/end2end/D3D12CachingTests.cpp
index 7545e2e..480d384 100644
--- a/src/tests/end2end/D3D12CachingTests.cpp
+++ b/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 { \
diff --git a/src/tests/end2end/D3D12ResourceWrappingTests.cpp b/src/tests/end2end/D3D12ResourceWrappingTests.cpp
index 8d780cb..19587c5 100644
--- a/src/tests/end2end/D3D12ResourceWrappingTests.cpp
+++ b/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;
diff --git a/src/tests/end2end/DebugMarkerTests.cpp b/src/tests/end2end/DebugMarkerTests.cpp
index a8c4161..7e57df9 100644
--- a/src/tests/end2end/DebugMarkerTests.cpp
+++ b/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 {};
diff --git a/src/tests/end2end/DeprecatedAPITests.cpp b/src/tests/end2end/DeprecatedAPITests.cpp
index febdee3..0cf934d 100644
--- a/src/tests/end2end/DeprecatedAPITests.cpp
+++ b/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>
diff --git a/src/tests/end2end/DepthBiasTests.cpp b/src/tests/end2end/DepthBiasTests.cpp
index 075d132..339d77e 100644
--- a/src/tests/end2end/DepthBiasTests.cpp
+++ b/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;
diff --git a/src/tests/end2end/DepthStencilCopyTests.cpp b/src/tests/end2end/DepthStencilCopyTests.cpp
index 4d847ca..388e1da 100644
--- a/src/tests/end2end/DepthStencilCopyTests.cpp
+++ b/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;
diff --git a/src/tests/end2end/DepthStencilLoadOpTests.cpp b/src/tests/end2end/DepthStencilLoadOpTests.cpp
index e9b0796..d3e777f 100644
--- a/src/tests/end2end/DepthStencilLoadOpTests.cpp
+++ b/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 {
diff --git a/src/tests/end2end/DepthStencilSamplingTests.cpp b/src/tests/end2end/DepthStencilSamplingTests.cpp
index 7b1085a..36d7d98 100644
--- a/src/tests/end2end/DepthStencilSamplingTests.cpp
+++ b/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;
diff --git a/src/tests/end2end/DepthStencilStateTests.cpp b/src/tests/end2end/DepthStencilStateTests.cpp
index 98ae22d..d36ae91 100644
--- a/src/tests/end2end/DepthStencilStateTests.cpp
+++ b/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;
diff --git a/src/tests/end2end/DestroyTests.cpp b/src/tests/end2end/DestroyTests.cpp
index 4ad47d3..e4d26dd 100644
--- a/src/tests/end2end/DestroyTests.cpp
+++ b/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;
diff --git a/src/tests/end2end/DeviceInitializationTests.cpp b/src/tests/end2end/DeviceInitializationTests.cpp
index 0c342cc..021dcc0 100644
--- a/src/tests/end2end/DeviceInitializationTests.cpp
+++ b/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 {
diff --git a/src/tests/end2end/DeviceLostTests.cpp b/src/tests/end2end/DeviceLostTests.cpp
index 8e5aa86..c4fccec 100644
--- a/src/tests/end2end/DeviceLostTests.cpp
+++ b/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>
diff --git a/src/tests/end2end/DrawIndexedIndirectTests.cpp b/src/tests/end2end/DrawIndexedIndirectTests.cpp
index 87a06f8..60f44ff 100644
--- a/src/tests/end2end/DrawIndexedIndirectTests.cpp
+++ b/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;
diff --git a/src/tests/end2end/DrawIndexedTests.cpp b/src/tests/end2end/DrawIndexedTests.cpp
index 2d301d3..a08e3fc 100644
--- a/src/tests/end2end/DrawIndexedTests.cpp
+++ b/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;
diff --git a/src/tests/end2end/DrawIndirectTests.cpp b/src/tests/end2end/DrawIndirectTests.cpp
index 36c00ba..778c84c 100644
--- a/src/tests/end2end/DrawIndirectTests.cpp
+++ b/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;
diff --git a/src/tests/end2end/DrawTests.cpp b/src/tests/end2end/DrawTests.cpp
index a539315..efb3786 100644
--- a/src/tests/end2end/DrawTests.cpp
+++ b/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;
diff --git a/src/tests/end2end/DynamicBufferOffsetTests.cpp b/src/tests/end2end/DynamicBufferOffsetTests.cpp
index 3719486..4d00066 100644
--- a/src/tests/end2end/DynamicBufferOffsetTests.cpp
+++ b/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>
diff --git a/src/tests/end2end/EntryPointTests.cpp b/src/tests/end2end/EntryPointTests.cpp
index 46e1c37..1803888 100644
--- a/src/tests/end2end/EntryPointTests.cpp
+++ b/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 {};
diff --git a/src/tests/end2end/ExternalTextureTests.cpp b/src/tests/end2end/ExternalTextureTests.cpp
index b8a0063..0d5d35a 100644
--- a/src/tests/end2end/ExternalTextureTests.cpp
+++ b/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 {
diff --git a/src/tests/end2end/FirstIndexOffsetTests.cpp b/src/tests/end2end/FirstIndexOffsetTests.cpp
index 3e674ef..ca3e87e 100644
--- a/src/tests/end2end/FirstIndexOffsetTests.cpp
+++ b/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;
diff --git a/src/tests/end2end/GpuMemorySynchronizationTests.cpp b/src/tests/end2end/GpuMemorySynchronizationTests.cpp
index 62b509d..8a62fbe 100644
--- a/src/tests/end2end/GpuMemorySynchronizationTests.cpp
+++ b/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:
diff --git a/src/tests/end2end/IOSurfaceWrappingTests.cpp b/src/tests/end2end/IOSurfaceWrappingTests.cpp
index 5417ef6..99a506f 100644
--- a/src/tests/end2end/IOSurfaceWrappingTests.cpp
+++ b/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>
diff --git a/src/tests/end2end/IndexFormatTests.cpp b/src/tests/end2end/IndexFormatTests.cpp
index 485b658..636af3b 100644
--- a/src/tests/end2end/IndexFormatTests.cpp
+++ b/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;
diff --git a/src/tests/end2end/MaxLimitTests.cpp b/src/tests/end2end/MaxLimitTests.cpp
index b4dddc8..0e46a9f 100644
--- a/src/tests/end2end/MaxLimitTests.cpp
+++ b/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:
diff --git a/src/tests/end2end/MultisampledRenderingTests.cpp b/src/tests/end2end/MultisampledRenderingTests.cpp
index 55a79d8..eb17ca0 100644
--- a/src/tests/end2end/MultisampledRenderingTests.cpp
+++ b/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:
diff --git a/src/tests/end2end/MultisampledSamplingTests.cpp b/src/tests/end2end/MultisampledSamplingTests.cpp
index 224c37a..17d52e4 100644
--- a/src/tests/end2end/MultisampledSamplingTests.cpp
+++ b/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
diff --git a/src/tests/end2end/NonzeroTextureCreationTests.cpp b/src/tests/end2end/NonzeroTextureCreationTests.cpp
index 521a77d..b9d06b3 100644
--- a/src/tests/end2end/NonzeroTextureCreationTests.cpp
+++ b/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 {
diff --git a/src/tests/end2end/ObjectCachingTests.cpp b/src/tests/end2end/ObjectCachingTests.cpp
index f37a470..26787e2 100644
--- a/src/tests/end2end/ObjectCachingTests.cpp
+++ b/src/tests/end2end/ObjectCachingTests.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 ObjectCachingTest : public DawnTest {};
diff --git a/src/tests/end2end/OpArrayLengthTests.cpp b/src/tests/end2end/OpArrayLengthTests.cpp
index 1765a68..8efc02a 100644
--- a/src/tests/end2end/OpArrayLengthTests.cpp
+++ b/src/tests/end2end/OpArrayLengthTests.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 OpArrayLengthTest : public DawnTest {
protected:
diff --git a/src/tests/end2end/PrimitiveStateTests.cpp b/src/tests/end2end/PrimitiveStateTests.cpp
index d66419d..10e06ea 100644
--- a/src/tests/end2end/PrimitiveStateTests.cpp
+++ b/src/tests/end2end/PrimitiveStateTests.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 = 1;
diff --git a/src/tests/end2end/PrimitiveTopologyTests.cpp b/src/tests/end2end/PrimitiveTopologyTests.cpp
index c3138fb..a09b991 100644
--- a/src/tests/end2end/PrimitiveTopologyTests.cpp
+++ b/src/tests/end2end/PrimitiveTopologyTests.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"
// Primitive topology tests work by drawing the following vertices with all the different primitive
// topology states:
diff --git a/src/tests/end2end/QueryTests.cpp b/src/tests/end2end/QueryTests.cpp
index c20ce35..ebeb86b 100644
--- a/src/tests/end2end/QueryTests.cpp
+++ b/src/tests/end2end/QueryTests.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 QueryTests : public DawnTest {
protected:
diff --git a/src/tests/end2end/QueueTests.cpp b/src/tests/end2end/QueueTests.cpp
index 962ee39..4076b0c 100644
--- a/src/tests/end2end/QueueTests.cpp
+++ b/src/tests/end2end/QueueTests.cpp
@@ -15,9 +15,9 @@
#include "tests/DawnTest.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"
class QueueTests : public DawnTest {};
diff --git a/src/tests/end2end/ReadOnlyDepthStencilAttachmentTests.cpp b/src/tests/end2end/ReadOnlyDepthStencilAttachmentTests.cpp
index ee3e0b6..bfe6bf0 100644
--- a/src/tests/end2end/ReadOnlyDepthStencilAttachmentTests.cpp
+++ b/src/tests/end2end/ReadOnlyDepthStencilAttachmentTests.cpp
@@ -14,9 +14,9 @@
#include "tests/DawnTest.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/TextureUtils.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/TextureUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
constexpr static uint32_t kSize = 4;
diff --git a/src/tests/end2end/RenderAttachmentTests.cpp b/src/tests/end2end/RenderAttachmentTests.cpp
index 1fedc49..9e4757a 100644
--- a/src/tests/end2end/RenderAttachmentTests.cpp
+++ b/src/tests/end2end/RenderAttachmentTests.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 RenderAttachmentTest : public DawnTest {};
diff --git a/src/tests/end2end/RenderBundleTests.cpp b/src/tests/end2end/RenderBundleTests.cpp
index e65592f..f8ffa20 100644
--- a/src/tests/end2end/RenderBundleTests.cpp
+++ b/src/tests/end2end/RenderBundleTests.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;
const RGBA8 kColors[2] = {RGBA8::kGreen, RGBA8::kBlue};
diff --git a/src/tests/end2end/RenderPassLoadOpTests.cpp b/src/tests/end2end/RenderPassLoadOpTests.cpp
index 78220f7..dc91198 100644
--- a/src/tests/end2end/RenderPassLoadOpTests.cpp
+++ b/src/tests/end2end/RenderPassLoadOpTests.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"
#include <array>
diff --git a/src/tests/end2end/RenderPassTests.cpp b/src/tests/end2end/RenderPassTests.cpp
index 40f9975..4a0e998 100644
--- a/src/tests/end2end/RenderPassTests.cpp
+++ b/src/tests/end2end/RenderPassTests.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 = 16;
constexpr wgpu::TextureFormat kFormat = wgpu::TextureFormat::RGBA8Unorm;
diff --git a/src/tests/end2end/SamplerFilterAnisotropicTests.cpp b/src/tests/end2end/SamplerFilterAnisotropicTests.cpp
index dec8405..938ab88 100644
--- a/src/tests/end2end/SamplerFilterAnisotropicTests.cpp
+++ b/src/tests/end2end/SamplerFilterAnisotropicTests.cpp
@@ -18,8 +18,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 = 16;
diff --git a/src/tests/end2end/SamplerTests.cpp b/src/tests/end2end/SamplerTests.cpp
index 8e91b51..01d55e4 100644
--- a/src/tests/end2end/SamplerTests.cpp
+++ b/src/tests/end2end/SamplerTests.cpp
@@ -18,8 +18,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;
diff --git a/src/tests/end2end/ScissorTests.cpp b/src/tests/end2end/ScissorTests.cpp
index 8069f88..362acb2 100644
--- a/src/tests/end2end/ScissorTests.cpp
+++ b/src/tests/end2end/ScissorTests.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 ScissorTest : public DawnTest {
protected:
diff --git a/src/tests/end2end/ShaderFloat16Tests.cpp b/src/tests/end2end/ShaderFloat16Tests.cpp
index 9c9ae47..4f60af7 100644
--- a/src/tests/end2end/ShaderFloat16Tests.cpp
+++ b/src/tests/end2end/ShaderFloat16Tests.cpp
@@ -15,7 +15,7 @@
#include "dawn/common/Math.h"
#include "tests/DawnTest.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
class ShaderFloat16Tests : public DawnTest {
protected:
diff --git a/src/tests/end2end/ShaderTests.cpp b/src/tests/end2end/ShaderTests.cpp
index ecf6708..41a6fab 100644
--- a/src/tests/end2end/ShaderTests.cpp
+++ b/src/tests/end2end/ShaderTests.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"
#include <numeric>
#include <vector>
diff --git a/src/tests/end2end/StorageTextureTests.cpp b/src/tests/end2end/StorageTextureTests.cpp
index e098d05..d944bff 100644
--- a/src/tests/end2end/StorageTextureTests.cpp
+++ b/src/tests/end2end/StorageTextureTests.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"
namespace {
bool OpenGLESSupportsStorageTexture(wgpu::TextureFormat format) {
diff --git a/src/tests/end2end/SubresourceRenderAttachmentTests.cpp b/src/tests/end2end/SubresourceRenderAttachmentTests.cpp
index 0a3879c..2cf86f4 100644
--- a/src/tests/end2end/SubresourceRenderAttachmentTests.cpp
+++ b/src/tests/end2end/SubresourceRenderAttachmentTests.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"
// Test that rendering to a subresource of a texture works.
class SubresourceRenderAttachmentTest : public DawnTest {
diff --git a/src/tests/end2end/SwapChainTests.cpp b/src/tests/end2end/SwapChainTests.cpp
index 6c2bac6..526e5f2 100644
--- a/src/tests/end2end/SwapChainTests.cpp
+++ b/src/tests/end2end/SwapChainTests.cpp
@@ -16,8 +16,8 @@
#include "dawn/common/Constants.h"
#include "dawn/common/Log.h"
-#include "utils/GLFWUtils.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/GLFWUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
#include "GLFW/glfw3.h"
diff --git a/src/tests/end2end/SwapChainValidationTests.cpp b/src/tests/end2end/SwapChainValidationTests.cpp
index cf0598f..200c1b1 100644
--- a/src/tests/end2end/SwapChainValidationTests.cpp
+++ b/src/tests/end2end/SwapChainValidationTests.cpp
@@ -16,9 +16,9 @@
#include "dawn/common/Constants.h"
#include "dawn/common/Log.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/GLFWUtils.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/GLFWUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
#include "GLFW/glfw3.h"
diff --git a/src/tests/end2end/Texture3DTests.cpp b/src/tests/end2end/Texture3DTests.cpp
index f4fd5f0..6d64326 100644
--- a/src/tests/end2end/Texture3DTests.cpp
+++ b/src/tests/end2end/Texture3DTests.cpp
@@ -14,9 +14,9 @@
#include "tests/DawnTest.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"
constexpr static uint32_t kRTSize = 4;
constexpr wgpu::TextureFormat kFormat = wgpu::TextureFormat::RGBA8Unorm;
diff --git a/src/tests/end2end/TextureFormatTests.cpp b/src/tests/end2end/TextureFormatTests.cpp
index afe160e..e8c9659 100644
--- a/src/tests/end2end/TextureFormatTests.cpp
+++ b/src/tests/end2end/TextureFormatTests.cpp
@@ -16,9 +16,9 @@
#include "dawn/common/Assert.h"
#include "dawn/common/Math.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/TextureUtils.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/TextureUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
#include <cmath>
#include <type_traits>
diff --git a/src/tests/end2end/TextureSubresourceTests.cpp b/src/tests/end2end/TextureSubresourceTests.cpp
index a46fa92..b5b3d5f 100644
--- a/src/tests/end2end/TextureSubresourceTests.cpp
+++ b/src/tests/end2end/TextureSubresourceTests.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 TextureSubresourceTest : public DawnTest {
public:
diff --git a/src/tests/end2end/TextureViewTests.cpp b/src/tests/end2end/TextureViewTests.cpp
index 76284c1..60f830d 100644
--- a/src/tests/end2end/TextureViewTests.cpp
+++ b/src/tests/end2end/TextureViewTests.cpp
@@ -17,8 +17,8 @@
#include "dawn/common/Assert.h"
#include "dawn/common/Constants.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 <array>
diff --git a/src/tests/end2end/TextureZeroInitTests.cpp b/src/tests/end2end/TextureZeroInitTests.cpp
index f7ab2ec..29edad3 100644
--- a/src/tests/end2end/TextureZeroInitTests.cpp
+++ b/src/tests/end2end/TextureZeroInitTests.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 { \
diff --git a/src/tests/end2end/VertexFormatTests.cpp b/src/tests/end2end/VertexFormatTests.cpp
index b9a7b07..3901676 100644
--- a/src/tests/end2end/VertexFormatTests.cpp
+++ b/src/tests/end2end/VertexFormatTests.cpp
@@ -16,8 +16,8 @@
#include "dawn/common/Assert.h"
#include "dawn/common/Math.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
// Vertex format tests all work the same way: the test will render a triangle.
// Each test will set up a vertex buffer, and the vertex shader will check that
diff --git a/src/tests/end2end/VertexOnlyRenderPipelineTests.cpp b/src/tests/end2end/VertexOnlyRenderPipelineTests.cpp
index 45a3caa..2e615f3 100644
--- a/src/tests/end2end/VertexOnlyRenderPipelineTests.cpp
+++ b/src/tests/end2end/VertexOnlyRenderPipelineTests.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 wgpu::TextureFormat kDepthStencilFormat = wgpu::TextureFormat::Depth24PlusStencil8;
constexpr wgpu::TextureFormat kColorFormat = wgpu::TextureFormat::RGBA8Unorm;
diff --git a/src/tests/end2end/VertexStateTests.cpp b/src/tests/end2end/VertexStateTests.cpp
index 81a37e5..bdd4681 100644
--- a/src/tests/end2end/VertexStateTests.cpp
+++ b/src/tests/end2end/VertexStateTests.cpp
@@ -16,8 +16,8 @@
#include "dawn/common/Assert.h"
#include "dawn/common/Math.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
using wgpu::VertexFormat;
using wgpu::VertexStepMode;
diff --git a/src/tests/end2end/VideoViewsTests.cpp b/src/tests/end2end/VideoViewsTests.cpp
index 2ab0e53..4b8f208 100644
--- a/src/tests/end2end/VideoViewsTests.cpp
+++ b/src/tests/end2end/VideoViewsTests.cpp
@@ -14,8 +14,8 @@
#include "VideoViewsTests.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
VideoViewsTestBackend::PlatformTexture::PlatformTexture(wgpu::Texture&& texture)
: wgpuTexture(texture) {
diff --git a/src/tests/end2end/ViewportOrientationTests.cpp b/src/tests/end2end/ViewportOrientationTests.cpp
index 1245eb6..b862549 100644
--- a/src/tests/end2end/ViewportOrientationTests.cpp
+++ b/src/tests/end2end/ViewportOrientationTests.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 ViewportOrientationTests : public DawnTest {};
diff --git a/src/tests/end2end/ViewportTests.cpp b/src/tests/end2end/ViewportTests.cpp
index afb96e7..b6cf1e3 100644
--- a/src/tests/end2end/ViewportTests.cpp
+++ b/src/tests/end2end/ViewportTests.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 ViewportTest : public DawnTest {
private:
diff --git a/src/tests/end2end/WindowSurfaceTests.cpp b/src/tests/end2end/WindowSurfaceTests.cpp
index 91735e2..57edabd 100644
--- a/src/tests/end2end/WindowSurfaceTests.cpp
+++ b/src/tests/end2end/WindowSurfaceTests.cpp
@@ -15,9 +15,9 @@
#include "dawn/common/Log.h"
#include "dawn/common/Platform.h"
#include "dawn/dawn_proc.h"
+#include "dawn/utils/GLFWUtils.h"
#include "dawn_native/DawnNative.h"
#include "tests/DawnTest.h"
-#include "utils/GLFWUtils.h"
#include <gtest/gtest.h>
@@ -35,7 +35,7 @@
#endif // defined(DAWN_USE_X11)
#if defined(DAWN_ENABLE_BACKEND_METAL)
-# include "utils/ObjCUtils.h"
+# include "dawn/utils/ObjCUtils.h"
#endif // defined(DAWN_ENABLE_BACKEND_METAL)
#include "GLFW/glfw3native.h"
diff --git a/src/tests/perf_tests/BufferUploadPerf.cpp b/src/tests/perf_tests/BufferUploadPerf.cpp
index 70f257f..d4be0c5 100644
--- a/src/tests/perf_tests/BufferUploadPerf.cpp
+++ b/src/tests/perf_tests/BufferUploadPerf.cpp
@@ -14,7 +14,7 @@
#include "tests/perf_tests/DawnPerfTest.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
namespace {
diff --git a/src/tests/perf_tests/DawnPerfTest.cpp b/src/tests/perf_tests/DawnPerfTest.cpp
index c3c9702..b1a47e3 100644
--- a/src/tests/perf_tests/DawnPerfTest.cpp
+++ b/src/tests/perf_tests/DawnPerfTest.cpp
@@ -20,9 +20,9 @@
#include "dawn/common/Assert.h"
#include "dawn/common/Log.h"
+#include "dawn/utils/Timer.h"
#include "dawn_platform/tracing/TraceEvent.h"
#include "tests/perf_tests/DawnPerfTestPlatform.h"
-#include "utils/Timer.h"
namespace {
diff --git a/src/tests/perf_tests/DawnPerfTestPlatform.cpp b/src/tests/perf_tests/DawnPerfTestPlatform.cpp
index aeaa42f..2d9e373 100644
--- a/src/tests/perf_tests/DawnPerfTestPlatform.cpp
+++ b/src/tests/perf_tests/DawnPerfTestPlatform.cpp
@@ -18,9 +18,9 @@
#include "dawn/common/Assert.h"
#include "dawn/common/HashUtils.h"
+#include "dawn/utils/Timer.h"
#include "dawn_platform/tracing/TraceEvent.h"
#include "tests/perf_tests/DawnPerfTest.h"
-#include "utils/Timer.h"
namespace {
struct TraceCategoryInfo {
diff --git a/src/tests/perf_tests/DrawCallPerf.cpp b/src/tests/perf_tests/DrawCallPerf.cpp
index 29d5529..4dfaf25 100644
--- a/src/tests/perf_tests/DrawCallPerf.cpp
+++ b/src/tests/perf_tests/DrawCallPerf.cpp
@@ -17,8 +17,8 @@
#include "dawn/common/Assert.h"
#include "dawn/common/Constants.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 {
diff --git a/src/tests/perf_tests/ShaderRobustnessPerf.cpp b/src/tests/perf_tests/ShaderRobustnessPerf.cpp
index d65e724..5e1c871 100644
--- a/src/tests/perf_tests/ShaderRobustnessPerf.cpp
+++ b/src/tests/perf_tests/ShaderRobustnessPerf.cpp
@@ -14,7 +14,7 @@
#include "tests/perf_tests/DawnPerfTest.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
namespace {
constexpr uint32_t kTileSize = 32u;
diff --git a/src/tests/perf_tests/SubresourceTrackingPerf.cpp b/src/tests/perf_tests/SubresourceTrackingPerf.cpp
index c570322..b7bc73a 100644
--- a/src/tests/perf_tests/SubresourceTrackingPerf.cpp
+++ b/src/tests/perf_tests/SubresourceTrackingPerf.cpp
@@ -14,8 +14,8 @@
#include "tests/perf_tests/DawnPerfTest.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
struct SubresourceTrackingParams : AdapterTestParam {
SubresourceTrackingParams(const AdapterTestParam& param,
diff --git a/src/tests/unittests/ConcurrentCacheTests.cpp b/src/tests/unittests/ConcurrentCacheTests.cpp
index 7ff2761..dbfdfe63 100644
--- a/src/tests/unittests/ConcurrentCacheTests.cpp
+++ b/src/tests/unittests/ConcurrentCacheTests.cpp
@@ -15,9 +15,9 @@
#include <gtest/gtest.h>
#include "dawn/common/ConcurrentCache.h"
+#include "dawn/utils/SystemUtils.h"
#include "dawn_native/AsyncTask.h"
#include "dawn_platform/DawnPlatform.h"
-#include "utils/SystemUtils.h"
namespace {
class SimpleCachedObject {
diff --git a/src/tests/unittests/GetProcAddressTests.cpp b/src/tests/unittests/GetProcAddressTests.cpp
index abf65d3..bf5d9da 100644
--- a/src/tests/unittests/GetProcAddressTests.cpp
+++ b/src/tests/unittests/GetProcAddressTests.cpp
@@ -15,10 +15,10 @@
#include <gtest/gtest.h>
#include "dawn/dawn_proc.h"
+#include "dawn/utils/TerribleCommandBuffer.h"
#include "dawn_native/Instance.h"
#include "dawn_native/null/DeviceNull.h"
#include "dawn_wire/WireClient.h"
-#include "utils/TerribleCommandBuffer.h"
namespace {
diff --git a/src/tests/unittests/d3d12/CopySplitTests.cpp b/src/tests/unittests/d3d12/CopySplitTests.cpp
index 3c9802b..3ecea23 100644
--- a/src/tests/unittests/d3d12/CopySplitTests.cpp
+++ b/src/tests/unittests/d3d12/CopySplitTests.cpp
@@ -17,11 +17,11 @@
#include "dawn/common/Assert.h"
#include "dawn/common/Constants.h"
#include "dawn/common/Math.h"
+#include "dawn/utils/TestUtils.h"
#include "dawn/webgpu_cpp_print.h"
#include "dawn_native/Format.h"
#include "dawn_native/d3d12/TextureCopySplitter.h"
#include "dawn_native/d3d12/d3d12_platform.h"
-#include "utils/TestUtils.h"
using namespace dawn::native::d3d12;
diff --git a/src/tests/unittests/native/CommandBufferEncodingTests.cpp b/src/tests/unittests/native/CommandBufferEncodingTests.cpp
index 1a88c26..7074adb 100644
--- a/src/tests/unittests/native/CommandBufferEncodingTests.cpp
+++ b/src/tests/unittests/native/CommandBufferEncodingTests.cpp
@@ -14,10 +14,10 @@
#include "tests/DawnNativeTest.h"
+#include "dawn/utils/WGPUHelpers.h"
#include "dawn_native/CommandBuffer.h"
#include "dawn_native/Commands.h"
#include "dawn_native/ComputePassEncoder.h"
-#include "utils/WGPUHelpers.h"
class CommandBufferEncodingTests : public DawnNativeTest {
protected:
diff --git a/src/tests/unittests/native/DestroyObjectTests.cpp b/src/tests/unittests/native/DestroyObjectTests.cpp
index 4b6b031..4b62136 100644
--- a/src/tests/unittests/native/DestroyObjectTests.cpp
+++ b/src/tests/unittests/native/DestroyObjectTests.cpp
@@ -14,6 +14,7 @@
#include <gtest/gtest.h>
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
#include "dawn_native/Toggles.h"
#include "mocks/BindGroupLayoutMock.h"
#include "mocks/BindGroupMock.h"
@@ -30,7 +31,6 @@
#include "mocks/SwapChainMock.h"
#include "mocks/TextureMock.h"
#include "tests/DawnNativeTest.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
namespace dawn::native { namespace {
diff --git a/src/tests/unittests/native/DeviceCreationTests.cpp b/src/tests/unittests/native/DeviceCreationTests.cpp
index 3d67255..ec9c663 100644
--- a/src/tests/unittests/native/DeviceCreationTests.cpp
+++ b/src/tests/unittests/native/DeviceCreationTests.cpp
@@ -13,10 +13,10 @@
// limitations under the License.
#include "dawn/dawn_proc.h"
+#include "dawn/utils/SystemUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
#include "dawn_native/DawnNative.h"
#include "tests/MockCallback.h"
-#include "utils/SystemUtils.h"
-#include "utils/WGPUHelpers.h"
#include <gtest/gtest.h>
diff --git a/src/tests/unittests/validation/BindGroupValidationTests.cpp b/src/tests/unittests/validation/BindGroupValidationTests.cpp
index 1a5124d..28b7ce4 100644
--- a/src/tests/unittests/validation/BindGroupValidationTests.cpp
+++ b/src/tests/unittests/validation/BindGroupValidationTests.cpp
@@ -16,8 +16,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"
class BindGroupValidationTest : public ValidationTest {
public:
diff --git a/src/tests/unittests/validation/CommandBufferValidationTests.cpp b/src/tests/unittests/validation/CommandBufferValidationTests.cpp
index e6e2818..c0a04e7 100644
--- a/src/tests/unittests/validation/CommandBufferValidationTests.cpp
+++ b/src/tests/unittests/validation/CommandBufferValidationTests.cpp
@@ -18,7 +18,7 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
using ::testing::HasSubstr;
diff --git a/src/tests/unittests/validation/ComputeIndirectValidationTests.cpp b/src/tests/unittests/validation/ComputeIndirectValidationTests.cpp
index 65add5c..681c7ce 100644
--- a/src/tests/unittests/validation/ComputeIndirectValidationTests.cpp
+++ b/src/tests/unittests/validation/ComputeIndirectValidationTests.cpp
@@ -14,8 +14,8 @@
#include <initializer_list>
#include <limits>
+#include "dawn/utils/WGPUHelpers.h"
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/WGPUHelpers.h"
class ComputeIndirectValidationTest : public ValidationTest {
protected:
diff --git a/src/tests/unittests/validation/ComputeValidationTests.cpp b/src/tests/unittests/validation/ComputeValidationTests.cpp
index f3e335b..a971b4c 100644
--- a/src/tests/unittests/validation/ComputeValidationTests.cpp
+++ b/src/tests/unittests/validation/ComputeValidationTests.cpp
@@ -13,8 +13,8 @@
// limitations under the License.
#include "dawn/common/Constants.h"
+#include "dawn/utils/WGPUHelpers.h"
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/WGPUHelpers.h"
// TODO(cwallez@chromium.org): Add a regression test for Disptach validation trying to acces the
// input state.
diff --git a/src/tests/unittests/validation/CopyCommandsValidationTests.cpp b/src/tests/unittests/validation/CopyCommandsValidationTests.cpp
index fdf6bd0..cdd70b4 100644
--- a/src/tests/unittests/validation/CopyCommandsValidationTests.cpp
+++ b/src/tests/unittests/validation/CopyCommandsValidationTests.cpp
@@ -15,10 +15,10 @@
#include "dawn/common/Assert.h"
#include "dawn/common/Constants.h"
#include "dawn/common/Math.h"
+#include "dawn/utils/TestUtils.h"
+#include "dawn/utils/TextureUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/TestUtils.h"
-#include "utils/TextureUtils.h"
-#include "utils/WGPUHelpers.h"
class CopyCommandTest : public ValidationTest {
protected:
diff --git a/src/tests/unittests/validation/CopyTextureForBrowserTests.cpp b/src/tests/unittests/validation/CopyTextureForBrowserTests.cpp
index f4a344c..5bff5d2 100644
--- a/src/tests/unittests/validation/CopyTextureForBrowserTests.cpp
+++ b/src/tests/unittests/validation/CopyTextureForBrowserTests.cpp
@@ -15,10 +15,10 @@
#include "dawn/common/Assert.h"
#include "dawn/common/Constants.h"
#include "dawn/common/Math.h"
+#include "dawn/utils/TestUtils.h"
+#include "dawn/utils/TextureUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/TestUtils.h"
-#include "utils/TextureUtils.h"
-#include "utils/WGPUHelpers.h"
class CopyTextureForBrowserTest : public ValidationTest {
protected:
diff --git a/src/tests/unittests/validation/DebugMarkerValidationTests.cpp b/src/tests/unittests/validation/DebugMarkerValidationTests.cpp
index 6d27aba..857a774 100644
--- a/src/tests/unittests/validation/DebugMarkerValidationTests.cpp
+++ b/src/tests/unittests/validation/DebugMarkerValidationTests.cpp
@@ -14,8 +14,8 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/ComboRenderBundleEncoderDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderBundleEncoderDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
class DebugMarkerValidationTest : public ValidationTest {};
diff --git a/src/tests/unittests/validation/DrawIndirectValidationTests.cpp b/src/tests/unittests/validation/DrawIndirectValidationTests.cpp
index b404f3d..c7d7517 100644
--- a/src/tests/unittests/validation/DrawIndirectValidationTests.cpp
+++ b/src/tests/unittests/validation/DrawIndirectValidationTests.cpp
@@ -14,9 +14,9 @@
#include <initializer_list>
#include <limits>
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
class DrawIndirectValidationTest : public ValidationTest {
protected:
diff --git a/src/tests/unittests/validation/DrawVertexAndIndexBufferOOBValidationTests.cpp b/src/tests/unittests/validation/DrawVertexAndIndexBufferOOBValidationTests.cpp
index af8db12..9576290 100644
--- a/src/tests/unittests/validation/DrawVertexAndIndexBufferOOBValidationTests.cpp
+++ b/src/tests/unittests/validation/DrawVertexAndIndexBufferOOBValidationTests.cpp
@@ -15,8 +15,8 @@
#include "tests/unittests/validation/ValidationTest.h"
#include "dawn/common/Constants.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
namespace {
constexpr uint32_t kRTSize = 4;
diff --git a/src/tests/unittests/validation/DynamicStateCommandValidationTests.cpp b/src/tests/unittests/validation/DynamicStateCommandValidationTests.cpp
index 458d277..eb2183d 100644
--- a/src/tests/unittests/validation/DynamicStateCommandValidationTests.cpp
+++ b/src/tests/unittests/validation/DynamicStateCommandValidationTests.cpp
@@ -14,7 +14,7 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
#include <cmath>
@@ -135,11 +135,7 @@
class SetScissorTest : public ValidationTest {
protected:
- void TestScissorCall(bool success,
- uint32_t x,
- uint32_t y,
- uint32_t width,
- uint32_t height) {
+ void TestScissorCall(bool success, uint32_t x, uint32_t y, uint32_t width, uint32_t height) {
utils::BasicRenderPass rp = utils::CreateBasicRenderPass(device, kWidth, kHeight);
wgpu::CommandEncoder encoder = device.CreateCommandEncoder();
@@ -182,8 +178,8 @@
TestScissorCall(true, 0, 0, kWidth, kHeight);
// Width/height at the limit with 0 x/y is valid.
- TestScissorCall(true, kWidth, 0, 0, kHeight);
- TestScissorCall(true, 0, kHeight, kWidth, 0);
+ TestScissorCall(true, kWidth, 0, 0, kHeight);
+ TestScissorCall(true, 0, kHeight, kWidth, 0);
}
// Test to check that a scissor larger than the framebuffer is disallowed
@@ -198,7 +194,7 @@
TestScissorCall(false, std::numeric_limits<uint32_t>::max(), 0, kWidth, kHeight);
// x + height is larger than the rendertarget's height.
- TestScissorCall(false, 0, 2, kWidth , kHeight - 1);
+ TestScissorCall(false, 0, 2, kWidth, kHeight - 1);
TestScissorCall(false, 0, kHeight, kWidth, 1);
TestScissorCall(false, 0, std::numeric_limits<uint32_t>::max(), kWidth, kHeight);
}
diff --git a/src/tests/unittests/validation/ExternalTextureTests.cpp b/src/tests/unittests/validation/ExternalTextureTests.cpp
index 0aa4d35..b05215f 100644
--- a/src/tests/unittests/validation/ExternalTextureTests.cpp
+++ b/src/tests/unittests/validation/ExternalTextureTests.cpp
@@ -14,8 +14,8 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
namespace {
class ExternalTextureTest : public ValidationTest {
diff --git a/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp b/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp
index 16aaa5e..bec883b 100644
--- a/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp
+++ b/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp
@@ -14,8 +14,8 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
class GetBindGroupLayoutTests : public ValidationTest {
protected:
diff --git a/src/tests/unittests/validation/IndexBufferValidationTests.cpp b/src/tests/unittests/validation/IndexBufferValidationTests.cpp
index 732eb06..c7602f0 100644
--- a/src/tests/unittests/validation/IndexBufferValidationTests.cpp
+++ b/src/tests/unittests/validation/IndexBufferValidationTests.cpp
@@ -14,9 +14,9 @@
#include "tests/unittests/validation/ValidationTest.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"
class IndexBufferValidationTest : public ValidationTest {
protected:
diff --git a/src/tests/unittests/validation/InternalUsageValidationTests.cpp b/src/tests/unittests/validation/InternalUsageValidationTests.cpp
index d175276..738ff92 100644
--- a/src/tests/unittests/validation/InternalUsageValidationTests.cpp
+++ b/src/tests/unittests/validation/InternalUsageValidationTests.cpp
@@ -14,7 +14,7 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
class InternalUsageValidationDisabledTest : public ValidationTest {};
diff --git a/src/tests/unittests/validation/LabelTests.cpp b/src/tests/unittests/validation/LabelTests.cpp
index 6d19633..0e8a307 100644
--- a/src/tests/unittests/validation/LabelTests.cpp
+++ b/src/tests/unittests/validation/LabelTests.cpp
@@ -13,10 +13,10 @@
// limitations under the License.
#include <string>
+#include "dawn/utils/ComboRenderBundleEncoderDescriptor.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/ComboRenderBundleEncoderDescriptor.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
class LabelTest : public ValidationTest {};
diff --git a/src/tests/unittests/validation/MinimumBufferSizeValidationTests.cpp b/src/tests/unittests/validation/MinimumBufferSizeValidationTests.cpp
index 1bef6ba..226e05d 100644
--- a/src/tests/unittests/validation/MinimumBufferSizeValidationTests.cpp
+++ b/src/tests/unittests/validation/MinimumBufferSizeValidationTests.cpp
@@ -16,8 +16,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"
namespace {
// Helper for describing bindings throughout the tests
diff --git a/src/tests/unittests/validation/OverridableConstantsValidationTests.cpp b/src/tests/unittests/validation/OverridableConstantsValidationTests.cpp
index 4691712..9fb6fcc 100644
--- a/src/tests/unittests/validation/OverridableConstantsValidationTests.cpp
+++ b/src/tests/unittests/validation/OverridableConstantsValidationTests.cpp
@@ -13,8 +13,8 @@
// limitations under the License.
#include "dawn/common/Constants.h"
+#include "dawn/utils/WGPUHelpers.h"
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/WGPUHelpers.h"
class ComputePipelineOverridableConstantsValidationTest : public ValidationTest {
protected:
diff --git a/src/tests/unittests/validation/PipelineAndPassCompatibilityTests.cpp b/src/tests/unittests/validation/PipelineAndPassCompatibilityTests.cpp
index b0909c5..14ac2ab 100644
--- a/src/tests/unittests/validation/PipelineAndPassCompatibilityTests.cpp
+++ b/src/tests/unittests/validation/PipelineAndPassCompatibilityTests.cpp
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#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"
#include "tests/unittests/validation/ValidationTest.h"
diff --git a/src/tests/unittests/validation/QueryValidationTests.cpp b/src/tests/unittests/validation/QueryValidationTests.cpp
index 51fcdd1..4c2b9fa 100644
--- a/src/tests/unittests/validation/QueryValidationTests.cpp
+++ b/src/tests/unittests/validation/QueryValidationTests.cpp
@@ -14,7 +14,7 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
class QuerySetValidationTest : public ValidationTest {
protected:
diff --git a/src/tests/unittests/validation/QueueSubmitValidationTests.cpp b/src/tests/unittests/validation/QueueSubmitValidationTests.cpp
index 4716ae7..93940fc 100644
--- a/src/tests/unittests/validation/QueueSubmitValidationTests.cpp
+++ b/src/tests/unittests/validation/QueueSubmitValidationTests.cpp
@@ -14,8 +14,8 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
namespace {
diff --git a/src/tests/unittests/validation/QueueWriteBufferValidationTests.cpp b/src/tests/unittests/validation/QueueWriteBufferValidationTests.cpp
index e991e71..8359686 100644
--- a/src/tests/unittests/validation/QueueWriteBufferValidationTests.cpp
+++ b/src/tests/unittests/validation/QueueWriteBufferValidationTests.cpp
@@ -14,7 +14,7 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
class QueueWriteBufferValidationTest : public ValidationTest {
private:
diff --git a/src/tests/unittests/validation/QueueWriteTextureValidationTests.cpp b/src/tests/unittests/validation/QueueWriteTextureValidationTests.cpp
index b5c02c4..4c2a26e 100644
--- a/src/tests/unittests/validation/QueueWriteTextureValidationTests.cpp
+++ b/src/tests/unittests/validation/QueueWriteTextureValidationTests.cpp
@@ -15,9 +15,9 @@
#include "tests/unittests/validation/ValidationTest.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"
namespace {
diff --git a/src/tests/unittests/validation/RenderBundleValidationTests.cpp b/src/tests/unittests/validation/RenderBundleValidationTests.cpp
index c4cb2f7..70a462d 100644
--- a/src/tests/unittests/validation/RenderBundleValidationTests.cpp
+++ b/src/tests/unittests/validation/RenderBundleValidationTests.cpp
@@ -16,9 +16,9 @@
#include "dawn/common/Constants.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"
namespace {
diff --git a/src/tests/unittests/validation/RenderPassDescriptorValidationTests.cpp b/src/tests/unittests/validation/RenderPassDescriptorValidationTests.cpp
index cbe0d01..41c8549 100644
--- a/src/tests/unittests/validation/RenderPassDescriptorValidationTests.cpp
+++ b/src/tests/unittests/validation/RenderPassDescriptorValidationTests.cpp
@@ -16,7 +16,7 @@
#include "dawn/common/Constants.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
#include <cmath>
diff --git a/src/tests/unittests/validation/RenderPipelineValidationTests.cpp b/src/tests/unittests/validation/RenderPipelineValidationTests.cpp
index db70e33..8d16f4d 100644
--- a/src/tests/unittests/validation/RenderPipelineValidationTests.cpp
+++ b/src/tests/unittests/validation/RenderPipelineValidationTests.cpp
@@ -15,8 +15,8 @@
#include "tests/unittests/validation/ValidationTest.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>
#include <sstream>
diff --git a/src/tests/unittests/validation/ResourceUsageTrackingTests.cpp b/src/tests/unittests/validation/ResourceUsageTrackingTests.cpp
index c0896d1..98308db 100644
--- a/src/tests/unittests/validation/ResourceUsageTrackingTests.cpp
+++ b/src/tests/unittests/validation/ResourceUsageTrackingTests.cpp
@@ -14,8 +14,8 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
namespace {
diff --git a/src/tests/unittests/validation/SamplerValidationTests.cpp b/src/tests/unittests/validation/SamplerValidationTests.cpp
index 83ca356..a3ad726 100644
--- a/src/tests/unittests/validation/SamplerValidationTests.cpp
+++ b/src/tests/unittests/validation/SamplerValidationTests.cpp
@@ -14,7 +14,7 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
#include <cmath>
diff --git a/src/tests/unittests/validation/ShaderModuleValidationTests.cpp b/src/tests/unittests/validation/ShaderModuleValidationTests.cpp
index 05d4c6e..f2bded5 100644
--- a/src/tests/unittests/validation/ShaderModuleValidationTests.cpp
+++ b/src/tests/unittests/validation/ShaderModuleValidationTests.cpp
@@ -18,7 +18,7 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
#include <sstream>
diff --git a/src/tests/unittests/validation/StorageTextureValidationTests.cpp b/src/tests/unittests/validation/StorageTextureValidationTests.cpp
index b60df62..5b958dd 100644
--- a/src/tests/unittests/validation/StorageTextureValidationTests.cpp
+++ b/src/tests/unittests/validation/StorageTextureValidationTests.cpp
@@ -13,10 +13,10 @@
// limitations under the License.
#include "dawn/common/Assert.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/TextureUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/TextureUtils.h"
-#include "utils/WGPUHelpers.h"
class StorageTextureValidationTests : public ValidationTest {
protected:
diff --git a/src/tests/unittests/validation/TextureSubresourceTests.cpp b/src/tests/unittests/validation/TextureSubresourceTests.cpp
index f49c86d..ef4c90c 100644
--- a/src/tests/unittests/validation/TextureSubresourceTests.cpp
+++ b/src/tests/unittests/validation/TextureSubresourceTests.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 "tests/unittests/validation/ValidationTest.h"
diff --git a/src/tests/unittests/validation/TextureValidationTests.cpp b/src/tests/unittests/validation/TextureValidationTests.cpp
index 1af5c2c..98625f3 100644
--- a/src/tests/unittests/validation/TextureValidationTests.cpp
+++ b/src/tests/unittests/validation/TextureValidationTests.cpp
@@ -16,9 +16,9 @@
#include "dawn/common/Constants.h"
#include "dawn/common/Math.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/TextureUtils.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/TextureUtils.h"
+#include "dawn/utils/WGPUHelpers.h"
namespace {
diff --git a/src/tests/unittests/validation/UnsafeAPIValidationTests.cpp b/src/tests/unittests/validation/UnsafeAPIValidationTests.cpp
index 4e90bfb..5d77b50 100644
--- a/src/tests/unittests/validation/UnsafeAPIValidationTests.cpp
+++ b/src/tests/unittests/validation/UnsafeAPIValidationTests.cpp
@@ -14,10 +14,10 @@
#include "tests/unittests/validation/ValidationTest.h"
+#include "dawn/utils/ComboRenderBundleEncoderDescriptor.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
#include "tests/MockCallback.h"
-#include "utils/ComboRenderBundleEncoderDescriptor.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
namespace {
using testing::HasSubstr;
diff --git a/src/tests/unittests/validation/ValidationTest.cpp b/src/tests/unittests/validation/ValidationTest.cpp
index 62f8ba0..0c18fb5 100644
--- a/src/tests/unittests/validation/ValidationTest.cpp
+++ b/src/tests/unittests/validation/ValidationTest.cpp
@@ -17,10 +17,10 @@
#include "dawn/common/Assert.h"
#include "dawn/common/SystemUtils.h"
#include "dawn/dawn_proc.h"
+#include "dawn/utils/WireHelper.h"
#include "dawn/webgpu.h"
#include "dawn_native/NullBackend.h"
#include "tests/ToggleParser.h"
-#include "utils/WireHelper.h"
#include <algorithm>
diff --git a/src/tests/unittests/validation/VertexBufferValidationTests.cpp b/src/tests/unittests/validation/VertexBufferValidationTests.cpp
index 3a6cee4..4c3492a 100644
--- a/src/tests/unittests/validation/VertexBufferValidationTests.cpp
+++ b/src/tests/unittests/validation/VertexBufferValidationTests.cpp
@@ -16,9 +16,9 @@
#include "tests/unittests/validation/ValidationTest.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"
class VertexBufferValidationTest : public ValidationTest {
protected:
diff --git a/src/tests/unittests/validation/VertexStateValidationTests.cpp b/src/tests/unittests/validation/VertexStateValidationTests.cpp
index 42c4ed1..3fa8b36 100644
--- a/src/tests/unittests/validation/VertexStateValidationTests.cpp
+++ b/src/tests/unittests/validation/VertexStateValidationTests.cpp
@@ -14,8 +14,8 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
class VertexStateTest : public ValidationTest {
protected:
diff --git a/src/tests/unittests/validation/VideoViewsValidationTests.cpp b/src/tests/unittests/validation/VideoViewsValidationTests.cpp
index 46ad5b2..ef5efff 100644
--- a/src/tests/unittests/validation/VideoViewsValidationTests.cpp
+++ b/src/tests/unittests/validation/VideoViewsValidationTests.cpp
@@ -14,7 +14,7 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/WGPUHelpers.h"
namespace {
diff --git a/src/tests/unittests/validation/WriteBufferTests.cpp b/src/tests/unittests/validation/WriteBufferTests.cpp
index dc224bf..34ac429 100644
--- a/src/tests/unittests/validation/WriteBufferTests.cpp
+++ b/src/tests/unittests/validation/WriteBufferTests.cpp
@@ -14,8 +14,8 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
namespace {
diff --git a/src/tests/unittests/wire/WireTest.cpp b/src/tests/unittests/wire/WireTest.cpp
index aedc8b1..275a81e 100644
--- a/src/tests/unittests/wire/WireTest.cpp
+++ b/src/tests/unittests/wire/WireTest.cpp
@@ -15,9 +15,9 @@
#include "tests/unittests/wire/WireTest.h"
#include "dawn/dawn_proc.h"
+#include "dawn/utils/TerribleCommandBuffer.h"
#include "dawn_wire/WireClient.h"
#include "dawn_wire/WireServer.h"
-#include "utils/TerribleCommandBuffer.h"
using namespace testing;
using namespace dawn::wire;
diff --git a/src/tests/white_box/D3D12DescriptorHeapTests.cpp b/src/tests/white_box/D3D12DescriptorHeapTests.cpp
index c290b7f..a8ad7ac 100644
--- a/src/tests/white_box/D3D12DescriptorHeapTests.cpp
+++ b/src/tests/white_box/D3D12DescriptorHeapTests.cpp
@@ -14,14 +14,14 @@
#include "tests/DawnTest.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
#include "dawn_native/Device.h"
#include "dawn_native/Toggles.h"
#include "dawn_native/d3d12/BindGroupLayoutD3D12.h"
#include "dawn_native/d3d12/DeviceD3D12.h"
#include "dawn_native/d3d12/ShaderVisibleDescriptorAllocatorD3D12.h"
#include "dawn_native/d3d12/StagingDescriptorAllocatorD3D12.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
constexpr uint32_t kRTSize = 4;
diff --git a/src/tests/white_box/D3D12ResidencyTests.cpp b/src/tests/white_box/D3D12ResidencyTests.cpp
index f5a59ae..f29e1c9 100644
--- a/src/tests/white_box/D3D12ResidencyTests.cpp
+++ b/src/tests/white_box/D3D12ResidencyTests.cpp
@@ -12,14 +12,14 @@
// 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 "dawn_native/D3D12Backend.h"
#include "dawn_native/d3d12/BufferD3D12.h"
#include "dawn_native/d3d12/DeviceD3D12.h"
#include "dawn_native/d3d12/ResidencyManagerD3D12.h"
#include "dawn_native/d3d12/ShaderVisibleDescriptorAllocatorD3D12.h"
#include "tests/DawnTest.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
#include <vector>
diff --git a/src/tests/white_box/EGLImageWrappingTests.cpp b/src/tests/white_box/EGLImageWrappingTests.cpp
index cd6b1ea..c18c6be 100644
--- a/src/tests/white_box/EGLImageWrappingTests.cpp
+++ b/src/tests/white_box/EGLImageWrappingTests.cpp
@@ -15,10 +15,10 @@
#include "tests/DawnTest.h"
#include "dawn/common/DynamicLib.h"
+#include "dawn/utils/ComboRenderPipelineDescriptor.h"
+#include "dawn/utils/WGPUHelpers.h"
#include "dawn_native/OpenGLBackend.h"
#include "dawn_native/opengl/DeviceGL.h"
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/WGPUHelpers.h"
#include <EGL/egl.h>
diff --git a/src/tests/white_box/InternalStorageBufferBindingTests.cpp b/src/tests/white_box/InternalStorageBufferBindingTests.cpp
index 9ecaeae..35d9893 100644
--- a/src/tests/white_box/InternalStorageBufferBindingTests.cpp
+++ b/src/tests/white_box/InternalStorageBufferBindingTests.cpp
@@ -14,10 +14,10 @@
#include "tests/DawnTest.h"
+#include "dawn/utils/WGPUHelpers.h"
#include "dawn_native/BindGroupLayout.h"
#include "dawn_native/Device.h"
#include "dawn_native/dawn_platform.h"
-#include "utils/WGPUHelpers.h"
class InternalStorageBufferBindingTests : public DawnTest {
protected:
diff --git a/src/tests/white_box/QueryInternalShaderTests.cpp b/src/tests/white_box/QueryInternalShaderTests.cpp
index 2c10f45..279f04b 100644
--- a/src/tests/white_box/QueryInternalShaderTests.cpp
+++ b/src/tests/white_box/QueryInternalShaderTests.cpp
@@ -14,10 +14,10 @@
#include "tests/DawnTest.h"
+#include "dawn/utils/WGPUHelpers.h"
#include "dawn_native/Buffer.h"
#include "dawn_native/CommandEncoder.h"
#include "dawn_native/QueryHelper.h"
-#include "utils/WGPUHelpers.h"
namespace {
diff --git a/src/tests/white_box/VulkanImageWrappingTests.cpp b/src/tests/white_box/VulkanImageWrappingTests.cpp
index bda4853..b80b700 100644
--- a/src/tests/white_box/VulkanImageWrappingTests.cpp
+++ b/src/tests/white_box/VulkanImageWrappingTests.cpp
@@ -15,10 +15,10 @@
#include "tests/white_box/VulkanImageWrappingTests.h"
#include "dawn/common/Math.h"
+#include "dawn/utils/WGPUHelpers.h"
#include "dawn_native/vulkan/AdapterVk.h"
#include "dawn_native/vulkan/DeviceVk.h"
#include "tests/DawnTest.h"
-#include "utils/WGPUHelpers.h"
namespace dawn::native { namespace vulkan {
