tint->dawn: Move src/common -> src/dawn/common
Also remove stuttering from the target names by dropping the 'dawn_' prefix.
Bug: dawn:1275
Change-Id: Iac79f9927010b8e5edeb7e0949092b34431d54dd
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/79061
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6545626..a9309de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,9 +211,9 @@
################################################################################
add_subdirectory(third_party)
-add_subdirectory(src/common)
add_subdirectory(generator)
add_subdirectory(src/dawn)
+add_subdirectory(src/dawn/common)
add_subdirectory(src/dawn_platform)
add_subdirectory(src/dawn_native)
add_subdirectory(src/dawn_wire)
diff --git a/docs/dawn/overview.md b/docs/dawn/overview.md
index a74f5d0..65d0bce 100644
--- a/docs/dawn/overview.md
+++ b/docs/dawn/overview.md
@@ -13,7 +13,8 @@
- [`infra`](../infra): configuration file for the commit-queue infrastructure.
- [`scripts`](../scripts): contains a grab-bag of files that are used for building Dawn, in testing, etc.
- [`src`](../src):
- - [`common`](../src/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.
+ - [`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.
- [`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`.
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 3371d36..13607af 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -33,16 +33,16 @@
# Export all of these as public deps so that `gn check` allows includes
public_deps = [
- "${dawn_root}/src/common",
"${dawn_root}/src/dawn:dawn_proc",
"${dawn_root}/src/dawn:dawncpp",
+ "${dawn_root}/src/dawn/common",
"${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/common:dawn_internal" ]
+ public_configs = [ "${dawn_root}/src/dawn/common:internal_config" ]
}
# Template for samples to avoid listing dawn_sample_utils as a dep every time
diff --git a/examples/ManualSwapChainTest.cpp b/examples/ManualSwapChainTest.cpp
index 8093f65..1dc0afc 100644
--- a/examples/ManualSwapChainTest.cpp
+++ b/examples/ManualSwapChainTest.cpp
@@ -51,8 +51,8 @@
// - TODO can't be tested yet: check cycling the same window over multiple devices.
// - TODO can't be tested yet: check cycling the same window over multiple formats.
-#include "common/Assert.h"
-#include "common/Log.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Log.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/GLFWUtils.h"
#include "utils/ScopedAutoreleasePool.h"
diff --git a/examples/SampleUtils.cpp b/examples/SampleUtils.cpp
index 336e42f..9e41d8c 100644
--- a/examples/SampleUtils.cpp
+++ b/examples/SampleUtils.cpp
@@ -14,10 +14,10 @@
#include "SampleUtils.h"
-#include "common/Assert.h"
-#include "common/Log.h"
-#include "common/Platform.h"
-#include "common/SystemUtils.h"
+#include "dawn/common/Assert.h"
+#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"
diff --git a/generator/templates/dawn_native/ObjectType.h b/generator/templates/dawn_native/ObjectType.h
index d99cdd4..1d59b50 100644
--- a/generator/templates/dawn_native/ObjectType.h
+++ b/generator/templates/dawn_native/ObjectType.h
@@ -17,7 +17,7 @@
#ifndef {{DIR}}_OBJECTTPYE_AUTOGEN_H_
#define {{DIR}}_OBJECTTPYE_AUTOGEN_H_
-#include "common/ityp_array.h"
+#include "dawn/common/ityp_array.h"
#include <cstdint>
diff --git a/generator/templates/dawn_wire/ObjectType.h b/generator/templates/dawn_wire/ObjectType.h
index ce3572e..54ae08e 100644
--- a/generator/templates/dawn_wire/ObjectType.h
+++ b/generator/templates/dawn_wire/ObjectType.h
@@ -15,7 +15,7 @@
#ifndef DAWNWIRE_OBJECTTPYE_AUTOGEN_H_
#define DAWNWIRE_OBJECTTPYE_AUTOGEN_H_
-#include "common/ityp_array.h"
+#include "dawn/common/ityp_array.h"
namespace dawn::wire {
diff --git a/generator/templates/dawn_wire/WireCmd.cpp b/generator/templates/dawn_wire/WireCmd.cpp
index 1547072..7029f81 100644
--- a/generator/templates/dawn_wire/WireCmd.cpp
+++ b/generator/templates/dawn_wire/WireCmd.cpp
@@ -14,8 +14,8 @@
#include "dawn_wire/WireCmd_autogen.h"
-#include "common/Assert.h"
-#include "common/Log.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Log.h"
#include "dawn_wire/BufferConsumer_impl.h"
#include "dawn_wire/Wire.h"
diff --git a/generator/templates/dawn_wire/client/ApiProcs.cpp b/generator/templates/dawn_wire/client/ApiProcs.cpp
index c5b77ef..ec97873 100644
--- a/generator/templates/dawn_wire/client/ApiProcs.cpp
+++ b/generator/templates/dawn_wire/client/ApiProcs.cpp
@@ -12,7 +12,7 @@
//* See the License for the specific language governing permissions and
//* limitations under the License.
-#include "common/Log.h"
+#include "dawn/common/Log.h"
#include "dawn_wire/client/ApiObjects.h"
#include "dawn_wire/client/Client.h"
diff --git a/generator/templates/dawn_wire/client/ClientHandlers.cpp b/generator/templates/dawn_wire/client/ClientHandlers.cpp
index 749152a..bfa977d 100644
--- a/generator/templates/dawn_wire/client/ClientHandlers.cpp
+++ b/generator/templates/dawn_wire/client/ClientHandlers.cpp
@@ -12,7 +12,7 @@
//* See the License for the specific language governing permissions and
//* limitations under the License.
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_wire/client/Client.h"
#include <string>
diff --git a/generator/templates/dawn_wire/server/ServerDoers.cpp b/generator/templates/dawn_wire/server/ServerDoers.cpp
index ce4854e..6b193f1 100644
--- a/generator/templates/dawn_wire/server/ServerDoers.cpp
+++ b/generator/templates/dawn_wire/server/ServerDoers.cpp
@@ -12,7 +12,7 @@
//* See the License for the specific language governing permissions and
//* limitations under the License.
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_wire/server/Server.h"
namespace dawn::wire::server {
diff --git a/generator/templates/dawn_wire/server/ServerHandlers.cpp b/generator/templates/dawn_wire/server/ServerHandlers.cpp
index 9c9db06..878b150 100644
--- a/generator/templates/dawn_wire/server/ServerHandlers.cpp
+++ b/generator/templates/dawn_wire/server/ServerHandlers.cpp
@@ -12,7 +12,7 @@
//* See the License for the specific language governing permissions and
//* limitations under the License.
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_wire/server/Server.h"
namespace dawn::wire::server {
diff --git a/src/dawn/BUILD.gn b/src/dawn/BUILD.gn
index feddfee..32be1f9 100644
--- a/src/dawn/BUILD.gn
+++ b/src/dawn/BUILD.gn
@@ -30,7 +30,7 @@
}
source_set("dawn_headers") {
- all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ]
+ all_dependent_configs = [ "${dawn_root}/src/dawn/common:public_include_dirs" ]
public_deps = [ ":dawn_headers_gen" ]
sources = get_target_outputs(":dawn_headers_gen")
diff --git a/src/common/Alloc.h b/src/dawn/common/Alloc.h
similarity index 100%
rename from src/common/Alloc.h
rename to src/dawn/common/Alloc.h
diff --git a/src/common/Assert.cpp b/src/dawn/common/Assert.cpp
similarity index 94%
rename from src/common/Assert.cpp
rename to src/dawn/common/Assert.cpp
index 8802c20..95d2efd 100644
--- a/src/common/Assert.cpp
+++ b/src/dawn/common/Assert.cpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Assert.h"
-#include "common/Log.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Log.h"
#include <cstdlib>
diff --git a/src/common/Assert.h b/src/dawn/common/Assert.h
similarity index 98%
rename from src/common/Assert.h
rename to src/dawn/common/Assert.h
index b9e36ca..e7961d7 100644
--- a/src/common/Assert.h
+++ b/src/dawn/common/Assert.h
@@ -15,7 +15,7 @@
#ifndef COMMON_ASSERT_H_
#define COMMON_ASSERT_H_
-#include "common/Compiler.h"
+#include "dawn/common/Compiler.h"
// Dawn asserts to be used instead of the regular C stdlib assert function (if you don't use assert
// yet, you should start now!). In debug ASSERT(condition) will trigger an error, otherwise in
diff --git a/src/common/BUILD.gn b/src/dawn/common/BUILD.gn
similarity index 95%
rename from src/common/BUILD.gn
rename to src/dawn/common/BUILD.gn
index 9fe4fe7..4492087 100644
--- a/src/common/BUILD.gn
+++ b/src/dawn/common/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("//build_overrides/build.gni")
import("${dawn_root}/scripts/dawn_features.gni")
@@ -35,16 +35,16 @@
# Common dawn configs
###############################################################################
-config("dawn_public_include_dirs") {
+config("public_include_dirs") {
include_dirs = [
- "${target_gen_dir}/../../src/include",
+ "${target_gen_dir}/../../../src/include",
"${dawn_root}/src/include",
]
}
-config("dawn_internal") {
+config("internal_config") {
include_dirs = [
- "${target_gen_dir}/../../src",
+ "${target_gen_dir}/../../../src",
"${dawn_root}/src",
]
@@ -92,8 +92,9 @@
# Only internal Dawn targets can use this config, this means only targets in
# this BUILD.gn file and related subdirs.
visibility = [
- "../*",
- "../../examples/*",
+ "${dawn_root}/examples/*",
+ "${dawn_root}/src/*",
+ "${dawn_root}/src/dawn/*",
]
cflags = []
@@ -234,7 +235,7 @@
sources += [ "SystemUtils_mac.mm" ]
}
- public_configs = [ ":dawn_internal" ]
+ public_configs = [ ":internal_config" ]
deps = [
"${dawn_root}/src/dawn:dawn_headers",
"${dawn_root}/src/dawn:dawncpp_headers",
diff --git a/src/common/BitSetIterator.h b/src/dawn/common/BitSetIterator.h
similarity index 97%
rename from src/common/BitSetIterator.h
rename to src/dawn/common/BitSetIterator.h
index 5a1c10f..f14a76c 100644
--- a/src/common/BitSetIterator.h
+++ b/src/dawn/common/BitSetIterator.h
@@ -15,9 +15,9 @@
#ifndef COMMON_BITSETITERATOR_H_
#define COMMON_BITSETITERATOR_H_
-#include "common/Assert.h"
-#include "common/Math.h"
-#include "common/UnderlyingType.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
+#include "dawn/common/UnderlyingType.h"
#include <bitset>
#include <limits>
diff --git a/src/common/CMakeLists.txt b/src/dawn/common/CMakeLists.txt
similarity index 100%
rename from src/common/CMakeLists.txt
rename to src/dawn/common/CMakeLists.txt
diff --git a/src/common/Compiler.h b/src/dawn/common/Compiler.h
similarity index 100%
rename from src/common/Compiler.h
rename to src/dawn/common/Compiler.h
diff --git a/src/common/ConcurrentCache.h b/src/dawn/common/ConcurrentCache.h
similarity index 97%
rename from src/common/ConcurrentCache.h
rename to src/dawn/common/ConcurrentCache.h
index a1cab8d..e11b646 100644
--- a/src/common/ConcurrentCache.h
+++ b/src/dawn/common/ConcurrentCache.h
@@ -15,7 +15,7 @@
#ifndef COMMON_CONCURRENT_CACHE_H_
#define COMMON_CONCURRENT_CACHE_H_
-#include "common/NonCopyable.h"
+#include "dawn/common/NonCopyable.h"
#include <mutex>
#include <unordered_set>
diff --git a/src/common/Constants.h b/src/dawn/common/Constants.h
similarity index 100%
rename from src/common/Constants.h
rename to src/dawn/common/Constants.h
diff --git a/src/common/CoreFoundationRef.h b/src/dawn/common/CoreFoundationRef.h
similarity index 97%
rename from src/common/CoreFoundationRef.h
rename to src/dawn/common/CoreFoundationRef.h
index a4a637b..e6cafbe 100644
--- a/src/common/CoreFoundationRef.h
+++ b/src/dawn/common/CoreFoundationRef.h
@@ -15,7 +15,7 @@
#ifndef COMMON_COREFOUNDATIONREF_H_
#define COMMON_COREFOUNDATIONREF_H_
-#include "common/RefBase.h"
+#include "dawn/common/RefBase.h"
#include <CoreFoundation/CoreFoundation.h>
diff --git a/src/common/DynamicLib.cpp b/src/dawn/common/DynamicLib.cpp
similarity index 93%
rename from src/common/DynamicLib.cpp
rename to src/dawn/common/DynamicLib.cpp
index 119ec42..ab4f2d7 100644
--- a/src/common/DynamicLib.cpp
+++ b/src/dawn/common/DynamicLib.cpp
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/DynamicLib.h"
+#include "dawn/common/DynamicLib.h"
-#include "common/Platform.h"
+#include "dawn/common/Platform.h"
#if DAWN_PLATFORM_WINDOWS
-# include "common/windows_with_undefs.h"
+# include "dawn/common/windows_with_undefs.h"
# if DAWN_PLATFORM_WINUWP
-# include "common/WindowsUtils.h"
+# include "dawn/common/WindowsUtils.h"
# endif
#elif DAWN_PLATFORM_POSIX
# include <dlfcn.h>
diff --git a/src/common/DynamicLib.h b/src/dawn/common/DynamicLib.h
similarity index 97%
rename from src/common/DynamicLib.h
rename to src/dawn/common/DynamicLib.h
index 0fe6ca1..66d846e 100644
--- a/src/common/DynamicLib.h
+++ b/src/dawn/common/DynamicLib.h
@@ -15,7 +15,7 @@
#ifndef COMMON_DYNAMICLIB_H_
#define COMMON_DYNAMICLIB_H_
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include <string>
#include <type_traits>
diff --git a/src/common/GPUInfo.cpp b/src/dawn/common/GPUInfo.cpp
similarity index 98%
rename from src/common/GPUInfo.cpp
rename to src/dawn/common/GPUInfo.cpp
index 6068b9d..97068ff 100644
--- a/src/common/GPUInfo.cpp
+++ b/src/dawn/common/GPUInfo.cpp
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/GPUInfo.h"
+#include "dawn/common/GPUInfo.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include <algorithm>
#include <array>
diff --git a/src/common/GPUInfo.h b/src/dawn/common/GPUInfo.h
similarity index 100%
rename from src/common/GPUInfo.h
rename to src/dawn/common/GPUInfo.h
diff --git a/src/common/HashUtils.h b/src/dawn/common/HashUtils.h
similarity index 96%
rename from src/common/HashUtils.h
rename to src/dawn/common/HashUtils.h
index 1c33a3f..e59e8c5 100644
--- a/src/common/HashUtils.h
+++ b/src/dawn/common/HashUtils.h
@@ -15,9 +15,9 @@
#ifndef COMMON_HASHUTILS_H_
#define COMMON_HASHUTILS_H_
-#include "common/Platform.h"
-#include "common/TypedInteger.h"
-#include "common/ityp_bitset.h"
+#include "dawn/common/Platform.h"
+#include "dawn/common/TypedInteger.h"
+#include "dawn/common/ityp_bitset.h"
#include <bitset>
#include <functional>
diff --git a/src/common/IOKitRef.h b/src/dawn/common/IOKitRef.h
similarity index 97%
rename from src/common/IOKitRef.h
rename to src/dawn/common/IOKitRef.h
index cba0376..4ff4413 100644
--- a/src/common/IOKitRef.h
+++ b/src/dawn/common/IOKitRef.h
@@ -15,7 +15,7 @@
#ifndef COMMON_IOKITREF_H_
#define COMMON_IOKITREF_H_
-#include "common/RefBase.h"
+#include "dawn/common/RefBase.h"
#include <IOKit/IOKitLib.h>
diff --git a/src/common/LinkedList.h b/src/dawn/common/LinkedList.h
similarity index 99%
rename from src/common/LinkedList.h
rename to src/dawn/common/LinkedList.h
index 881aa82..673f596 100644
--- a/src/common/LinkedList.h
+++ b/src/dawn/common/LinkedList.h
@@ -11,7 +11,7 @@
#ifndef COMMON_LINKED_LIST_H
#define COMMON_LINKED_LIST_H
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
// Simple LinkedList type. (See the Q&A section to understand how this
// differs from std::list).
diff --git a/src/common/Log.cpp b/src/dawn/common/Log.cpp
similarity index 97%
rename from src/common/Log.cpp
rename to src/dawn/common/Log.cpp
index 98b4b2b..b85094b 100644
--- a/src/common/Log.cpp
+++ b/src/dawn/common/Log.cpp
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Log.h"
+#include "dawn/common/Log.h"
-#include "common/Assert.h"
-#include "common/Platform.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Platform.h"
#include <cstdio>
diff --git a/src/common/Log.h b/src/dawn/common/Log.h
similarity index 100%
rename from src/common/Log.h
rename to src/dawn/common/Log.h
diff --git a/src/common/Math.cpp b/src/dawn/common/Math.cpp
similarity index 97%
rename from src/common/Math.cpp
rename to src/dawn/common/Math.cpp
index 053fa3e..bd936a8 100644
--- a/src/common/Math.cpp
+++ b/src/dawn/common/Math.cpp
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Math.h"
+#include "dawn/common/Math.h"
-#include "common/Assert.h"
-#include "common/Platform.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Platform.h"
#include <algorithm>
#include <cmath>
diff --git a/src/common/Math.h b/src/dawn/common/Math.h
similarity index 98%
rename from src/common/Math.h
rename to src/dawn/common/Math.h
index 408c0a9..9ef02d0 100644
--- a/src/common/Math.h
+++ b/src/dawn/common/Math.h
@@ -15,7 +15,7 @@
#ifndef COMMON_MATH_H_
#define COMMON_MATH_H_
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include <cstddef>
#include <cstdint>
diff --git a/src/common/NSRef.h b/src/dawn/common/NSRef.h
similarity index 98%
rename from src/common/NSRef.h
rename to src/dawn/common/NSRef.h
index 6423856..5bf4914 100644
--- a/src/common/NSRef.h
+++ b/src/dawn/common/NSRef.h
@@ -15,7 +15,7 @@
#ifndef COMMON_NSREF_H_
#define COMMON_NSREF_H_
-#include "common/RefBase.h"
+#include "dawn/common/RefBase.h"
#import <Foundation/NSObject.h>
diff --git a/src/common/NonCopyable.h b/src/dawn/common/NonCopyable.h
similarity index 100%
rename from src/common/NonCopyable.h
rename to src/dawn/common/NonCopyable.h
diff --git a/src/common/PlacementAllocated.h b/src/dawn/common/PlacementAllocated.h
similarity index 100%
rename from src/common/PlacementAllocated.h
rename to src/dawn/common/PlacementAllocated.h
diff --git a/src/common/Platform.h b/src/dawn/common/Platform.h
similarity index 100%
rename from src/common/Platform.h
rename to src/dawn/common/Platform.h
diff --git a/src/common/Preprocessor.h b/src/dawn/common/Preprocessor.h
similarity index 100%
rename from src/common/Preprocessor.h
rename to src/dawn/common/Preprocessor.h
diff --git a/src/common/RefBase.h b/src/dawn/common/RefBase.h
similarity index 98%
rename from src/common/RefBase.h
rename to src/dawn/common/RefBase.h
index 5537c84..5d10789 100644
--- a/src/common/RefBase.h
+++ b/src/dawn/common/RefBase.h
@@ -15,8 +15,8 @@
#ifndef COMMON_REFBASE_H_
#define COMMON_REFBASE_H_
-#include "common/Assert.h"
-#include "common/Compiler.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Compiler.h"
#include <type_traits>
#include <utility>
diff --git a/src/common/RefCounted.cpp b/src/dawn/common/RefCounted.cpp
similarity index 97%
rename from src/common/RefCounted.cpp
rename to src/dawn/common/RefCounted.cpp
index f559638..6950d13 100644
--- a/src/common/RefCounted.cpp
+++ b/src/dawn/common/RefCounted.cpp
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/RefCounted.h"
+#include "dawn/common/RefCounted.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include <cstddef>
diff --git a/src/common/RefCounted.h b/src/dawn/common/RefCounted.h
similarity index 97%
rename from src/common/RefCounted.h
rename to src/dawn/common/RefCounted.h
index 6b266e3..65f37b9 100644
--- a/src/common/RefCounted.h
+++ b/src/dawn/common/RefCounted.h
@@ -15,7 +15,7 @@
#ifndef COMMON_REFCOUNTED_H_
#define COMMON_REFCOUNTED_H_
-#include "common/RefBase.h"
+#include "dawn/common/RefBase.h"
#include <atomic>
#include <cstdint>
diff --git a/src/common/Result.cpp b/src/dawn/common/Result.cpp
similarity index 96%
rename from src/common/Result.cpp
rename to src/dawn/common/Result.cpp
index a4132cd..2101e47 100644
--- a/src/common/Result.cpp
+++ b/src/dawn/common/Result.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Result.h"
+#include "dawn/common/Result.h"
// Implementation details of the tagged pointer Results
namespace detail {
diff --git a/src/common/Result.h b/src/dawn/common/Result.h
similarity index 97%
rename from src/common/Result.h
rename to src/dawn/common/Result.h
index 28d2e2d..5566829 100644
--- a/src/common/Result.h
+++ b/src/dawn/common/Result.h
@@ -15,8 +15,8 @@
#ifndef COMMON_RESULT_H_
#define COMMON_RESULT_H_
-#include "common/Assert.h"
-#include "common/Compiler.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Compiler.h"
#include <cstddef>
#include <cstdint>
@@ -63,7 +63,7 @@
Result();
Result(std::unique_ptr<E> error);
- Result(Result<void, E>&& other);
+ Result(Result<void, E> && other);
Result<void, E>& operator=(Result<void, E>&& other);
~Result();
@@ -116,12 +116,12 @@
static_assert(alignof_if_defined_else_default<E, 4> >= 4,
"Result<T*, E*> reserves two bits for tagging pointers");
- Result(T* success);
+ Result(T * success);
Result(std::unique_ptr<E> error);
// Support returning a Result<T*, E*> from a Result<TChild*, E*>
template <typename TChild>
- Result(Result<TChild*, E>&& other);
+ Result(Result<TChild*, E> && other);
template <typename TChild>
Result<T*, E>& operator=(Result<TChild*, E>&& other);
@@ -151,7 +151,7 @@
Result(const T* success);
Result(std::unique_ptr<E> error);
- Result(Result<const T*, E>&& other);
+ Result(Result<const T*, E> && other);
Result<const T*, E>& operator=(Result<const T*, E>&& other);
~Result();
@@ -178,13 +178,13 @@
"Result<Ref<T>, E> reserves two bits for tagging pointers");
template <typename U>
- Result(Ref<U>&& success);
+ Result(Ref<U> && success);
template <typename U>
Result(const Ref<U>& success);
Result(std::unique_ptr<E> error);
template <typename U>
- Result(Result<Ref<U>, E>&& other);
+ Result(Result<Ref<U>, E> && other);
template <typename U>
Result<Ref<U>, E>& operator=(Result<Ref<U>, E>&& other);
@@ -209,10 +209,10 @@
template <typename T, typename E>
class [[nodiscard]] Result {
public:
- Result(T&& success);
+ Result(T && success);
Result(std::unique_ptr<E> error);
- Result(Result<T, E>&& other);
+ Result(Result<T, E> && other);
Result<T, E>& operator=(Result<T, E>&& other);
~Result();
diff --git a/src/common/SerialMap.h b/src/dawn/common/SerialMap.h
similarity index 98%
rename from src/common/SerialMap.h
rename to src/dawn/common/SerialMap.h
index fe3ca18..750f16e 100644
--- a/src/common/SerialMap.h
+++ b/src/dawn/common/SerialMap.h
@@ -15,7 +15,7 @@
#ifndef COMMON_SERIALMAP_H_
#define COMMON_SERIALMAP_H_
-#include "common/SerialStorage.h"
+#include "dawn/common/SerialStorage.h"
#include <map>
#include <vector>
diff --git a/src/common/SerialQueue.h b/src/dawn/common/SerialQueue.h
similarity index 98%
rename from src/common/SerialQueue.h
rename to src/dawn/common/SerialQueue.h
index 5f24947..3e33f1e 100644
--- a/src/common/SerialQueue.h
+++ b/src/dawn/common/SerialQueue.h
@@ -15,7 +15,7 @@
#ifndef COMMON_SERIALQUEUE_H_
#define COMMON_SERIALQUEUE_H_
-#include "common/SerialStorage.h"
+#include "dawn/common/SerialStorage.h"
#include <vector>
@@ -39,7 +39,6 @@
template <typename Serial, typename Value>
class SerialQueue : public SerialStorage<SerialQueue<Serial, Value>> {
public:
-
// The serial must be given in (not strictly) increasing order.
void Enqueue(const Value& value, Serial serial);
void Enqueue(Value&& value, Serial serial);
diff --git a/src/common/SerialStorage.h b/src/dawn/common/SerialStorage.h
similarity index 99%
rename from src/common/SerialStorage.h
rename to src/dawn/common/SerialStorage.h
index 2999071..8a103f5 100644
--- a/src/common/SerialStorage.h
+++ b/src/dawn/common/SerialStorage.h
@@ -15,7 +15,7 @@
#ifndef COMMON_SERIALSTORAGE_H_
#define COMMON_SERIALSTORAGE_H_
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include <cstdint>
#include <utility>
diff --git a/src/common/SlabAllocator.cpp b/src/dawn/common/SlabAllocator.cpp
similarity index 98%
rename from src/common/SlabAllocator.cpp
rename to src/dawn/common/SlabAllocator.cpp
index 38004ba..d680ee3 100644
--- a/src/common/SlabAllocator.cpp
+++ b/src/dawn/common/SlabAllocator.cpp
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/SlabAllocator.h"
+#include "dawn/common/SlabAllocator.h"
-#include "common/Assert.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
#include <algorithm>
#include <cstdlib>
diff --git a/src/common/SlabAllocator.h b/src/dawn/common/SlabAllocator.h
similarity index 99%
rename from src/common/SlabAllocator.h
rename to src/dawn/common/SlabAllocator.h
index b02ed52..58d2d94 100644
--- a/src/common/SlabAllocator.h
+++ b/src/dawn/common/SlabAllocator.h
@@ -15,7 +15,7 @@
#ifndef COMMON_SLABALLOCATOR_H_
#define COMMON_SLABALLOCATOR_H_
-#include "common/PlacementAllocated.h"
+#include "dawn/common/PlacementAllocated.h"
#include <cstdint>
#include <type_traits>
diff --git a/src/common/StackContainer.h b/src/dawn/common/StackContainer.h
similarity index 99%
rename from src/common/StackContainer.h
rename to src/dawn/common/StackContainer.h
index be3cf32..4de688f 100644
--- a/src/common/StackContainer.h
+++ b/src/dawn/common/StackContainer.h
@@ -7,7 +7,7 @@
#ifndef COMMON_STACKCONTAINER_H_
#define COMMON_STACKCONTAINER_H_
-#include "common/Compiler.h"
+#include "dawn/common/Compiler.h"
#include <cstddef>
#include <vector>
diff --git a/src/common/SwapChainUtils.h b/src/dawn/common/SwapChainUtils.h
similarity index 100%
rename from src/common/SwapChainUtils.h
rename to src/dawn/common/SwapChainUtils.h
diff --git a/src/common/SystemUtils.cpp b/src/dawn/common/SystemUtils.cpp
similarity index 98%
rename from src/common/SystemUtils.cpp
rename to src/dawn/common/SystemUtils.cpp
index 41a7d87..a5ce0f1 100644
--- a/src/common/SystemUtils.cpp
+++ b/src/dawn/common/SystemUtils.cpp
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/SystemUtils.h"
+#include "dawn/common/SystemUtils.h"
-#include "common/Assert.h"
-#include "common/Log.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Log.h"
#if defined(DAWN_PLATFORM_WINDOWS)
# include <Windows.h>
diff --git a/src/common/SystemUtils.h b/src/dawn/common/SystemUtils.h
similarity index 98%
rename from src/common/SystemUtils.h
rename to src/dawn/common/SystemUtils.h
index b7b9aa4..bb59966 100644
--- a/src/common/SystemUtils.h
+++ b/src/dawn/common/SystemUtils.h
@@ -15,7 +15,7 @@
#ifndef COMMON_SYSTEMUTILS_H_
#define COMMON_SYSTEMUTILS_H_
-#include "common/Platform.h"
+#include "dawn/common/Platform.h"
#include <optional>
#include <string>
diff --git a/src/common/SystemUtils_mac.mm b/src/dawn/common/SystemUtils_mac.mm
similarity index 94%
rename from src/common/SystemUtils_mac.mm
rename to src/dawn/common/SystemUtils_mac.mm
index 9bd27d2..b706c20 100644
--- a/src/common/SystemUtils_mac.mm
+++ b/src/dawn/common/SystemUtils_mac.mm
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/SystemUtils.h"
+#include "dawn/common/SystemUtils.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#import <Foundation/NSProcessInfo.h>
diff --git a/src/common/TypeTraits.h b/src/dawn/common/TypeTraits.h
similarity index 100%
rename from src/common/TypeTraits.h
rename to src/dawn/common/TypeTraits.h
diff --git a/src/common/TypedInteger.h b/src/dawn/common/TypedInteger.h
similarity index 98%
rename from src/common/TypedInteger.h
rename to src/dawn/common/TypedInteger.h
index fcba36d..6669d14 100644
--- a/src/common/TypedInteger.h
+++ b/src/dawn/common/TypedInteger.h
@@ -15,8 +15,8 @@
#ifndef COMMON_TYPEDINTEGER_H_
#define COMMON_TYPEDINTEGER_H_
-#include "common/Assert.h"
-#include "common/UnderlyingType.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/UnderlyingType.h"
#include <limits>
#include <type_traits>
diff --git a/src/common/UnderlyingType.h b/src/dawn/common/UnderlyingType.h
similarity index 100%
rename from src/common/UnderlyingType.h
rename to src/dawn/common/UnderlyingType.h
diff --git a/src/common/WindowsUtils.cpp b/src/dawn/common/WindowsUtils.cpp
similarity index 94%
rename from src/common/WindowsUtils.cpp
rename to src/dawn/common/WindowsUtils.cpp
index a0f041a..fd924f4 100644
--- a/src/common/WindowsUtils.cpp
+++ b/src/dawn/common/WindowsUtils.cpp
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/WindowsUtils.h"
+#include "dawn/common/WindowsUtils.h"
-#include "common/windows_with_undefs.h"
+#include "dawn/common/windows_with_undefs.h"
#include <memory>
diff --git a/src/common/WindowsUtils.h b/src/dawn/common/WindowsUtils.h
similarity index 100%
rename from src/common/WindowsUtils.h
rename to src/dawn/common/WindowsUtils.h
diff --git a/src/common/ityp_array.h b/src/dawn/common/ityp_array.h
similarity index 97%
rename from src/common/ityp_array.h
rename to src/dawn/common/ityp_array.h
index bb00ecd..c7db71a 100644
--- a/src/common/ityp_array.h
+++ b/src/dawn/common/ityp_array.h
@@ -15,8 +15,8 @@
#ifndef COMMON_ITYP_ARRAY_H_
#define COMMON_ITYP_ARRAY_H_
-#include "common/TypedInteger.h"
-#include "common/UnderlyingType.h"
+#include "dawn/common/TypedInteger.h"
+#include "dawn/common/UnderlyingType.h"
#include <array>
#include <cstddef>
diff --git a/src/common/ityp_bitset.h b/src/dawn/common/ityp_bitset.h
similarity index 96%
rename from src/common/ityp_bitset.h
rename to src/dawn/common/ityp_bitset.h
index c166b3f..057e54e 100644
--- a/src/common/ityp_bitset.h
+++ b/src/dawn/common/ityp_bitset.h
@@ -15,9 +15,9 @@
#ifndef COMMON_ITYP_BITSET_H_
#define COMMON_ITYP_BITSET_H_
-#include "common/BitSetIterator.h"
-#include "common/TypedInteger.h"
-#include "common/UnderlyingType.h"
+#include "dawn/common/BitSetIterator.h"
+#include "dawn/common/TypedInteger.h"
+#include "dawn/common/UnderlyingType.h"
namespace ityp {
diff --git a/src/common/ityp_span.h b/src/dawn/common/ityp_span.h
similarity index 96%
rename from src/common/ityp_span.h
rename to src/dawn/common/ityp_span.h
index 00ba93f..c73f983 100644
--- a/src/common/ityp_span.h
+++ b/src/dawn/common/ityp_span.h
@@ -15,8 +15,8 @@
#ifndef COMMON_ITYP_SPAN_H_
#define COMMON_ITYP_SPAN_H_
-#include "common/TypedInteger.h"
-#include "common/UnderlyingType.h"
+#include "dawn/common/TypedInteger.h"
+#include "dawn/common/UnderlyingType.h"
#include <type_traits>
diff --git a/src/common/ityp_stack_vec.h b/src/dawn/common/ityp_stack_vec.h
similarity index 96%
rename from src/common/ityp_stack_vec.h
rename to src/dawn/common/ityp_stack_vec.h
index 3a5c09b..47c437e 100644
--- a/src/common/ityp_stack_vec.h
+++ b/src/dawn/common/ityp_stack_vec.h
@@ -15,9 +15,9 @@
#ifndef COMMON_ITYP_STACK_VEC_H_
#define COMMON_ITYP_STACK_VEC_H_
-#include "common/Assert.h"
-#include "common/StackContainer.h"
-#include "common/UnderlyingType.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/StackContainer.h"
+#include "dawn/common/UnderlyingType.h"
namespace ityp {
diff --git a/src/common/ityp_vector.h b/src/dawn/common/ityp_vector.h
similarity index 97%
rename from src/common/ityp_vector.h
rename to src/dawn/common/ityp_vector.h
index a747d5a..9d83adf 100644
--- a/src/common/ityp_vector.h
+++ b/src/dawn/common/ityp_vector.h
@@ -15,8 +15,8 @@
#ifndef COMMON_ITYP_VECTOR_H_
#define COMMON_ITYP_VECTOR_H_
-#include "common/TypedInteger.h"
-#include "common/UnderlyingType.h"
+#include "dawn/common/TypedInteger.h"
+#include "dawn/common/UnderlyingType.h"
#include <type_traits>
#include <vector>
diff --git a/src/common/vulkan_platform.h b/src/dawn/common/vulkan_platform.h
similarity index 97%
rename from src/common/vulkan_platform.h
rename to src/dawn/common/vulkan_platform.h
index 38569cb..57d2b13 100644
--- a/src/common/vulkan_platform.h
+++ b/src/dawn/common/vulkan_platform.h
@@ -22,7 +22,7 @@
# error "vulkan.h included before vulkan_platform.h"
#endif
-#include "common/Platform.h"
+#include "dawn/common/Platform.h"
#include <cstddef>
#include <cstdint>
@@ -156,13 +156,13 @@
// headers that vulkan.h includes that we have "undefs" for.
#if defined(DAWN_PLATFORM_WINDOWS)
# define VK_USE_PLATFORM_WIN32_KHR
-# include "common/windows_with_undefs.h"
+# include "dawn/common/windows_with_undefs.h"
#endif // DAWN_PLATFORM_WINDOWS
#if defined(DAWN_USE_X11)
# define VK_USE_PLATFORM_XLIB_KHR
# define VK_USE_PLATFORM_XCB_KHR
-# include "common/xlib_with_undefs.h"
+# include "dawn/common/xlib_with_undefs.h"
#endif // defined(DAWN_USE_X11)
#if defined(DAWN_ENABLE_BACKEND_METAL)
diff --git a/src/common/windows_with_undefs.h b/src/dawn/common/windows_with_undefs.h
similarity index 97%
rename from src/common/windows_with_undefs.h
rename to src/dawn/common/windows_with_undefs.h
index 39c9cad..686da9f 100644
--- a/src/common/windows_with_undefs.h
+++ b/src/dawn/common/windows_with_undefs.h
@@ -15,7 +15,7 @@
#ifndef COMMON_WINDOWS_WITH_UNDEFS_H_
#define COMMON_WINDOWS_WITH_UNDEFS_H_
-#include "common/Platform.h"
+#include "dawn/common/Platform.h"
#if !defined(DAWN_PLATFORM_WINDOWS)
# error "windows_with_undefs.h included on non-Windows"
diff --git a/src/common/xlib_with_undefs.h b/src/dawn/common/xlib_with_undefs.h
similarity index 97%
rename from src/common/xlib_with_undefs.h
rename to src/dawn/common/xlib_with_undefs.h
index 34889aa..7ac5a62 100644
--- a/src/common/xlib_with_undefs.h
+++ b/src/dawn/common/xlib_with_undefs.h
@@ -15,7 +15,7 @@
#ifndef COMMON_XLIB_WITH_UNDEFS_H_
#define COMMON_XLIB_WITH_UNDEFS_H_
-#include "common/Platform.h"
+#include "dawn/common/Platform.h"
#if !defined(DAWN_PLATFORM_LINUX)
# error "xlib_with_undefs.h included on non-Linux"
diff --git a/src/dawn_native/Adapter.cpp b/src/dawn_native/Adapter.cpp
index 2c485e7..7e38b39 100644
--- a/src/dawn_native/Adapter.cpp
+++ b/src/dawn_native/Adapter.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/Adapter.h"
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include "dawn_native/Device.h"
#include "dawn_native/Instance.h"
#include "dawn_native/ValidationUtils_autogen.h"
diff --git a/src/dawn_native/Adapter.h b/src/dawn_native/Adapter.h
index c9398d2..f055faf 100644
--- a/src/dawn_native/Adapter.h
+++ b/src/dawn_native/Adapter.h
@@ -17,8 +17,8 @@
#include "dawn_native/DawnNative.h"
-#include "common/RefCounted.h"
-#include "common/ityp_span.h"
+#include "dawn/common/RefCounted.h"
+#include "dawn/common/ityp_span.h"
#include "dawn_native/Error.h"
#include "dawn_native/Features.h"
#include "dawn_native/Limits.h"
diff --git a/src/dawn_native/AsyncTask.h b/src/dawn_native/AsyncTask.h
index e6c5781..ca2edd0 100644
--- a/src/dawn_native/AsyncTask.h
+++ b/src/dawn_native/AsyncTask.h
@@ -20,7 +20,7 @@
#include <mutex>
#include <unordered_map>
-#include "common/RefCounted.h"
+#include "dawn/common/RefCounted.h"
namespace dawn::platform {
class WaitableEvent;
diff --git a/src/dawn_native/AttachmentState.cpp b/src/dawn_native/AttachmentState.cpp
index ceff76d..6ca9e40 100644
--- a/src/dawn_native/AttachmentState.cpp
+++ b/src/dawn_native/AttachmentState.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/AttachmentState.h"
-#include "common/BitSetIterator.h"
+#include "dawn/common/BitSetIterator.h"
#include "dawn_native/Device.h"
#include "dawn_native/ObjectContentHasher.h"
#include "dawn_native/Texture.h"
diff --git a/src/dawn_native/AttachmentState.h b/src/dawn_native/AttachmentState.h
index b30998e..02e47fc 100644
--- a/src/dawn_native/AttachmentState.h
+++ b/src/dawn_native/AttachmentState.h
@@ -15,9 +15,9 @@
#ifndef DAWNNATIVE_ATTACHMENTSTATE_H_
#define DAWNNATIVE_ATTACHMENTSTATE_H_
-#include "common/Constants.h"
-#include "common/ityp_array.h"
-#include "common/ityp_bitset.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/ityp_array.h"
+#include "dawn/common/ityp_bitset.h"
#include "dawn_native/CachedObject.h"
#include "dawn_native/IntegerTypes.h"
#include "dawn_native/ObjectBase.h"
diff --git a/src/dawn_native/BUILD.gn b/src/dawn_native/BUILD.gn
index 5a18b30..d89b85b 100644
--- a/src/dawn_native/BUILD.gn
+++ b/src/dawn_native/BUILD.gn
@@ -65,7 +65,7 @@
}
config("dawn_native_internal") {
- configs = [ "${dawn_root}/src/common:dawn_internal" ]
+ configs = [ "${dawn_root}/src/dawn/common:internal_config" ]
# Suppress warnings that Metal isn't in the deployment target of Chrome:
# initialization of the Metal backend is behind a IsMetalSupported check so
@@ -138,7 +138,7 @@
# dependencies of dawn_native
source_set("dawn_native_headers") {
public_deps = [ "${dawn_root}/src/dawn:dawncpp_headers" ]
- all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ]
+ all_dependent_configs = [ "${dawn_root}/src/dawn/common:public_include_dirs" ]
sources = [
"${dawn_root}/src/include/dawn_native/DawnNative.h",
"${dawn_root}/src/include/dawn_native/dawn_native_export.h",
@@ -160,7 +160,7 @@
deps = [
":dawn_native_headers",
":dawn_native_utils_gen",
- "${dawn_root}/src/common",
+ "${dawn_root}/src/dawn/common",
"${dawn_spirv_tools_dir}:spvtools_opt",
"${dawn_spirv_tools_dir}:spvtools_val",
"${dawn_tint_dir}/src:libtint",
@@ -711,7 +711,7 @@
deps = [
":dawn_native_sources",
- "${dawn_root}/src/common",
+ "${dawn_root}/src/dawn/common",
]
sources = [ "DawnNative.cpp" ]
configs = [ ":dawn_native_internal" ]
diff --git a/src/dawn_native/BindGroup.cpp b/src/dawn_native/BindGroup.cpp
index 61858e7..dc5f0b6 100644
--- a/src/dawn_native/BindGroup.cpp
+++ b/src/dawn_native/BindGroup.cpp
@@ -14,9 +14,9 @@
#include "dawn_native/BindGroup.h"
-#include "common/Assert.h"
-#include "common/Math.h"
-#include "common/ityp_bitset.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
+#include "dawn/common/ityp_bitset.h"
#include "dawn_native/BindGroupLayout.h"
#include "dawn_native/Buffer.h"
#include "dawn_native/ChainUtils_autogen.h"
diff --git a/src/dawn_native/BindGroup.h b/src/dawn_native/BindGroup.h
index fec56f3..3e6d87d 100644
--- a/src/dawn_native/BindGroup.h
+++ b/src/dawn_native/BindGroup.h
@@ -15,8 +15,8 @@
#ifndef DAWNNATIVE_BINDGROUP_H_
#define DAWNNATIVE_BINDGROUP_H_
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "dawn_native/BindGroupLayout.h"
#include "dawn_native/Error.h"
#include "dawn_native/Forward.h"
diff --git a/src/dawn_native/BindGroupLayout.cpp b/src/dawn_native/BindGroupLayout.cpp
index 8cd4a4d..78378c4 100644
--- a/src/dawn_native/BindGroupLayout.cpp
+++ b/src/dawn_native/BindGroupLayout.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/BindGroupLayout.h"
-#include "common/BitSetIterator.h"
+#include "dawn/common/BitSetIterator.h"
#include "dawn_native/ChainUtils_autogen.h"
#include "dawn_native/Device.h"
diff --git a/src/dawn_native/BindGroupLayout.h b/src/dawn_native/BindGroupLayout.h
index c5638dc..a4dbb77 100644
--- a/src/dawn_native/BindGroupLayout.h
+++ b/src/dawn_native/BindGroupLayout.h
@@ -15,11 +15,11 @@
#ifndef DAWNNATIVE_BINDGROUPLAYOUT_H_
#define DAWNNATIVE_BINDGROUPLAYOUT_H_
-#include "common/Constants.h"
-#include "common/Math.h"
-#include "common/SlabAllocator.h"
-#include "common/ityp_span.h"
-#include "common/ityp_vector.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
+#include "dawn/common/SlabAllocator.h"
+#include "dawn/common/ityp_span.h"
+#include "dawn/common/ityp_vector.h"
#include "dawn_native/BindingInfo.h"
#include "dawn_native/CachedObject.h"
#include "dawn_native/Error.h"
diff --git a/src/dawn_native/BindGroupTracker.h b/src/dawn_native/BindGroupTracker.h
index 53b886b..f0f6100 100644
--- a/src/dawn_native/BindGroupTracker.h
+++ b/src/dawn_native/BindGroupTracker.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_BINDGROUPTRACKER_H_
#define DAWNNATIVE_BINDGROUPTRACKER_H_
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include "dawn_native/BindGroupLayout.h"
#include "dawn_native/Pipeline.h"
#include "dawn_native/PipelineLayout.h"
diff --git a/src/dawn_native/BindingInfo.h b/src/dawn_native/BindingInfo.h
index aea4fc9..b909696 100644
--- a/src/dawn_native/BindingInfo.h
+++ b/src/dawn_native/BindingInfo.h
@@ -15,8 +15,8 @@
#ifndef DAWNNATIVE_BINDINGINFO_H_
#define DAWNNATIVE_BINDINGINFO_H_
-#include "common/Constants.h"
-#include "common/ityp_array.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/ityp_array.h"
#include "dawn_native/Error.h"
#include "dawn_native/Format.h"
#include "dawn_native/IntegerTypes.h"
diff --git a/src/dawn_native/BuddyAllocator.cpp b/src/dawn_native/BuddyAllocator.cpp
index 647bb6c..e398285 100644
--- a/src/dawn_native/BuddyAllocator.cpp
+++ b/src/dawn_native/BuddyAllocator.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/BuddyAllocator.h"
-#include "common/Assert.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
namespace dawn::native {
diff --git a/src/dawn_native/BuddyMemoryAllocator.cpp b/src/dawn_native/BuddyMemoryAllocator.cpp
index fd2387c..fc6e482 100644
--- a/src/dawn_native/BuddyMemoryAllocator.cpp
+++ b/src/dawn_native/BuddyMemoryAllocator.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/BuddyMemoryAllocator.h"
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "dawn_native/ResourceHeapAllocator.h"
namespace dawn::native {
diff --git a/src/dawn_native/Buffer.cpp b/src/dawn_native/Buffer.cpp
index 2e02529..294889e 100644
--- a/src/dawn_native/Buffer.cpp
+++ b/src/dawn_native/Buffer.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/Buffer.h"
-#include "common/Alloc.h"
-#include "common/Assert.h"
+#include "dawn/common/Alloc.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/Commands.h"
#include "dawn_native/Device.h"
#include "dawn_native/DynamicUploader.h"
diff --git a/src/dawn_native/CachedObject.cpp b/src/dawn_native/CachedObject.cpp
index 8f305bc..5a5c242 100644
--- a/src/dawn_native/CachedObject.cpp
+++ b/src/dawn_native/CachedObject.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/CachedObject.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
namespace dawn::native {
diff --git a/src/dawn_native/CommandAllocator.cpp b/src/dawn_native/CommandAllocator.cpp
index a9cea46..cfc2643 100644
--- a/src/dawn_native/CommandAllocator.cpp
+++ b/src/dawn_native/CommandAllocator.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/CommandAllocator.h"
-#include "common/Assert.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
#include <algorithm>
#include <climits>
diff --git a/src/dawn_native/CommandAllocator.h b/src/dawn_native/CommandAllocator.h
index 362b33b..9d2b471 100644
--- a/src/dawn_native/CommandAllocator.h
+++ b/src/dawn_native/CommandAllocator.h
@@ -15,9 +15,9 @@
#ifndef DAWNNATIVE_COMMAND_ALLOCATOR_H_
#define DAWNNATIVE_COMMAND_ALLOCATOR_H_
-#include "common/Assert.h"
-#include "common/Math.h"
-#include "common/NonCopyable.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
+#include "dawn/common/NonCopyable.h"
#include <cstddef>
#include <cstdint>
diff --git a/src/dawn_native/CommandBuffer.cpp b/src/dawn_native/CommandBuffer.cpp
index 43fd478..4b5efcb 100644
--- a/src/dawn_native/CommandBuffer.cpp
+++ b/src/dawn_native/CommandBuffer.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/CommandBuffer.h"
-#include "common/BitSetIterator.h"
+#include "dawn/common/BitSetIterator.h"
#include "dawn_native/Buffer.h"
#include "dawn_native/CommandEncoder.h"
#include "dawn_native/CommandValidation.h"
diff --git a/src/dawn_native/CommandBufferStateTracker.cpp b/src/dawn_native/CommandBufferStateTracker.cpp
index f049d5e..5b6618c 100644
--- a/src/dawn_native/CommandBufferStateTracker.cpp
+++ b/src/dawn_native/CommandBufferStateTracker.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/CommandBufferStateTracker.h"
-#include "common/Assert.h"
-#include "common/BitSetIterator.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/BitSetIterator.h"
#include "dawn_native/BindGroup.h"
#include "dawn_native/ComputePassEncoder.h"
#include "dawn_native/ComputePipeline.h"
diff --git a/src/dawn_native/CommandBufferStateTracker.h b/src/dawn_native/CommandBufferStateTracker.h
index 19bfb19..876d476 100644
--- a/src/dawn_native/CommandBufferStateTracker.h
+++ b/src/dawn_native/CommandBufferStateTracker.h
@@ -15,9 +15,9 @@
#ifndef DAWNNATIVE_COMMANDBUFFERSTATETRACKER_H
#define DAWNNATIVE_COMMANDBUFFERSTATETRACKER_H
-#include "common/Constants.h"
-#include "common/ityp_array.h"
-#include "common/ityp_bitset.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/ityp_array.h"
+#include "dawn/common/ityp_bitset.h"
#include "dawn_native/BindingInfo.h"
#include "dawn_native/Error.h"
#include "dawn_native/Forward.h"
diff --git a/src/dawn_native/CommandEncoder.cpp b/src/dawn_native/CommandEncoder.cpp
index 119484e..18ec5bf 100644
--- a/src/dawn_native/CommandEncoder.cpp
+++ b/src/dawn_native/CommandEncoder.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/CommandEncoder.h"
-#include "common/BitSetIterator.h"
-#include "common/Math.h"
+#include "dawn/common/BitSetIterator.h"
+#include "dawn/common/Math.h"
#include "dawn_native/BindGroup.h"
#include "dawn_native/Buffer.h"
#include "dawn_native/ChainUtils_autogen.h"
diff --git a/src/dawn_native/CommandValidation.cpp b/src/dawn_native/CommandValidation.cpp
index 0dd0539..6d0a870 100644
--- a/src/dawn_native/CommandValidation.cpp
+++ b/src/dawn_native/CommandValidation.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/CommandValidation.h"
-#include "common/BitSetIterator.h"
+#include "dawn/common/BitSetIterator.h"
#include "dawn_native/BindGroup.h"
#include "dawn_native/Buffer.h"
#include "dawn_native/CommandBufferStateTracker.h"
diff --git a/src/dawn_native/Commands.h b/src/dawn_native/Commands.h
index de37a38..a1f2879 100644
--- a/src/dawn_native/Commands.h
+++ b/src/dawn_native/Commands.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_COMMANDS_H_
#define DAWNNATIVE_COMMANDS_H_
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include "dawn_native/AttachmentState.h"
#include "dawn_native/BindingInfo.h"
diff --git a/src/dawn_native/CompilationMessages.cpp b/src/dawn_native/CompilationMessages.cpp
index 75833eb..7a407cd 100644
--- a/src/dawn_native/CompilationMessages.cpp
+++ b/src/dawn_native/CompilationMessages.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/CompilationMessages.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/dawn_platform.h"
#include <tint/tint.h>
diff --git a/src/dawn_native/CompilationMessages.h b/src/dawn_native/CompilationMessages.h
index ebddc1f..41703a1 100644
--- a/src/dawn_native/CompilationMessages.h
+++ b/src/dawn_native/CompilationMessages.h
@@ -17,7 +17,7 @@
#include "dawn_native/dawn_platform.h"
-#include "common/NonCopyable.h"
+#include "dawn/common/NonCopyable.h"
#include <string>
#include <vector>
@@ -59,4 +59,4 @@
} // namespace dawn::native
-#endif // DAWNNATIVE_COMPILATIONMESSAGES_H_
\ No newline at end of file
+#endif // DAWNNATIVE_COMPILATIONMESSAGES_H_
diff --git a/src/dawn_native/ComputePipeline.h b/src/dawn_native/ComputePipeline.h
index 1a80ed2..a6974a5 100644
--- a/src/dawn_native/ComputePipeline.h
+++ b/src/dawn_native/ComputePipeline.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_COMPUTEPIPELINE_H_
#define DAWNNATIVE_COMPUTEPIPELINE_H_
-#include "common/NonCopyable.h"
+#include "dawn/common/NonCopyable.h"
#include "dawn_native/Forward.h"
#include "dawn_native/Pipeline.h"
diff --git a/src/dawn_native/CopyTextureForBrowserHelper.cpp b/src/dawn_native/CopyTextureForBrowserHelper.cpp
index 2a4c357..ed967356 100644
--- a/src/dawn_native/CopyTextureForBrowserHelper.cpp
+++ b/src/dawn_native/CopyTextureForBrowserHelper.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/CopyTextureForBrowserHelper.h"
-#include "common/Log.h"
+#include "dawn/common/Log.h"
#include "dawn_native/BindGroup.h"
#include "dawn_native/BindGroupLayout.h"
#include "dawn_native/Buffer.h"
diff --git a/src/dawn_native/CreatePipelineAsyncTask.h b/src/dawn_native/CreatePipelineAsyncTask.h
index ad68164..75a56ff 100644
--- a/src/dawn_native/CreatePipelineAsyncTask.h
+++ b/src/dawn_native/CreatePipelineAsyncTask.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_CREATEPIPELINEASYNCTASK_H_
#define DAWNNATIVE_CREATEPIPELINEASYNCTASK_H_
-#include "common/RefCounted.h"
+#include "dawn/common/RefCounted.h"
#include "dawn/webgpu.h"
#include "dawn_native/CallbackTaskManager.h"
#include "dawn_native/Error.h"
diff --git a/src/dawn_native/DawnNative.cpp b/src/dawn_native/DawnNative.cpp
index 2eb033f..656192e 100644
--- a/src/dawn_native/DawnNative.cpp
+++ b/src/dawn_native/DawnNative.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/DawnNative.h"
-#include "common/Log.h"
+#include "dawn/common/Log.h"
#include "dawn_native/BindGroupLayout.h"
#include "dawn_native/Buffer.h"
#include "dawn_native/Device.h"
diff --git a/src/dawn_native/Device.cpp b/src/dawn_native/Device.cpp
index 582ec87..9e23622 100644
--- a/src/dawn_native/Device.cpp
+++ b/src/dawn_native/Device.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/Device.h"
-#include "common/Log.h"
+#include "dawn/common/Log.h"
#include "dawn_native/Adapter.h"
#include "dawn_native/AsyncTask.h"
#include "dawn_native/AttachmentState.h"
diff --git a/src/dawn_native/DynamicUploader.cpp b/src/dawn_native/DynamicUploader.cpp
index a8df609..9cba716 100644
--- a/src/dawn_native/DynamicUploader.cpp
+++ b/src/dawn_native/DynamicUploader.cpp
@@ -13,7 +13,7 @@
// limitations under the License.
#include "dawn_native/DynamicUploader.h"
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "dawn_native/Device.h"
namespace dawn::native {
diff --git a/src/dawn_native/EncodingContext.cpp b/src/dawn_native/EncodingContext.cpp
index bdc9640..66e9762 100644
--- a/src/dawn_native/EncodingContext.cpp
+++ b/src/dawn_native/EncodingContext.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/EncodingContext.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/CommandEncoder.h"
#include "dawn_native/Commands.h"
#include "dawn_native/Device.h"
diff --git a/src/dawn_native/EnumMaskIterator.h b/src/dawn_native/EnumMaskIterator.h
index 5954f91..1f7f03e 100644
--- a/src/dawn_native/EnumMaskIterator.h
+++ b/src/dawn_native/EnumMaskIterator.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_ENUMMASKITERATOR_H_
#define DAWNNATIVE_ENUMMASKITERATOR_H_
-#include "common/BitSetIterator.h"
+#include "dawn/common/BitSetIterator.h"
#include "dawn_native/EnumClassBitmasks.h"
namespace dawn::native {
diff --git a/src/dawn_native/Error.h b/src/dawn_native/Error.h
index 51cbcf5..5f905b5 100644
--- a/src/dawn_native/Error.h
+++ b/src/dawn_native/Error.h
@@ -16,7 +16,7 @@
#define DAWNNATIVE_ERROR_H_
#include "absl/strings/str_format.h"
-#include "common/Result.h"
+#include "dawn/common/Result.h"
#include "dawn_native/ErrorData.h"
#include "dawn_native/webgpu_absl_format.h"
@@ -24,12 +24,7 @@
namespace dawn::native {
- enum class InternalErrorType : uint32_t {
- Validation,
- DeviceLost,
- Internal,
- OutOfMemory
- };
+ enum class InternalErrorType : uint32_t { Validation, DeviceLost, Internal, OutOfMemory };
// MaybeError and ResultOrError are meant to be used as return value for function that are not
// expected to, but might fail. The handling of error is potentially much slower than successes.
diff --git a/src/dawn_native/ErrorData.h b/src/dawn_native/ErrorData.h
index 9600c34..901c54f 100644
--- a/src/dawn_native/ErrorData.h
+++ b/src/dawn_native/ErrorData.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_ERRORDATA_H_
#define DAWNNATIVE_ERRORDATA_H_
-#include "common/Compiler.h"
+#include "dawn/common/Compiler.h"
#include <cstdint>
#include <memory>
diff --git a/src/dawn_native/ErrorInjector.cpp b/src/dawn_native/ErrorInjector.cpp
index 2dd67b9..638bf47 100644
--- a/src/dawn_native/ErrorInjector.cpp
+++ b/src/dawn_native/ErrorInjector.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/ErrorInjector.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/DawnNative.h"
namespace dawn::native {
diff --git a/src/dawn_native/ErrorScope.cpp b/src/dawn_native/ErrorScope.cpp
index b9a8079..c86f008 100644
--- a/src/dawn_native/ErrorScope.cpp
+++ b/src/dawn_native/ErrorScope.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/ErrorScope.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
namespace dawn::native {
diff --git a/src/dawn_native/Features.cpp b/src/dawn_native/Features.cpp
index 81d9bed..ac1c0dd 100644
--- a/src/dawn_native/Features.cpp
+++ b/src/dawn_native/Features.cpp
@@ -14,8 +14,8 @@
#include <array>
-#include "common/Assert.h"
-#include "common/BitSetIterator.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/BitSetIterator.h"
#include "dawn_native/Features.h"
namespace dawn::native {
diff --git a/src/dawn_native/Features.h b/src/dawn_native/Features.h
index 169861a..d1923c5 100644
--- a/src/dawn_native/Features.h
+++ b/src/dawn_native/Features.h
@@ -19,7 +19,7 @@
#include <unordered_map>
#include <vector>
-#include "common/ityp_bitset.h"
+#include "dawn/common/ityp_bitset.h"
#include "dawn/webgpu_cpp.h"
#include "dawn_native/DawnNative.h"
diff --git a/src/dawn_native/Format.h b/src/dawn_native/Format.h
index 3a9f1a8..7b77309 100644
--- a/src/dawn_native/Format.h
+++ b/src/dawn_native/Format.h
@@ -17,7 +17,7 @@
#include "dawn_native/dawn_platform.h"
-#include "common/ityp_bitset.h"
+#include "dawn/common/ityp_bitset.h"
#include "dawn_native/EnumClassBitmasks.h"
#include "dawn_native/Error.h"
#include "dawn_native/Subresource.h"
diff --git a/src/dawn_native/IndirectDrawMetadata.cpp b/src/dawn_native/IndirectDrawMetadata.cpp
index a1bb084..f6a0e22 100644
--- a/src/dawn_native/IndirectDrawMetadata.cpp
+++ b/src/dawn_native/IndirectDrawMetadata.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/IndirectDrawMetadata.h"
-#include "common/Constants.h"
-#include "common/RefCounted.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/RefCounted.h"
#include "dawn_native/IndirectDrawValidationEncoder.h"
#include "dawn_native/Limits.h"
#include "dawn_native/RenderBundle.h"
diff --git a/src/dawn_native/IndirectDrawMetadata.h b/src/dawn_native/IndirectDrawMetadata.h
index c4f62fa..57fee03 100644
--- a/src/dawn_native/IndirectDrawMetadata.h
+++ b/src/dawn_native/IndirectDrawMetadata.h
@@ -15,8 +15,8 @@
#ifndef DAWNNATIVE_INDIRECTDRAWMETADATA_H_
#define DAWNNATIVE_INDIRECTDRAWMETADATA_H_
-#include "common/NonCopyable.h"
-#include "common/RefCounted.h"
+#include "dawn/common/NonCopyable.h"
+#include "dawn/common/RefCounted.h"
#include "dawn_native/Buffer.h"
#include "dawn_native/CommandBufferStateTracker.h"
#include "dawn_native/Commands.h"
diff --git a/src/dawn_native/IndirectDrawValidationEncoder.cpp b/src/dawn_native/IndirectDrawValidationEncoder.cpp
index 28c5ad3..02c7057 100644
--- a/src/dawn_native/IndirectDrawValidationEncoder.cpp
+++ b/src/dawn_native/IndirectDrawValidationEncoder.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/IndirectDrawValidationEncoder.h"
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "dawn_native/BindGroup.h"
#include "dawn_native/BindGroupLayout.h"
#include "dawn_native/CommandEncoder.h"
diff --git a/src/dawn_native/Instance.cpp b/src/dawn_native/Instance.cpp
index c0f4e1b..19d8dda 100644
--- a/src/dawn_native/Instance.cpp
+++ b/src/dawn_native/Instance.cpp
@@ -14,10 +14,10 @@
#include "dawn_native/Instance.h"
-#include "common/Assert.h"
-#include "common/GPUInfo.h"
-#include "common/Log.h"
-#include "common/SystemUtils.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/GPUInfo.h"
+#include "dawn/common/Log.h"
+#include "dawn/common/SystemUtils.h"
#include "dawn_native/ChainUtils_autogen.h"
#include "dawn_native/ErrorData.h"
#include "dawn_native/Surface.h"
@@ -309,7 +309,7 @@
case wgpu::BackendType::Vulkan:
Register(vulkan::Connect(this), wgpu::BackendType::Vulkan);
break;
-#endif // defined(DAWN_ENABLE_BACKEND_VULKAN)
+#endif // defined(DAWN_ENABLE_BACKEND_VULKAN)
#if defined(DAWN_ENABLE_BACKEND_DESKTOP_GL)
case wgpu::BackendType::OpenGL:
diff --git a/src/dawn_native/Instance.h b/src/dawn_native/Instance.h
index f269d96..47bcd97 100644
--- a/src/dawn_native/Instance.h
+++ b/src/dawn_native/Instance.h
@@ -15,8 +15,8 @@
#ifndef DAWNNATIVE_INSTANCE_H_
#define DAWNNATIVE_INSTANCE_H_
-#include "common/RefCounted.h"
-#include "common/ityp_bitset.h"
+#include "dawn/common/RefCounted.h"
+#include "dawn/common/ityp_bitset.h"
#include "dawn_native/Adapter.h"
#include "dawn_native/BackendConnection.h"
#include "dawn_native/Features.h"
diff --git a/src/dawn_native/IntegerTypes.h b/src/dawn_native/IntegerTypes.h
index 15bdb41..9849d2f 100644
--- a/src/dawn_native/IntegerTypes.h
+++ b/src/dawn_native/IntegerTypes.h
@@ -15,8 +15,8 @@
#ifndef DAWNNATIVE_INTEGERTYPES_H_
#define DAWNNATIVE_INTEGERTYPES_H_
-#include "common/Constants.h"
-#include "common/TypedInteger.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/TypedInteger.h"
#include <cstdint>
diff --git a/src/dawn_native/Limits.cpp b/src/dawn_native/Limits.cpp
index 4bd1a60..3039d30 100644
--- a/src/dawn_native/Limits.cpp
+++ b/src/dawn_native/Limits.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/Limits.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include <array>
diff --git a/src/dawn_native/ObjectBase.h b/src/dawn_native/ObjectBase.h
index 04777c7..45bc4d0 100644
--- a/src/dawn_native/ObjectBase.h
+++ b/src/dawn_native/ObjectBase.h
@@ -15,8 +15,8 @@
#ifndef DAWNNATIVE_OBJECTBASE_H_
#define DAWNNATIVE_OBJECTBASE_H_
-#include "common/LinkedList.h"
-#include "common/RefCounted.h"
+#include "dawn/common/LinkedList.h"
+#include "dawn/common/RefCounted.h"
#include "dawn_native/Forward.h"
#include <string>
diff --git a/src/dawn_native/ObjectContentHasher.h b/src/dawn_native/ObjectContentHasher.h
index 9e6ac40..c1ca32a 100644
--- a/src/dawn_native/ObjectContentHasher.h
+++ b/src/dawn_native/ObjectContentHasher.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_OBJECT_CONTENT_HASHER_H_
#define DAWNNATIVE_OBJECT_CONTENT_HASHER_H_
-#include "common/HashUtils.h"
+#include "dawn/common/HashUtils.h"
#include <string>
#include <vector>
diff --git a/src/dawn_native/PerStage.h b/src/dawn_native/PerStage.h
index 35ea216..60e4237 100644
--- a/src/dawn_native/PerStage.h
+++ b/src/dawn_native/PerStage.h
@@ -15,9 +15,9 @@
#ifndef DAWNNATIVE_PERSTAGE_H_
#define DAWNNATIVE_PERSTAGE_H_
-#include "common/Assert.h"
-#include "common/BitSetIterator.h"
-#include "common/Constants.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/BitSetIterator.h"
+#include "dawn/common/Constants.h"
#include "dawn_native/Error.h"
#include "dawn_native/dawn_platform.h"
diff --git a/src/dawn_native/PersistentCache.cpp b/src/dawn_native/PersistentCache.cpp
index 7679275..0d3edf2b 100644
--- a/src/dawn_native/PersistentCache.cpp
+++ b/src/dawn_native/PersistentCache.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/PersistentCache.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/Device.h"
#include "dawn_platform/DawnPlatform.h"
diff --git a/src/dawn_native/PipelineLayout.cpp b/src/dawn_native/PipelineLayout.cpp
index 3883bb7..274fdfc 100644
--- a/src/dawn_native/PipelineLayout.cpp
+++ b/src/dawn_native/PipelineLayout.cpp
@@ -14,9 +14,9 @@
#include "dawn_native/PipelineLayout.h"
-#include "common/Assert.h"
-#include "common/BitSetIterator.h"
-#include "common/ityp_stack_vec.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/BitSetIterator.h"
+#include "dawn/common/ityp_stack_vec.h"
#include "dawn_native/BindGroupLayout.h"
#include "dawn_native/Device.h"
#include "dawn_native/ObjectContentHasher.h"
diff --git a/src/dawn_native/PipelineLayout.h b/src/dawn_native/PipelineLayout.h
index faf259d..258fea5 100644
--- a/src/dawn_native/PipelineLayout.h
+++ b/src/dawn_native/PipelineLayout.h
@@ -15,9 +15,9 @@
#ifndef DAWNNATIVE_PIPELINELAYOUT_H_
#define DAWNNATIVE_PIPELINELAYOUT_H_
-#include "common/Constants.h"
-#include "common/ityp_array.h"
-#include "common/ityp_bitset.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/ityp_array.h"
+#include "dawn/common/ityp_bitset.h"
#include "dawn_native/BindingInfo.h"
#include "dawn_native/CachedObject.h"
#include "dawn_native/Error.h"
diff --git a/src/dawn_native/PooledResourceMemoryAllocator.h b/src/dawn_native/PooledResourceMemoryAllocator.h
index c21c752..03b15ef 100644
--- a/src/dawn_native/PooledResourceMemoryAllocator.h
+++ b/src/dawn_native/PooledResourceMemoryAllocator.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_POOLEDRESOURCEMEMORYALLOCATOR_H_
#define DAWNNATIVE_POOLEDRESOURCEMEMORYALLOCATOR_H_
-#include "common/SerialQueue.h"
+#include "dawn/common/SerialQueue.h"
#include "dawn_native/ResourceHeapAllocator.h"
#include <deque>
diff --git a/src/dawn_native/ProgrammableEncoder.cpp b/src/dawn_native/ProgrammableEncoder.cpp
index 0bd588aa..486c34b 100644
--- a/src/dawn_native/ProgrammableEncoder.cpp
+++ b/src/dawn_native/ProgrammableEncoder.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/ProgrammableEncoder.h"
-#include "common/BitSetIterator.h"
-#include "common/ityp_array.h"
+#include "dawn/common/BitSetIterator.h"
+#include "dawn/common/ityp_array.h"
#include "dawn_native/BindGroup.h"
#include "dawn_native/Buffer.h"
#include "dawn_native/CommandBuffer.h"
diff --git a/src/dawn_native/Queue.cpp b/src/dawn_native/Queue.cpp
index a6d10b7..3929627 100644
--- a/src/dawn_native/Queue.cpp
+++ b/src/dawn_native/Queue.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/Queue.h"
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include "dawn_native/Buffer.h"
#include "dawn_native/CommandBuffer.h"
#include "dawn_native/CommandEncoder.h"
diff --git a/src/dawn_native/Queue.h b/src/dawn_native/Queue.h
index ee8ba17..f873884 100644
--- a/src/dawn_native/Queue.h
+++ b/src/dawn_native/Queue.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_QUEUE_H_
#define DAWNNATIVE_QUEUE_H_
-#include "common/SerialQueue.h"
+#include "dawn/common/SerialQueue.h"
#include "dawn_native/Error.h"
#include "dawn_native/Forward.h"
#include "dawn_native/IntegerTypes.h"
diff --git a/src/dawn_native/RenderBundle.cpp b/src/dawn_native/RenderBundle.cpp
index 7937106..46d209f 100644
--- a/src/dawn_native/RenderBundle.cpp
+++ b/src/dawn_native/RenderBundle.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/RenderBundle.h"
-#include "common/BitSetIterator.h"
+#include "dawn/common/BitSetIterator.h"
#include "dawn_native/Commands.h"
#include "dawn_native/Device.h"
#include "dawn_native/ObjectType_autogen.h"
diff --git a/src/dawn_native/RenderBundle.h b/src/dawn_native/RenderBundle.h
index a2db78a..7b2484d 100644
--- a/src/dawn_native/RenderBundle.h
+++ b/src/dawn_native/RenderBundle.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_RENDERBUNDLE_H_
#define DAWNNATIVE_RENDERBUNDLE_H_
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include "dawn_native/AttachmentState.h"
#include "dawn_native/CommandAllocator.h"
#include "dawn_native/Error.h"
diff --git a/src/dawn_native/RenderEncoderBase.cpp b/src/dawn_native/RenderEncoderBase.cpp
index e548200..18824de 100644
--- a/src/dawn_native/RenderEncoderBase.cpp
+++ b/src/dawn_native/RenderEncoderBase.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/RenderEncoderBase.h"
-#include "common/Constants.h"
-#include "common/Log.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Log.h"
#include "dawn_native/Buffer.h"
#include "dawn_native/CommandEncoder.h"
#include "dawn_native/CommandValidation.h"
diff --git a/src/dawn_native/RenderPassEncoder.cpp b/src/dawn_native/RenderPassEncoder.cpp
index a5b38a0..fea50ab 100644
--- a/src/dawn_native/RenderPassEncoder.cpp
+++ b/src/dawn_native/RenderPassEncoder.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/RenderPassEncoder.h"
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include "dawn_native/Buffer.h"
#include "dawn_native/CommandEncoder.h"
#include "dawn_native/CommandValidation.h"
diff --git a/src/dawn_native/RenderPipeline.cpp b/src/dawn_native/RenderPipeline.cpp
index 200795a..846989e 100644
--- a/src/dawn_native/RenderPipeline.cpp
+++ b/src/dawn_native/RenderPipeline.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/RenderPipeline.h"
-#include "common/BitSetIterator.h"
+#include "dawn/common/BitSetIterator.h"
#include "dawn_native/ChainUtils_autogen.h"
#include "dawn_native/Commands.h"
#include "dawn_native/Device.h"
@@ -237,7 +237,7 @@
MaybeError ValidatePrimitiveState(const DeviceBase* device,
const PrimitiveState* descriptor) {
DAWN_TRY(ValidateSingleSType(descriptor->nextInChain,
- wgpu::SType::PrimitiveDepthClampingState));
+ wgpu::SType::PrimitiveDepthClampingState));
const PrimitiveDepthClampingState* clampInfo = nullptr;
FindInChain(descriptor->nextInChain, &clampInfo);
if (clampInfo && !device->IsFeatureEnabled(Feature::DepthClamping)) {
diff --git a/src/dawn_native/RenderPipeline.h b/src/dawn_native/RenderPipeline.h
index 78a4996..b36dce6 100644
--- a/src/dawn_native/RenderPipeline.h
+++ b/src/dawn_native/RenderPipeline.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_RENDERPIPELINE_H_
#define DAWNNATIVE_RENDERPIPELINE_H_
-#include "common/TypedInteger.h"
+#include "dawn/common/TypedInteger.h"
#include "dawn_native/AttachmentState.h"
#include "dawn_native/Forward.h"
#include "dawn_native/IntegerTypes.h"
diff --git a/src/dawn_native/ResourceMemoryAllocation.cpp b/src/dawn_native/ResourceMemoryAllocation.cpp
index 4107b73..6b97b4d 100644
--- a/src/dawn_native/ResourceMemoryAllocation.cpp
+++ b/src/dawn_native/ResourceMemoryAllocation.cpp
@@ -13,7 +13,7 @@
// limitations under the License.
#include "dawn_native/ResourceMemoryAllocation.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
namespace dawn::native {
diff --git a/src/dawn_native/RingBufferAllocator.h b/src/dawn_native/RingBufferAllocator.h
index 90411ae..555fff2 100644
--- a/src/dawn_native/RingBufferAllocator.h
+++ b/src/dawn_native/RingBufferAllocator.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_RINGBUFFERALLOCATOR_H_
#define DAWNNATIVE_RINGBUFFERALLOCATOR_H_
-#include "common/SerialQueue.h"
+#include "dawn/common/SerialQueue.h"
#include "dawn_native/IntegerTypes.h"
#include <limits>
diff --git a/src/dawn_native/ScratchBuffer.h b/src/dawn_native/ScratchBuffer.h
index 16d3e90..7935320 100644
--- a/src/dawn_native/ScratchBuffer.h
+++ b/src/dawn_native/ScratchBuffer.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_SCRATCHBUFFER_H_
#define DAWNNATIVE_SCRATCHBUFFER_H_
-#include "common/RefCounted.h"
+#include "dawn/common/RefCounted.h"
#include "dawn_native/Buffer.h"
#include <cstdint>
diff --git a/src/dawn_native/ShaderModule.cpp b/src/dawn_native/ShaderModule.cpp
index 9d57787..481ba19 100644
--- a/src/dawn_native/ShaderModule.cpp
+++ b/src/dawn_native/ShaderModule.cpp
@@ -15,8 +15,8 @@
#include "dawn_native/ShaderModule.h"
#include "absl/strings/str_format.h"
-#include "common/Constants.h"
-#include "common/HashUtils.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/HashUtils.h"
#include "dawn_native/BindGroupLayout.h"
#include "dawn_native/ChainUtils_autogen.h"
#include "dawn_native/CompilationMessages.h"
diff --git a/src/dawn_native/ShaderModule.h b/src/dawn_native/ShaderModule.h
index b978c1d..c340363 100644
--- a/src/dawn_native/ShaderModule.h
+++ b/src/dawn_native/ShaderModule.h
@@ -15,8 +15,8 @@
#ifndef DAWNNATIVE_SHADERMODULE_H_
#define DAWNNATIVE_SHADERMODULE_H_
-#include "common/Constants.h"
-#include "common/ityp_array.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/ityp_array.h"
#include "dawn_native/BindingInfo.h"
#include "dawn_native/CachedObject.h"
#include "dawn_native/CompilationMessages.h"
diff --git a/src/dawn_native/Subresource.cpp b/src/dawn_native/Subresource.cpp
index 9e4887f..82622ba 100644
--- a/src/dawn_native/Subresource.cpp
+++ b/src/dawn_native/Subresource.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/Subresource.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/Format.h"
namespace dawn::native {
diff --git a/src/dawn_native/SubresourceStorage.h b/src/dawn_native/SubresourceStorage.h
index 2b960cc..10c0c3b 100644
--- a/src/dawn_native/SubresourceStorage.h
+++ b/src/dawn_native/SubresourceStorage.h
@@ -15,8 +15,8 @@
#ifndef DAWNNATIVE_SUBRESOURCESTORAGE_H_
#define DAWNNATIVE_SUBRESOURCESTORAGE_H_
-#include "common/Assert.h"
-#include "common/TypeTraits.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/TypeTraits.h"
#include "dawn_native/EnumMaskIterator.h"
#include "dawn_native/Subresource.h"
diff --git a/src/dawn_native/Surface.cpp b/src/dawn_native/Surface.cpp
index 57734cb..9e6f481 100644
--- a/src/dawn_native/Surface.cpp
+++ b/src/dawn_native/Surface.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/Surface.h"
-#include "common/Platform.h"
+#include "dawn/common/Platform.h"
#include "dawn_native/ChainUtils_autogen.h"
#include "dawn_native/Instance.h"
#include "dawn_native/SwapChain.h"
@@ -25,7 +25,7 @@
#endif // defined(DAWN_PLATFORM_WINDOWS)
#if defined(DAWN_USE_X11)
-# include "common/xlib_with_undefs.h"
+# include "dawn/common/xlib_with_undefs.h"
#endif // defined(DAWN_USE_X11)
namespace dawn::native {
diff --git a/src/dawn_native/Surface.h b/src/dawn_native/Surface.h
index 1a274b6..d613734 100644
--- a/src/dawn_native/Surface.h
+++ b/src/dawn_native/Surface.h
@@ -15,13 +15,13 @@
#ifndef DAWNNATIVE_SURFACE_H_
#define DAWNNATIVE_SURFACE_H_
-#include "common/RefCounted.h"
+#include "dawn/common/RefCounted.h"
#include "dawn_native/Error.h"
#include "dawn_native/Forward.h"
#include "dawn_native/dawn_platform.h"
-#include "common/Platform.h"
+#include "dawn/common/Platform.h"
#if defined(DAWN_PLATFORM_WINDOWS)
# include "dawn_native/d3d12/d3d12_platform.h"
diff --git a/src/dawn_native/SwapChain.cpp b/src/dawn_native/SwapChain.cpp
index 502e66b..5680599 100644
--- a/src/dawn_native/SwapChain.cpp
+++ b/src/dawn_native/SwapChain.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/SwapChain.h"
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include "dawn_native/Adapter.h"
#include "dawn_native/Device.h"
#include "dawn_native/ObjectType_autogen.h"
diff --git a/src/dawn_native/Texture.cpp b/src/dawn_native/Texture.cpp
index b187177..79d5591 100644
--- a/src/dawn_native/Texture.cpp
+++ b/src/dawn_native/Texture.cpp
@@ -16,9 +16,9 @@
#include <algorithm>
-#include "common/Assert.h"
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "dawn_native/Adapter.h"
#include "dawn_native/ChainUtils_autogen.h"
#include "dawn_native/Device.h"
diff --git a/src/dawn_native/Texture.h b/src/dawn_native/Texture.h
index 053e6f5..ef04ffb 100644
--- a/src/dawn_native/Texture.h
+++ b/src/dawn_native/Texture.h
@@ -15,8 +15,8 @@
#ifndef DAWNNATIVE_TEXTURE_H_
#define DAWNNATIVE_TEXTURE_H_
-#include "common/ityp_array.h"
-#include "common/ityp_bitset.h"
+#include "dawn/common/ityp_array.h"
+#include "dawn/common/ityp_bitset.h"
#include "dawn_native/Error.h"
#include "dawn_native/Forward.h"
#include "dawn_native/ObjectBase.h"
diff --git a/src/dawn_native/TintUtils.h b/src/dawn_native/TintUtils.h
index ee094e3..2dcb8f3 100644
--- a/src/dawn_native/TintUtils.h
+++ b/src/dawn_native/TintUtils.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_TINTUTILS_H_
#define DAWNNATIVE_TINTUTILS_H_
-#include "common/NonCopyable.h"
+#include "dawn/common/NonCopyable.h"
namespace dawn::native {
@@ -34,4 +34,4 @@
} // namespace dawn::native
-#endif // DAWNNATIVE_TEXTURE_H_
\ No newline at end of file
+#endif // DAWNNATIVE_TEXTURE_H_
diff --git a/src/dawn_native/Toggles.cpp b/src/dawn_native/Toggles.cpp
index 757d4ff..fd9782a 100644
--- a/src/dawn_native/Toggles.cpp
+++ b/src/dawn_native/Toggles.cpp
@@ -14,8 +14,8 @@
#include <array>
-#include "common/Assert.h"
-#include "common/BitSetIterator.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/BitSetIterator.h"
#include "dawn_native/Toggles.h"
namespace dawn::native {
diff --git a/src/dawn_native/VertexFormat.cpp b/src/dawn_native/VertexFormat.cpp
index 4cc2c9d..a9d552f 100644
--- a/src/dawn_native/VertexFormat.cpp
+++ b/src/dawn_native/VertexFormat.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/VertexFormat.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include <array>
diff --git a/src/dawn_native/XlibXcbFunctions.h b/src/dawn_native/XlibXcbFunctions.h
index 05fd583..9bb42a5 100644
--- a/src/dawn_native/XlibXcbFunctions.h
+++ b/src/dawn_native/XlibXcbFunctions.h
@@ -15,10 +15,10 @@
#ifndef DAWNNATIVE_XLIBXCBFUNCTIONS_H_
#define DAWNNATIVE_XLIBXCBFUNCTIONS_H_
-#include "common/DynamicLib.h"
+#include "dawn/common/DynamicLib.h"
#include "dawn_native/Error.h"
-#include "common/xlib_with_undefs.h"
+#include "dawn/common/xlib_with_undefs.h"
class DynamicLib;
diff --git a/src/dawn_native/d3d12/AdapterD3D12.cpp b/src/dawn_native/d3d12/AdapterD3D12.cpp
index 9a695fa..1626a9b 100644
--- a/src/dawn_native/d3d12/AdapterD3D12.cpp
+++ b/src/dawn_native/d3d12/AdapterD3D12.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/d3d12/AdapterD3D12.h"
-#include "common/Constants.h"
-#include "common/WindowsUtils.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/WindowsUtils.h"
#include "dawn_native/Instance.h"
#include "dawn_native/d3d12/BackendD3D12.h"
#include "dawn_native/d3d12/D3D12Error.h"
diff --git a/src/dawn_native/d3d12/AdapterD3D12.h b/src/dawn_native/d3d12/AdapterD3D12.h
index c4d3df1..64bf5a3 100644
--- a/src/dawn_native/d3d12/AdapterD3D12.h
+++ b/src/dawn_native/d3d12/AdapterD3D12.h
@@ -17,7 +17,7 @@
#include "dawn_native/Adapter.h"
-#include "common/GPUInfo.h"
+#include "dawn/common/GPUInfo.h"
#include "dawn_native/d3d12/D3D12Info.h"
#include "dawn_native/d3d12/d3d12_platform.h"
diff --git a/src/dawn_native/d3d12/BindGroupD3D12.cpp b/src/dawn_native/d3d12/BindGroupD3D12.cpp
index 9e7522c..2ebbc70 100644
--- a/src/dawn_native/d3d12/BindGroupD3D12.cpp
+++ b/src/dawn_native/d3d12/BindGroupD3D12.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/d3d12/BindGroupD3D12.h"
-#include "common/BitSetIterator.h"
+#include "dawn/common/BitSetIterator.h"
#include "dawn_native/ExternalTexture.h"
#include "dawn_native/d3d12/BindGroupLayoutD3D12.h"
#include "dawn_native/d3d12/BufferD3D12.h"
diff --git a/src/dawn_native/d3d12/BindGroupD3D12.h b/src/dawn_native/d3d12/BindGroupD3D12.h
index 0d32755..c57cca0 100644
--- a/src/dawn_native/d3d12/BindGroupD3D12.h
+++ b/src/dawn_native/d3d12/BindGroupD3D12.h
@@ -15,9 +15,9 @@
#ifndef DAWNNATIVE_D3D12_BINDGROUPD3D12_H_
#define DAWNNATIVE_D3D12_BINDGROUPD3D12_H_
-#include "common/PlacementAllocated.h"
-#include "common/ityp_span.h"
-#include "common/ityp_stack_vec.h"
+#include "dawn/common/PlacementAllocated.h"
+#include "dawn/common/ityp_span.h"
+#include "dawn/common/ityp_stack_vec.h"
#include "dawn_native/BindGroup.h"
#include "dawn_native/d3d12/CPUDescriptorHeapAllocationD3D12.h"
#include "dawn_native/d3d12/GPUDescriptorHeapAllocationD3D12.h"
diff --git a/src/dawn_native/d3d12/BindGroupLayoutD3D12.cpp b/src/dawn_native/d3d12/BindGroupLayoutD3D12.cpp
index 834bc04..f275674 100644
--- a/src/dawn_native/d3d12/BindGroupLayoutD3D12.cpp
+++ b/src/dawn_native/d3d12/BindGroupLayoutD3D12.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/d3d12/BindGroupLayoutD3D12.h"
-#include "common/BitSetIterator.h"
+#include "dawn/common/BitSetIterator.h"
#include "dawn_native/d3d12/BindGroupD3D12.h"
#include "dawn_native/d3d12/DeviceD3D12.h"
#include "dawn_native/d3d12/SamplerHeapCacheD3D12.h"
diff --git a/src/dawn_native/d3d12/BindGroupLayoutD3D12.h b/src/dawn_native/d3d12/BindGroupLayoutD3D12.h
index 7d00763..5c4d927 100644
--- a/src/dawn_native/d3d12/BindGroupLayoutD3D12.h
+++ b/src/dawn_native/d3d12/BindGroupLayoutD3D12.h
@@ -17,8 +17,8 @@
#include "dawn_native/BindGroupLayout.h"
-#include "common/SlabAllocator.h"
-#include "common/ityp_stack_vec.h"
+#include "dawn/common/SlabAllocator.h"
+#include "dawn/common/ityp_stack_vec.h"
#include "dawn_native/d3d12/d3d12_platform.h"
namespace dawn::native::d3d12 {
diff --git a/src/dawn_native/d3d12/BufferD3D12.cpp b/src/dawn_native/d3d12/BufferD3D12.cpp
index c3a691e..1a9fd02 100644
--- a/src/dawn_native/d3d12/BufferD3D12.cpp
+++ b/src/dawn_native/d3d12/BufferD3D12.cpp
@@ -14,9 +14,9 @@
#include "dawn_native/d3d12/BufferD3D12.h"
-#include "common/Assert.h"
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "dawn_native/CommandBuffer.h"
#include "dawn_native/DynamicUploader.h"
#include "dawn_native/d3d12/CommandRecordingContext.h"
diff --git a/src/dawn_native/d3d12/CommandAllocatorManager.cpp b/src/dawn_native/d3d12/CommandAllocatorManager.cpp
index 6dc73df..1b5948a 100644
--- a/src/dawn_native/d3d12/CommandAllocatorManager.cpp
+++ b/src/dawn_native/d3d12/CommandAllocatorManager.cpp
@@ -17,8 +17,8 @@
#include "dawn_native/d3d12/D3D12Error.h"
#include "dawn_native/d3d12/DeviceD3D12.h"
-#include "common/Assert.h"
-#include "common/BitSetIterator.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/BitSetIterator.h"
namespace dawn::native::d3d12 {
diff --git a/src/dawn_native/d3d12/CommandAllocatorManager.h b/src/dawn_native/d3d12/CommandAllocatorManager.h
index 8a79bcc..869560c 100644
--- a/src/dawn_native/d3d12/CommandAllocatorManager.h
+++ b/src/dawn_native/d3d12/CommandAllocatorManager.h
@@ -17,7 +17,7 @@
#include "dawn_native/d3d12/d3d12_platform.h"
-#include "common/SerialQueue.h"
+#include "dawn/common/SerialQueue.h"
#include "dawn_native/Error.h"
#include "dawn_native/IntegerTypes.h"
diff --git a/src/dawn_native/d3d12/D3D11on12Util.cpp b/src/dawn_native/d3d12/D3D11on12Util.cpp
index 245de6c..f91ad84 100644
--- a/src/dawn_native/d3d12/D3D11on12Util.cpp
+++ b/src/dawn_native/d3d12/D3D11on12Util.cpp
@@ -17,8 +17,8 @@
#include "dawn_native/d3d12/D3D11on12Util.h"
-#include "common/HashUtils.h"
-#include "common/Log.h"
+#include "dawn/common/HashUtils.h"
+#include "dawn/common/Log.h"
#include "dawn_native/d3d12/D3D12Error.h"
#include "dawn_native/d3d12/DeviceD3D12.h"
diff --git a/src/dawn_native/d3d12/D3D11on12Util.h b/src/dawn_native/d3d12/D3D11on12Util.h
index 6970cdd..2580949 100644
--- a/src/dawn_native/d3d12/D3D11on12Util.h
+++ b/src/dawn_native/d3d12/D3D11on12Util.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_D3D11ON12UTIL_H_
#define DAWNNATIVE_D3D11ON12UTIL_H_
-#include "common/RefCounted.h"
+#include "dawn/common/RefCounted.h"
#include "dawn_native/Error.h"
#include "dawn_native/d3d12/d3d12_platform.h"
diff --git a/src/dawn_native/d3d12/D3D12Backend.cpp b/src/dawn_native/d3d12/D3D12Backend.cpp
index 4510453..ee588b8 100644
--- a/src/dawn_native/d3d12/D3D12Backend.cpp
+++ b/src/dawn_native/d3d12/D3D12Backend.cpp
@@ -17,9 +17,9 @@
#include "dawn_native/D3D12Backend.h"
-#include "common/Log.h"
-#include "common/Math.h"
-#include "common/SwapChainUtils.h"
+#include "dawn/common/Log.h"
+#include "dawn/common/Math.h"
+#include "dawn/common/SwapChainUtils.h"
#include "dawn_native/d3d12/D3D11on12Util.h"
#include "dawn_native/d3d12/DeviceD3D12.h"
#include "dawn_native/d3d12/NativeSwapChainImplD3D12.h"
diff --git a/src/dawn_native/d3d12/D3D12Info.cpp b/src/dawn_native/d3d12/D3D12Info.cpp
index 154803f..e900cc9 100644
--- a/src/dawn_native/d3d12/D3D12Info.cpp
+++ b/src/dawn_native/d3d12/D3D12Info.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/d3d12/D3D12Info.h"
-#include "common/GPUInfo.h"
+#include "dawn/common/GPUInfo.h"
#include "dawn_native/d3d12/AdapterD3D12.h"
#include "dawn_native/d3d12/BackendD3D12.h"
#include "dawn_native/d3d12/D3D12Error.h"
diff --git a/src/dawn_native/d3d12/DeviceD3D12.cpp b/src/dawn_native/d3d12/DeviceD3D12.cpp
index f8b856c..7901d4e 100644
--- a/src/dawn_native/d3d12/DeviceD3D12.cpp
+++ b/src/dawn_native/d3d12/DeviceD3D12.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/d3d12/DeviceD3D12.h"
-#include "common/GPUInfo.h"
+#include "dawn/common/GPUInfo.h"
#include "dawn_native/DynamicUploader.h"
#include "dawn_native/Instance.h"
#include "dawn_native/d3d12/AdapterD3D12.h"
diff --git a/src/dawn_native/d3d12/DeviceD3D12.h b/src/dawn_native/d3d12/DeviceD3D12.h
index 609de05..fd7cbb8 100644
--- a/src/dawn_native/d3d12/DeviceD3D12.h
+++ b/src/dawn_native/d3d12/DeviceD3D12.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_D3D12_DEVICED3D12_H_
#define DAWNNATIVE_D3D12_DEVICED3D12_H_
-#include "common/SerialQueue.h"
+#include "dawn/common/SerialQueue.h"
#include "dawn_native/Device.h"
#include "dawn_native/d3d12/CommandRecordingContext.h"
#include "dawn_native/d3d12/D3D12Info.h"
diff --git a/src/dawn_native/d3d12/IntegerTypes.h b/src/dawn_native/d3d12/IntegerTypes.h
index 54dcda8..1e3dbfb 100644
--- a/src/dawn_native/d3d12/IntegerTypes.h
+++ b/src/dawn_native/d3d12/IntegerTypes.h
@@ -15,8 +15,8 @@
#ifndef DAWNNATIVE_D3D12_INTEGERTYPES_H_
#define DAWNNATIVE_D3D12_INTEGERTYPES_H_
-#include "common/Constants.h"
-#include "common/TypedInteger.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/TypedInteger.h"
#include <cstdint>
diff --git a/src/dawn_native/d3d12/NativeSwapChainImplD3D12.cpp b/src/dawn_native/d3d12/NativeSwapChainImplD3D12.cpp
index 7884e13..810e045 100644
--- a/src/dawn_native/d3d12/NativeSwapChainImplD3D12.cpp
+++ b/src/dawn_native/d3d12/NativeSwapChainImplD3D12.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/d3d12/NativeSwapChainImplD3D12.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/d3d12/DeviceD3D12.h"
#include "dawn_native/d3d12/TextureD3D12.h"
diff --git a/src/dawn_native/d3d12/PageableD3D12.h b/src/dawn_native/d3d12/PageableD3D12.h
index c706c5c..024bd51 100644
--- a/src/dawn_native/d3d12/PageableD3D12.h
+++ b/src/dawn_native/d3d12/PageableD3D12.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_D3D12_PAGEABLED3D12_H_
#define DAWNNATIVE_D3D12_PAGEABLED3D12_H_
-#include "common/LinkedList.h"
+#include "dawn/common/LinkedList.h"
#include "dawn_native/D3D12Backend.h"
#include "dawn_native/IntegerTypes.h"
#include "dawn_native/d3d12/d3d12_platform.h"
diff --git a/src/dawn_native/d3d12/PipelineLayoutD3D12.cpp b/src/dawn_native/d3d12/PipelineLayoutD3D12.cpp
index b934ca9..10d33ee 100644
--- a/src/dawn_native/d3d12/PipelineLayoutD3D12.cpp
+++ b/src/dawn_native/d3d12/PipelineLayoutD3D12.cpp
@@ -15,8 +15,8 @@
#include "dawn_native/d3d12/PipelineLayoutD3D12.h"
#include <sstream>
-#include "common/Assert.h"
-#include "common/BitSetIterator.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/BitSetIterator.h"
#include "dawn_native/d3d12/BindGroupLayoutD3D12.h"
#include "dawn_native/d3d12/D3D12Error.h"
#include "dawn_native/d3d12/DeviceD3D12.h"
diff --git a/src/dawn_native/d3d12/PipelineLayoutD3D12.h b/src/dawn_native/d3d12/PipelineLayoutD3D12.h
index 444266e..b357fdc 100644
--- a/src/dawn_native/d3d12/PipelineLayoutD3D12.h
+++ b/src/dawn_native/d3d12/PipelineLayoutD3D12.h
@@ -15,8 +15,8 @@
#ifndef DAWNNATIVE_D3D12_PIPELINELAYOUTD3D12_H_
#define DAWNNATIVE_D3D12_PIPELINELAYOUTD3D12_H_
-#include "common/Constants.h"
-#include "common/ityp_array.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/ityp_array.h"
#include "dawn_native/BindingInfo.h"
#include "dawn_native/PipelineLayout.h"
#include "dawn_native/d3d12/d3d12_platform.h"
diff --git a/src/dawn_native/d3d12/PlatformFunctions.cpp b/src/dawn_native/d3d12/PlatformFunctions.cpp
index c3b3d17..614c1c3 100644
--- a/src/dawn_native/d3d12/PlatformFunctions.cpp
+++ b/src/dawn_native/d3d12/PlatformFunctions.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/d3d12/PlatformFunctions.h"
-#include "common/DynamicLib.h"
+#include "dawn/common/DynamicLib.h"
#include <comdef.h>
#include <array>
diff --git a/src/dawn_native/d3d12/PlatformFunctions.h b/src/dawn_native/d3d12/PlatformFunctions.h
index 56473c7..128e108 100644
--- a/src/dawn_native/d3d12/PlatformFunctions.h
+++ b/src/dawn_native/d3d12/PlatformFunctions.h
@@ -17,7 +17,7 @@
#include "dawn_native/d3d12/d3d12_platform.h"
-#include "common/DynamicLib.h"
+#include "dawn/common/DynamicLib.h"
#include "dawn_native/Error.h"
#include <d3dcompiler.h>
diff --git a/src/dawn_native/d3d12/QueueD3D12.cpp b/src/dawn_native/d3d12/QueueD3D12.cpp
index 9693feb..66dd017 100644
--- a/src/dawn_native/d3d12/QueueD3D12.cpp
+++ b/src/dawn_native/d3d12/QueueD3D12.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/d3d12/QueueD3D12.h"
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "dawn_native/CommandValidation.h"
#include "dawn_native/Commands.h"
#include "dawn_native/DynamicUploader.h"
diff --git a/src/dawn_native/d3d12/RenderPassBuilderD3D12.h b/src/dawn_native/d3d12/RenderPassBuilderD3D12.h
index 47c1746..cf9514f 100644
--- a/src/dawn_native/d3d12/RenderPassBuilderD3D12.h
+++ b/src/dawn_native/d3d12/RenderPassBuilderD3D12.h
@@ -15,9 +15,9 @@
#ifndef DAWNNATIVE_D3D12_RENDERPASSBUILDERD3D12_H_
#define DAWNNATIVE_D3D12_RENDERPASSBUILDERD3D12_H_
-#include "common/Constants.h"
-#include "common/ityp_array.h"
-#include "common/ityp_span.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/ityp_array.h"
+#include "dawn/common/ityp_span.h"
#include "dawn_native/IntegerTypes.h"
#include "dawn_native/d3d12/d3d12_platform.h"
#include "dawn_native/dawn_platform.h"
diff --git a/src/dawn_native/d3d12/RenderPipelineD3D12.cpp b/src/dawn_native/d3d12/RenderPipelineD3D12.cpp
index c2fc7ef..3203f78 100644
--- a/src/dawn_native/d3d12/RenderPipelineD3D12.cpp
+++ b/src/dawn_native/d3d12/RenderPipelineD3D12.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/d3d12/RenderPipelineD3D12.h"
-#include "common/Assert.h"
-#include "common/Log.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Log.h"
#include "dawn_native/CreatePipelineAsyncTask.h"
#include "dawn_native/d3d12/D3D12Error.h"
#include "dawn_native/d3d12/DeviceD3D12.h"
diff --git a/src/dawn_native/d3d12/ResidencyManagerD3D12.h b/src/dawn_native/d3d12/ResidencyManagerD3D12.h
index c9530b3..b281af1 100644
--- a/src/dawn_native/d3d12/ResidencyManagerD3D12.h
+++ b/src/dawn_native/d3d12/ResidencyManagerD3D12.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_D3D12_RESIDENCYMANAGERD3D12_H_
#define DAWNNATIVE_D3D12_RESIDENCYMANAGERD3D12_H_
-#include "common/LinkedList.h"
+#include "dawn/common/LinkedList.h"
#include "dawn_native/D3D12Backend.h"
#include "dawn_native/Error.h"
#include "dawn_native/dawn_platform.h"
diff --git a/src/dawn_native/d3d12/ResourceAllocatorManagerD3D12.h b/src/dawn_native/d3d12/ResourceAllocatorManagerD3D12.h
index 8129e3d..f4b71e8 100644
--- a/src/dawn_native/d3d12/ResourceAllocatorManagerD3D12.h
+++ b/src/dawn_native/d3d12/ResourceAllocatorManagerD3D12.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_D3D12_RESOURCEALLOCATORMANAGERD3D12_H_
#define DAWNNATIVE_D3D12_RESOURCEALLOCATORMANAGERD3D12_H_
-#include "common/SerialQueue.h"
+#include "dawn/common/SerialQueue.h"
#include "dawn_native/BuddyMemoryAllocator.h"
#include "dawn_native/IntegerTypes.h"
#include "dawn_native/PooledResourceMemoryAllocator.h"
diff --git a/src/dawn_native/d3d12/SamplerHeapCacheD3D12.cpp b/src/dawn_native/d3d12/SamplerHeapCacheD3D12.cpp
index 4131e97..763fd0a 100644
--- a/src/dawn_native/d3d12/SamplerHeapCacheD3D12.cpp
+++ b/src/dawn_native/d3d12/SamplerHeapCacheD3D12.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/d3d12/SamplerHeapCacheD3D12.h"
-#include "common/Assert.h"
-#include "common/HashUtils.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/HashUtils.h"
#include "dawn_native/d3d12/BindGroupD3D12.h"
#include "dawn_native/d3d12/BindGroupLayoutD3D12.h"
#include "dawn_native/d3d12/DeviceD3D12.h"
diff --git a/src/dawn_native/d3d12/SamplerHeapCacheD3D12.h b/src/dawn_native/d3d12/SamplerHeapCacheD3D12.h
index e8c86ef..95a1e4c 100644
--- a/src/dawn_native/d3d12/SamplerHeapCacheD3D12.h
+++ b/src/dawn_native/d3d12/SamplerHeapCacheD3D12.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_D3D12_SAMPLERHEAPCACHE_H_
#define DAWNNATIVE_D3D12_SAMPLERHEAPCACHE_H_
-#include "common/RefCounted.h"
+#include "dawn/common/RefCounted.h"
#include "dawn_native/BindingInfo.h"
#include "dawn_native/d3d12/CPUDescriptorHeapAllocationD3D12.h"
#include "dawn_native/d3d12/GPUDescriptorHeapAllocationD3D12.h"
diff --git a/src/dawn_native/d3d12/ShaderModuleD3D12.cpp b/src/dawn_native/d3d12/ShaderModuleD3D12.cpp
index b65cc2c..81387a3 100644
--- a/src/dawn_native/d3d12/ShaderModuleD3D12.cpp
+++ b/src/dawn_native/d3d12/ShaderModuleD3D12.cpp
@@ -14,10 +14,10 @@
#include "dawn_native/d3d12/ShaderModuleD3D12.h"
-#include "common/Assert.h"
-#include "common/BitSetIterator.h"
-#include "common/Log.h"
-#include "common/WindowsUtils.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/BitSetIterator.h"
+#include "dawn/common/Log.h"
+#include "dawn/common/WindowsUtils.h"
#include "dawn_native/Pipeline.h"
#include "dawn_native/TintUtils.h"
#include "dawn_native/d3d12/BindGroupLayoutD3D12.h"
diff --git a/src/dawn_native/d3d12/StagingDescriptorAllocatorD3D12.cpp b/src/dawn_native/d3d12/StagingDescriptorAllocatorD3D12.cpp
index 83b9eee..064eb3b 100644
--- a/src/dawn_native/d3d12/StagingDescriptorAllocatorD3D12.cpp
+++ b/src/dawn_native/d3d12/StagingDescriptorAllocatorD3D12.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "dawn_native/d3d12/D3D12Error.h"
#include "dawn_native/d3d12/DeviceD3D12.h"
diff --git a/src/dawn_native/d3d12/TextureCopySplitter.cpp b/src/dawn_native/d3d12/TextureCopySplitter.cpp
index cc1688e..b622e52 100644
--- a/src/dawn_native/d3d12/TextureCopySplitter.cpp
+++ b/src/dawn_native/d3d12/TextureCopySplitter.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/d3d12/TextureCopySplitter.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/Format.h"
#include "dawn_native/d3d12/d3d12_platform.h"
diff --git a/src/dawn_native/d3d12/TextureD3D12.cpp b/src/dawn_native/d3d12/TextureD3D12.cpp
index 9db78be..4d9a6c5 100644
--- a/src/dawn_native/d3d12/TextureD3D12.cpp
+++ b/src/dawn_native/d3d12/TextureD3D12.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/d3d12/TextureD3D12.h"
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "dawn_native/DynamicUploader.h"
#include "dawn_native/EnumMaskIterator.h"
#include "dawn_native/Error.h"
diff --git a/src/dawn_native/d3d12/UtilsD3D12.cpp b/src/dawn_native/d3d12/UtilsD3D12.cpp
index 4c293ca..906c989 100644
--- a/src/dawn_native/d3d12/UtilsD3D12.cpp
+++ b/src/dawn_native/d3d12/UtilsD3D12.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/d3d12/UtilsD3D12.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/Format.h"
#include "dawn_native/d3d12/BufferD3D12.h"
#include "dawn_native/d3d12/CommandRecordingContext.h"
diff --git a/src/dawn_native/d3d12/d3d12_platform.h b/src/dawn_native/d3d12/d3d12_platform.h
index 1c733c8..f020fec 100644
--- a/src/dawn_native/d3d12/d3d12_platform.h
+++ b/src/dawn_native/d3d12/d3d12_platform.h
@@ -18,7 +18,7 @@
// Pre-emptively include windows.h but remove its macros so that they aren't set when declaring the
// COM interfaces. Otherwise ID3D12InfoQueue::GetMessage would be either GetMessageA or GetMessageW
// which causes compilation errors.
-#include "common/windows_with_undefs.h"
+#include "dawn/common/windows_with_undefs.h"
#include <d3d11_2.h>
#include <d3d11on12.h>
diff --git a/src/dawn_native/metal/BackendMTL.mm b/src/dawn_native/metal/BackendMTL.mm
index 5959e6b..f658653 100644
--- a/src/dawn_native/metal/BackendMTL.mm
+++ b/src/dawn_native/metal/BackendMTL.mm
@@ -14,11 +14,11 @@
#include "dawn_native/metal/BackendMTL.h"
-#include "common/CoreFoundationRef.h"
-#include "common/GPUInfo.h"
-#include "common/NSRef.h"
-#include "common/Platform.h"
-#include "common/SystemUtils.h"
+#include "dawn/common/CoreFoundationRef.h"
+#include "dawn/common/GPUInfo.h"
+#include "dawn/common/NSRef.h"
+#include "dawn/common/Platform.h"
+#include "dawn/common/SystemUtils.h"
#include "dawn_native/Instance.h"
#include "dawn_native/MetalBackend.h"
#include "dawn_native/metal/BufferMTL.h"
@@ -26,7 +26,7 @@
#if defined(DAWN_PLATFORM_MACOS)
# import <IOKit/IOKitLib.h>
-# include "common/IOKitRef.h"
+# include "dawn/common/IOKitRef.h"
#endif
#include <vector>
diff --git a/src/dawn_native/metal/BindGroupLayoutMTL.h b/src/dawn_native/metal/BindGroupLayoutMTL.h
index dc2566e..e7f0d62 100644
--- a/src/dawn_native/metal/BindGroupLayoutMTL.h
+++ b/src/dawn_native/metal/BindGroupLayoutMTL.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_METAL_BINDGROUPLAYOUTMTL_H_
#define DAWNNATIVE_METAL_BINDGROUPLAYOUTMTL_H_
-#include "common/SlabAllocator.h"
+#include "dawn/common/SlabAllocator.h"
#include "dawn_native/BindGroupLayout.h"
namespace dawn::native::metal {
diff --git a/src/dawn_native/metal/BindGroupMTL.h b/src/dawn_native/metal/BindGroupMTL.h
index c94a409..55f79a9 100644
--- a/src/dawn_native/metal/BindGroupMTL.h
+++ b/src/dawn_native/metal/BindGroupMTL.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_METAL_BINDGROUPMTL_H_
#define DAWNNATIVE_METAL_BINDGROUPMTL_H_
-#include "common/PlacementAllocated.h"
+#include "dawn/common/PlacementAllocated.h"
#include "dawn_native/BindGroup.h"
namespace dawn::native::metal {
diff --git a/src/dawn_native/metal/BufferMTL.h b/src/dawn_native/metal/BufferMTL.h
index 9397d69..6fe4329 100644
--- a/src/dawn_native/metal/BufferMTL.h
+++ b/src/dawn_native/metal/BufferMTL.h
@@ -15,8 +15,8 @@
#ifndef DAWNNATIVE_METAL_BUFFERMTL_H_
#define DAWNNATIVE_METAL_BUFFERMTL_H_
-#include "common/NSRef.h"
-#include "common/SerialQueue.h"
+#include "dawn/common/NSRef.h"
+#include "dawn/common/SerialQueue.h"
#include "dawn_native/Buffer.h"
#import <Metal/Metal.h>
diff --git a/src/dawn_native/metal/BufferMTL.mm b/src/dawn_native/metal/BufferMTL.mm
index d40f883..b9d4153 100644
--- a/src/dawn_native/metal/BufferMTL.mm
+++ b/src/dawn_native/metal/BufferMTL.mm
@@ -14,7 +14,7 @@
#include "dawn_native/metal/BufferMTL.h"
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "dawn_native/CommandBuffer.h"
#include "dawn_native/metal/CommandRecordingContext.h"
#include "dawn_native/metal/DeviceMTL.h"
diff --git a/src/dawn_native/metal/CommandRecordingContext.h b/src/dawn_native/metal/CommandRecordingContext.h
index 662cdcd..0987da3 100644
--- a/src/dawn_native/metal/CommandRecordingContext.h
+++ b/src/dawn_native/metal/CommandRecordingContext.h
@@ -14,8 +14,8 @@
#ifndef DAWNNATIVE_METAL_COMMANDRECORDINGCONTEXT_H_
#define DAWNNATIVE_METAL_COMMANDRECORDINGCONTEXT_H_
-#include "common/NSRef.h"
-#include "common/NonCopyable.h"
+#include "dawn/common/NSRef.h"
+#include "dawn/common/NonCopyable.h"
#include "dawn_native/Error.h"
#import <Metal/Metal.h>
diff --git a/src/dawn_native/metal/CommandRecordingContext.mm b/src/dawn_native/metal/CommandRecordingContext.mm
index 4b3e158..4a37a14e 100644
--- a/src/dawn_native/metal/CommandRecordingContext.mm
+++ b/src/dawn_native/metal/CommandRecordingContext.mm
@@ -14,7 +14,7 @@
#include "dawn_native/metal/CommandRecordingContext.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
namespace dawn::native::metal {
diff --git a/src/dawn_native/metal/ComputePipelineMTL.h b/src/dawn_native/metal/ComputePipelineMTL.h
index b3f70d9..c1facd7 100644
--- a/src/dawn_native/metal/ComputePipelineMTL.h
+++ b/src/dawn_native/metal/ComputePipelineMTL.h
@@ -17,7 +17,7 @@
#include "dawn_native/ComputePipeline.h"
-#include "common/NSRef.h"
+#include "dawn/common/NSRef.h"
#import <Metal/Metal.h>
diff --git a/src/dawn_native/metal/ComputePipelineMTL.mm b/src/dawn_native/metal/ComputePipelineMTL.mm
index 9d0f563..9edbedf 100644
--- a/src/dawn_native/metal/ComputePipelineMTL.mm
+++ b/src/dawn_native/metal/ComputePipelineMTL.mm
@@ -14,7 +14,7 @@
#include "dawn_native/metal/ComputePipelineMTL.h"
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "dawn_native/CreatePipelineAsyncTask.h"
#include "dawn_native/metal/DeviceMTL.h"
#include "dawn_native/metal/ShaderModuleMTL.h"
diff --git a/src/dawn_native/metal/DeviceMTL.mm b/src/dawn_native/metal/DeviceMTL.mm
index c62417f..df35837 100644
--- a/src/dawn_native/metal/DeviceMTL.mm
+++ b/src/dawn_native/metal/DeviceMTL.mm
@@ -14,8 +14,8 @@
#include "dawn_native/metal/DeviceMTL.h"
-#include "common/GPUInfo.h"
-#include "common/Platform.h"
+#include "dawn/common/GPUInfo.h"
+#include "dawn/common/Platform.h"
#include "dawn_native/BackendConnection.h"
#include "dawn_native/BindGroupLayout.h"
#include "dawn_native/Commands.h"
diff --git a/src/dawn_native/metal/PipelineLayoutMTL.h b/src/dawn_native/metal/PipelineLayoutMTL.h
index 715da14..71a394d 100644
--- a/src/dawn_native/metal/PipelineLayoutMTL.h
+++ b/src/dawn_native/metal/PipelineLayoutMTL.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_METAL_PIPELINELAYOUTMTL_H_
#define DAWNNATIVE_METAL_PIPELINELAYOUTMTL_H_
-#include "common/ityp_stack_vec.h"
+#include "dawn/common/ityp_stack_vec.h"
#include "dawn_native/BindingInfo.h"
#include "dawn_native/PipelineLayout.h"
diff --git a/src/dawn_native/metal/PipelineLayoutMTL.mm b/src/dawn_native/metal/PipelineLayoutMTL.mm
index 956ba58..99a8427 100644
--- a/src/dawn_native/metal/PipelineLayoutMTL.mm
+++ b/src/dawn_native/metal/PipelineLayoutMTL.mm
@@ -14,7 +14,7 @@
#include "dawn_native/metal/PipelineLayoutMTL.h"
-#include "common/BitSetIterator.h"
+#include "dawn/common/BitSetIterator.h"
#include "dawn_native/BindGroupLayout.h"
#include "dawn_native/metal/DeviceMTL.h"
diff --git a/src/dawn_native/metal/QuerySetMTL.h b/src/dawn_native/metal/QuerySetMTL.h
index 27ac10c..b2d9fef 100644
--- a/src/dawn_native/metal/QuerySetMTL.h
+++ b/src/dawn_native/metal/QuerySetMTL.h
@@ -17,7 +17,7 @@
#include "dawn_native/QuerySet.h"
-#include "common/NSRef.h"
+#include "dawn/common/NSRef.h"
#import <Metal/Metal.h>
diff --git a/src/dawn_native/metal/QuerySetMTL.mm b/src/dawn_native/metal/QuerySetMTL.mm
index ac732c8..018f4e6 100644
--- a/src/dawn_native/metal/QuerySetMTL.mm
+++ b/src/dawn_native/metal/QuerySetMTL.mm
@@ -14,8 +14,8 @@
#include "dawn_native/metal/QuerySetMTL.h"
-#include "common/Math.h"
-#include "common/Platform.h"
+#include "dawn/common/Math.h"
+#include "dawn/common/Platform.h"
#include "dawn_native/metal/DeviceMTL.h"
namespace dawn::native::metal {
diff --git a/src/dawn_native/metal/QueueMTL.mm b/src/dawn_native/metal/QueueMTL.mm
index 09aadd6..75a7906 100644
--- a/src/dawn_native/metal/QueueMTL.mm
+++ b/src/dawn_native/metal/QueueMTL.mm
@@ -14,7 +14,7 @@
#include "dawn_native/metal/QueueMTL.h"
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "dawn_native/Buffer.h"
#include "dawn_native/CommandValidation.h"
#include "dawn_native/Commands.h"
diff --git a/src/dawn_native/metal/RenderPipelineMTL.h b/src/dawn_native/metal/RenderPipelineMTL.h
index ca150f1c..3c771ec 100644
--- a/src/dawn_native/metal/RenderPipelineMTL.h
+++ b/src/dawn_native/metal/RenderPipelineMTL.h
@@ -17,7 +17,7 @@
#include "dawn_native/RenderPipeline.h"
-#include "common/NSRef.h"
+#include "dawn/common/NSRef.h"
#import <Metal/Metal.h>
diff --git a/src/dawn_native/metal/SamplerMTL.h b/src/dawn_native/metal/SamplerMTL.h
index a90f518..159d04a 100644
--- a/src/dawn_native/metal/SamplerMTL.h
+++ b/src/dawn_native/metal/SamplerMTL.h
@@ -17,7 +17,7 @@
#include "dawn_native/Sampler.h"
-#include "common/NSRef.h"
+#include "dawn/common/NSRef.h"
#import <Metal/Metal.h>
diff --git a/src/dawn_native/metal/ShaderModuleMTL.h b/src/dawn_native/metal/ShaderModuleMTL.h
index 4bf2014..00003be 100644
--- a/src/dawn_native/metal/ShaderModuleMTL.h
+++ b/src/dawn_native/metal/ShaderModuleMTL.h
@@ -17,7 +17,7 @@
#include "dawn_native/ShaderModule.h"
-#include "common/NSRef.h"
+#include "dawn/common/NSRef.h"
#include "dawn_native/Error.h"
#import <Metal/Metal.h>
diff --git a/src/dawn_native/metal/StagingBufferMTL.h b/src/dawn_native/metal/StagingBufferMTL.h
index 3b177f2..03a9492 100644
--- a/src/dawn_native/metal/StagingBufferMTL.h
+++ b/src/dawn_native/metal/StagingBufferMTL.h
@@ -17,7 +17,7 @@
#include "dawn_native/StagingBuffer.h"
-#include "common/NSRef.h"
+#include "dawn/common/NSRef.h"
#import <Metal/Metal.h>
diff --git a/src/dawn_native/metal/SwapChainMTL.h b/src/dawn_native/metal/SwapChainMTL.h
index ef173cb..7a1f233 100644
--- a/src/dawn_native/metal/SwapChainMTL.h
+++ b/src/dawn_native/metal/SwapChainMTL.h
@@ -17,7 +17,7 @@
#include "dawn_native/SwapChain.h"
-#include "common/NSRef.h"
+#include "dawn/common/NSRef.h"
@class CAMetalLayer;
@protocol CAMetalDrawable;
diff --git a/src/dawn_native/metal/TextureMTL.h b/src/dawn_native/metal/TextureMTL.h
index 711f683..bb8ef8b 100644
--- a/src/dawn_native/metal/TextureMTL.h
+++ b/src/dawn_native/metal/TextureMTL.h
@@ -17,7 +17,7 @@
#include "dawn_native/Texture.h"
-#include "common/NSRef.h"
+#include "dawn/common/NSRef.h"
#include "dawn_native/DawnNative.h"
#include <IOSurface/IOSurfaceRef.h>
diff --git a/src/dawn_native/metal/TextureMTL.mm b/src/dawn_native/metal/TextureMTL.mm
index 7f2db5c..be4fbab 100644
--- a/src/dawn_native/metal/TextureMTL.mm
+++ b/src/dawn_native/metal/TextureMTL.mm
@@ -14,9 +14,9 @@
#include "dawn_native/metal/TextureMTL.h"
-#include "common/Constants.h"
-#include "common/Math.h"
-#include "common/Platform.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
+#include "dawn/common/Platform.h"
#include "dawn_native/DynamicUploader.h"
#include "dawn_native/EnumMaskIterator.h"
#include "dawn_native/metal/DeviceMTL.h"
diff --git a/src/dawn_native/metal/UtilsMetal.mm b/src/dawn_native/metal/UtilsMetal.mm
index 106e1df..82286dd 100644
--- a/src/dawn_native/metal/UtilsMetal.mm
+++ b/src/dawn_native/metal/UtilsMetal.mm
@@ -17,7 +17,7 @@
#include "dawn_native/Pipeline.h"
#include "dawn_native/ShaderModule.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
namespace dawn::native::metal {
diff --git a/src/dawn_native/null/NullBackend.cpp b/src/dawn_native/null/NullBackend.cpp
index 9e28695..b881602 100644
--- a/src/dawn_native/null/NullBackend.cpp
+++ b/src/dawn_native/null/NullBackend.cpp
@@ -17,7 +17,7 @@
#include "dawn_native/NullBackend.h"
-#include "common/SwapChainUtils.h"
+#include "dawn/common/SwapChainUtils.h"
#include "dawn_native/null/DeviceNull.h"
namespace dawn::native::null {
diff --git a/src/dawn_native/opengl/BackendGL.cpp b/src/dawn_native/opengl/BackendGL.cpp
index 982e84a..8caec6a 100644
--- a/src/dawn_native/opengl/BackendGL.cpp
+++ b/src/dawn_native/opengl/BackendGL.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/opengl/BackendGL.h"
-#include "common/GPUInfo.h"
-#include "common/Log.h"
+#include "dawn/common/GPUInfo.h"
+#include "dawn/common/Log.h"
#include "dawn_native/Instance.h"
#include "dawn_native/OpenGLBackend.h"
#include "dawn_native/opengl/DeviceGL.h"
diff --git a/src/dawn_native/opengl/BindGroupGL.h b/src/dawn_native/opengl/BindGroupGL.h
index a4720489..56b3e0e 100644
--- a/src/dawn_native/opengl/BindGroupGL.h
+++ b/src/dawn_native/opengl/BindGroupGL.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_OPENGL_BINDGROUPGL_H_
#define DAWNNATIVE_OPENGL_BINDGROUPGL_H_
-#include "common/PlacementAllocated.h"
+#include "dawn/common/PlacementAllocated.h"
#include "dawn_native/BindGroup.h"
namespace dawn::native::opengl {
diff --git a/src/dawn_native/opengl/BindGroupLayoutGL.h b/src/dawn_native/opengl/BindGroupLayoutGL.h
index 7e70eb0..e247fb3 100644
--- a/src/dawn_native/opengl/BindGroupLayoutGL.h
+++ b/src/dawn_native/opengl/BindGroupLayoutGL.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_OPENGL_BINDGROUPLAYOUTGL_H_
#define DAWNNATIVE_OPENGL_BINDGROUPLAYOUTGL_H_
-#include "common/SlabAllocator.h"
+#include "dawn/common/SlabAllocator.h"
#include "dawn_native/BindGroupLayout.h"
namespace dawn::native::opengl {
diff --git a/src/dawn_native/opengl/DeviceGL.h b/src/dawn_native/opengl/DeviceGL.h
index a0aa597..6f6a542 100644
--- a/src/dawn_native/opengl/DeviceGL.h
+++ b/src/dawn_native/opengl/DeviceGL.h
@@ -17,7 +17,7 @@
#include "dawn_native/dawn_platform.h"
-#include "common/Platform.h"
+#include "dawn/common/Platform.h"
#include "dawn_native/Device.h"
#include "dawn_native/QuerySet.h"
#include "dawn_native/opengl/Forward.h"
@@ -28,7 +28,7 @@
// Remove windows.h macros after glad's include of windows.h
#if defined(DAWN_PLATFORM_WINDOWS)
-# include "common/windows_with_undefs.h"
+# include "dawn/common/windows_with_undefs.h"
#endif
typedef void* EGLImage;
diff --git a/src/dawn_native/opengl/OpenGLBackend.cpp b/src/dawn_native/opengl/OpenGLBackend.cpp
index 727e36a..b62ed63 100644
--- a/src/dawn_native/opengl/OpenGLBackend.cpp
+++ b/src/dawn_native/opengl/OpenGLBackend.cpp
@@ -17,7 +17,7 @@
#include "dawn_native/OpenGLBackend.h"
-#include "common/SwapChainUtils.h"
+#include "dawn/common/SwapChainUtils.h"
#include "dawn_native/opengl/DeviceGL.h"
#include "dawn_native/opengl/NativeSwapChainImplGL.h"
diff --git a/src/dawn_native/opengl/PipelineGL.cpp b/src/dawn_native/opengl/PipelineGL.cpp
index 80d1bf8..ec2610a 100644
--- a/src/dawn_native/opengl/PipelineGL.cpp
+++ b/src/dawn_native/opengl/PipelineGL.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/opengl/PipelineGL.h"
-#include "common/BitSetIterator.h"
+#include "dawn/common/BitSetIterator.h"
#include "dawn_native/BindGroupLayout.h"
#include "dawn_native/Device.h"
#include "dawn_native/Pipeline.h"
diff --git a/src/dawn_native/opengl/PipelineLayoutGL.cpp b/src/dawn_native/opengl/PipelineLayoutGL.cpp
index eb61df8..f5f632d 100644
--- a/src/dawn_native/opengl/PipelineLayoutGL.cpp
+++ b/src/dawn_native/opengl/PipelineLayoutGL.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/opengl/PipelineLayoutGL.h"
-#include "common/BitSetIterator.h"
+#include "dawn/common/BitSetIterator.h"
#include "dawn_native/BindGroupLayout.h"
#include "dawn_native/opengl/DeviceGL.h"
diff --git a/src/dawn_native/opengl/PipelineLayoutGL.h b/src/dawn_native/opengl/PipelineLayoutGL.h
index 3348770..dd193d8 100644
--- a/src/dawn_native/opengl/PipelineLayoutGL.h
+++ b/src/dawn_native/opengl/PipelineLayoutGL.h
@@ -17,8 +17,8 @@
#include "dawn_native/PipelineLayout.h"
-#include "common/ityp_array.h"
-#include "common/ityp_vector.h"
+#include "dawn/common/ityp_array.h"
+#include "dawn/common/ityp_vector.h"
#include "dawn_native/BindingInfo.h"
#include "dawn_native/opengl/opengl_platform.h"
diff --git a/src/dawn_native/opengl/SamplerGL.cpp b/src/dawn_native/opengl/SamplerGL.cpp
index 942fd80..52bb5a1 100644
--- a/src/dawn_native/opengl/SamplerGL.cpp
+++ b/src/dawn_native/opengl/SamplerGL.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/opengl/SamplerGL.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/opengl/DeviceGL.h"
#include "dawn_native/opengl/UtilsGL.h"
diff --git a/src/dawn_native/opengl/ShaderModuleGL.cpp b/src/dawn_native/opengl/ShaderModuleGL.cpp
index d07ea86..d061f19 100644
--- a/src/dawn_native/opengl/ShaderModuleGL.cpp
+++ b/src/dawn_native/opengl/ShaderModuleGL.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/opengl/ShaderModuleGL.h"
-#include "common/Assert.h"
-#include "common/Platform.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Platform.h"
#include "dawn_native/BindGroupLayout.h"
#include "dawn_native/SpirvValidation.h"
#include "dawn_native/TintUtils.h"
diff --git a/src/dawn_native/opengl/TextureGL.cpp b/src/dawn_native/opengl/TextureGL.cpp
index 225fd9c..ccddd7c 100644
--- a/src/dawn_native/opengl/TextureGL.cpp
+++ b/src/dawn_native/opengl/TextureGL.cpp
@@ -14,9 +14,9 @@
#include "dawn_native/opengl/TextureGL.h"
-#include "common/Assert.h"
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "dawn_native/EnumMaskIterator.h"
#include "dawn_native/opengl/BufferGL.h"
#include "dawn_native/opengl/CommandBufferGL.h"
diff --git a/src/dawn_native/opengl/UtilsGL.cpp b/src/dawn_native/opengl/UtilsGL.cpp
index a16cc4c..8a6b13b 100644
--- a/src/dawn_native/opengl/UtilsGL.cpp
+++ b/src/dawn_native/opengl/UtilsGL.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/opengl/UtilsGL.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
namespace dawn::native::opengl {
diff --git a/src/dawn_native/utils/WGPUHelpers.cpp b/src/dawn_native/utils/WGPUHelpers.cpp
index 7071661..10933f6 100644
--- a/src/dawn_native/utils/WGPUHelpers.cpp
+++ b/src/dawn_native/utils/WGPUHelpers.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/utils/WGPUHelpers.h"
-#include "common/Assert.h"
-#include "common/Constants.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Constants.h"
#include "dawn_native/BindGroup.h"
#include "dawn_native/BindGroupLayout.h"
#include "dawn_native/Buffer.h"
diff --git a/src/dawn_native/utils/WGPUHelpers.h b/src/dawn_native/utils/WGPUHelpers.h
index 8335d72..f58128f 100644
--- a/src/dawn_native/utils/WGPUHelpers.h
+++ b/src/dawn_native/utils/WGPUHelpers.h
@@ -21,7 +21,7 @@
#include <initializer_list>
#include <vector>
-#include "common/RefCounted.h"
+#include "dawn/common/RefCounted.h"
#include "dawn_native/Error.h"
namespace dawn::native::utils {
@@ -120,4 +120,4 @@
} // namespace dawn::native::utils
-#endif // DAWNNATIVE_UTILS_WGPUHELPERS_H_
\ No newline at end of file
+#endif // DAWNNATIVE_UTILS_WGPUHELPERS_H_
diff --git a/src/dawn_native/vulkan/AdapterVk.cpp b/src/dawn_native/vulkan/AdapterVk.cpp
index 76c2033..bf9cb8e 100644
--- a/src/dawn_native/vulkan/AdapterVk.cpp
+++ b/src/dawn_native/vulkan/AdapterVk.cpp
@@ -18,7 +18,7 @@
#include "dawn_native/vulkan/BackendVk.h"
#include "dawn_native/vulkan/DeviceVk.h"
-#include "common/GPUInfo.h"
+#include "dawn/common/GPUInfo.h"
namespace dawn::native::vulkan {
diff --git a/src/dawn_native/vulkan/AdapterVk.h b/src/dawn_native/vulkan/AdapterVk.h
index 700c09e..dca8f24 100644
--- a/src/dawn_native/vulkan/AdapterVk.h
+++ b/src/dawn_native/vulkan/AdapterVk.h
@@ -17,8 +17,8 @@
#include "dawn_native/Adapter.h"
-#include "common/RefCounted.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/RefCounted.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/vulkan/VulkanInfo.h"
namespace dawn::native::vulkan {
diff --git a/src/dawn_native/vulkan/BackendVk.cpp b/src/dawn_native/vulkan/BackendVk.cpp
index 79f8706..d7c8548 100644
--- a/src/dawn_native/vulkan/BackendVk.cpp
+++ b/src/dawn_native/vulkan/BackendVk.cpp
@@ -14,9 +14,9 @@
#include "dawn_native/vulkan/BackendVk.h"
-#include "common/BitSetIterator.h"
-#include "common/Log.h"
-#include "common/SystemUtils.h"
+#include "dawn/common/BitSetIterator.h"
+#include "dawn/common/Log.h"
+#include "dawn/common/SystemUtils.h"
#include "dawn_native/Instance.h"
#include "dawn_native/VulkanBackend.h"
#include "dawn_native/vulkan/AdapterVk.h"
@@ -209,7 +209,7 @@
DAWN_TRY(LoadVulkan(kSwiftshaderLibName));
break;
#endif // defined(DAWN_ENABLE_SWIFTSHADER)
- // ICD::SwiftShader should not be passed if SwiftShader is not enabled.
+ // ICD::SwiftShader should not be passed if SwiftShader is not enabled.
UNREACHABLE();
}
}
diff --git a/src/dawn_native/vulkan/BackendVk.h b/src/dawn_native/vulkan/BackendVk.h
index 3889401..437a24e 100644
--- a/src/dawn_native/vulkan/BackendVk.h
+++ b/src/dawn_native/vulkan/BackendVk.h
@@ -17,9 +17,9 @@
#include "dawn_native/BackendConnection.h"
-#include "common/DynamicLib.h"
-#include "common/RefCounted.h"
-#include "common/ityp_array.h"
+#include "dawn/common/DynamicLib.h"
+#include "dawn/common/RefCounted.h"
+#include "dawn/common/ityp_array.h"
#include "dawn_native/vulkan/VulkanFunctions.h"
#include "dawn_native/vulkan/VulkanInfo.h"
diff --git a/src/dawn_native/vulkan/BindGroupLayoutVk.cpp b/src/dawn_native/vulkan/BindGroupLayoutVk.cpp
index 695301e..6bf07ec 100644
--- a/src/dawn_native/vulkan/BindGroupLayoutVk.cpp
+++ b/src/dawn_native/vulkan/BindGroupLayoutVk.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/vulkan/BindGroupLayoutVk.h"
-#include "common/BitSetIterator.h"
-#include "common/ityp_vector.h"
+#include "dawn/common/BitSetIterator.h"
+#include "dawn/common/ityp_vector.h"
#include "dawn_native/vulkan/BindGroupVk.h"
#include "dawn_native/vulkan/DescriptorSetAllocator.h"
#include "dawn_native/vulkan/DeviceVk.h"
diff --git a/src/dawn_native/vulkan/BindGroupLayoutVk.h b/src/dawn_native/vulkan/BindGroupLayoutVk.h
index 7ec7f08..4f67051 100644
--- a/src/dawn_native/vulkan/BindGroupLayoutVk.h
+++ b/src/dawn_native/vulkan/BindGroupLayoutVk.h
@@ -17,8 +17,8 @@
#include "dawn_native/BindGroupLayout.h"
-#include "common/SlabAllocator.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/SlabAllocator.h"
+#include "dawn/common/vulkan_platform.h"
#include <vector>
diff --git a/src/dawn_native/vulkan/BindGroupVk.cpp b/src/dawn_native/vulkan/BindGroupVk.cpp
index f94fa2d..d84acc2 100644
--- a/src/dawn_native/vulkan/BindGroupVk.cpp
+++ b/src/dawn_native/vulkan/BindGroupVk.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/vulkan/BindGroupVk.h"
-#include "common/BitSetIterator.h"
-#include "common/ityp_stack_vec.h"
+#include "dawn/common/BitSetIterator.h"
+#include "dawn/common/ityp_stack_vec.h"
#include "dawn_native/ExternalTexture.h"
#include "dawn_native/vulkan/BindGroupLayoutVk.h"
#include "dawn_native/vulkan/BufferVk.h"
diff --git a/src/dawn_native/vulkan/BindGroupVk.h b/src/dawn_native/vulkan/BindGroupVk.h
index 6c85a85..2d0ef57 100644
--- a/src/dawn_native/vulkan/BindGroupVk.h
+++ b/src/dawn_native/vulkan/BindGroupVk.h
@@ -17,8 +17,8 @@
#include "dawn_native/BindGroup.h"
-#include "common/PlacementAllocated.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/PlacementAllocated.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/vulkan/BindGroupLayoutVk.h"
#include "dawn_native/vulkan/DescriptorSetAllocation.h"
diff --git a/src/dawn_native/vulkan/BufferVk.h b/src/dawn_native/vulkan/BufferVk.h
index 7c31692..548c10c 100644
--- a/src/dawn_native/vulkan/BufferVk.h
+++ b/src/dawn_native/vulkan/BufferVk.h
@@ -17,8 +17,8 @@
#include "dawn_native/Buffer.h"
-#include "common/SerialQueue.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/SerialQueue.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/ResourceMemoryAllocation.h"
namespace dawn::native::vulkan {
diff --git a/src/dawn_native/vulkan/CommandBufferVk.h b/src/dawn_native/vulkan/CommandBufferVk.h
index a9a6b46..219083b 100644
--- a/src/dawn_native/vulkan/CommandBufferVk.h
+++ b/src/dawn_native/vulkan/CommandBufferVk.h
@@ -18,7 +18,7 @@
#include "dawn_native/CommandBuffer.h"
#include "dawn_native/Error.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
namespace dawn::native {
struct BeginRenderPassCmd;
diff --git a/src/dawn_native/vulkan/CommandRecordingContext.h b/src/dawn_native/vulkan/CommandRecordingContext.h
index 931540e..cadc225 100644
--- a/src/dawn_native/vulkan/CommandRecordingContext.h
+++ b/src/dawn_native/vulkan/CommandRecordingContext.h
@@ -14,7 +14,7 @@
#ifndef DAWNNATIVE_VULKAN_COMMANDRECORDINGCONTEXT_H_
#define DAWNNATIVE_VULKAN_COMMANDRECORDINGCONTEXT_H_
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/vulkan/BufferVk.h"
diff --git a/src/dawn_native/vulkan/ComputePipelineVk.h b/src/dawn_native/vulkan/ComputePipelineVk.h
index c1b2884..a610c89 100644
--- a/src/dawn_native/vulkan/ComputePipelineVk.h
+++ b/src/dawn_native/vulkan/ComputePipelineVk.h
@@ -17,7 +17,7 @@
#include "dawn_native/ComputePipeline.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/Error.h"
namespace dawn::native::vulkan {
diff --git a/src/dawn_native/vulkan/DescriptorSetAllocation.h b/src/dawn_native/vulkan/DescriptorSetAllocation.h
index a3221be..ef72e86 100644
--- a/src/dawn_native/vulkan/DescriptorSetAllocation.h
+++ b/src/dawn_native/vulkan/DescriptorSetAllocation.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_VULKAN_DESCRIPTORSETALLOCATION_H_
#define DAWNNATIVE_VULKAN_DESCRIPTORSETALLOCATION_H_
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
namespace dawn::native::vulkan {
diff --git a/src/dawn_native/vulkan/DescriptorSetAllocator.h b/src/dawn_native/vulkan/DescriptorSetAllocator.h
index 6fedcaa..d705fae 100644
--- a/src/dawn_native/vulkan/DescriptorSetAllocator.h
+++ b/src/dawn_native/vulkan/DescriptorSetAllocator.h
@@ -15,8 +15,8 @@
#ifndef DAWNNATIVE_VULKAN_DESCRIPTORSETALLOCATOR_H_
#define DAWNNATIVE_VULKAN_DESCRIPTORSETALLOCATOR_H_
-#include "common/SerialQueue.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/SerialQueue.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/Error.h"
#include "dawn_native/IntegerTypes.h"
#include "dawn_native/ObjectBase.h"
diff --git a/src/dawn_native/vulkan/DeviceVk.cpp b/src/dawn_native/vulkan/DeviceVk.cpp
index dda1f7f..6bb6787 100644
--- a/src/dawn_native/vulkan/DeviceVk.cpp
+++ b/src/dawn_native/vulkan/DeviceVk.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/vulkan/DeviceVk.h"
-#include "common/Platform.h"
+#include "dawn/common/Platform.h"
#include "dawn_native/BackendConnection.h"
#include "dawn_native/ChainUtils_autogen.h"
#include "dawn_native/Error.h"
diff --git a/src/dawn_native/vulkan/DeviceVk.h b/src/dawn_native/vulkan/DeviceVk.h
index 9d90311..4bd86dd 100644
--- a/src/dawn_native/vulkan/DeviceVk.h
+++ b/src/dawn_native/vulkan/DeviceVk.h
@@ -17,7 +17,7 @@
#include "dawn_native/dawn_platform.h"
-#include "common/SerialQueue.h"
+#include "dawn/common/SerialQueue.h"
#include "dawn_native/Commands.h"
#include "dawn_native/Device.h"
#include "dawn_native/vulkan/CommandRecordingContext.h"
diff --git a/src/dawn_native/vulkan/ExternalHandle.h b/src/dawn_native/vulkan/ExternalHandle.h
index e87da41..24edf42 100644
--- a/src/dawn_native/vulkan/ExternalHandle.h
+++ b/src/dawn_native/vulkan/ExternalHandle.h
@@ -1,7 +1,7 @@
#ifndef DAWNNATIVE_VULKAN_EXTERNALHANDLE_H_
#define DAWNNATIVE_VULKAN_EXTERNALHANDLE_H_
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
namespace dawn::native::vulkan {
diff --git a/src/dawn_native/vulkan/FencedDeleter.h b/src/dawn_native/vulkan/FencedDeleter.h
index cc9e572..6ed1594 100644
--- a/src/dawn_native/vulkan/FencedDeleter.h
+++ b/src/dawn_native/vulkan/FencedDeleter.h
@@ -15,8 +15,8 @@
#ifndef DAWNNATIVE_VULKAN_FENCEDDELETER_H_
#define DAWNNATIVE_VULKAN_FENCEDDELETER_H_
-#include "common/SerialQueue.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/SerialQueue.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/IntegerTypes.h"
namespace dawn::native::vulkan {
diff --git a/src/dawn_native/vulkan/PipelineLayoutVk.cpp b/src/dawn_native/vulkan/PipelineLayoutVk.cpp
index 64f9ef8..6a10e78 100644
--- a/src/dawn_native/vulkan/PipelineLayoutVk.cpp
+++ b/src/dawn_native/vulkan/PipelineLayoutVk.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/vulkan/PipelineLayoutVk.h"
-#include "common/BitSetIterator.h"
+#include "dawn/common/BitSetIterator.h"
#include "dawn_native/vulkan/BindGroupLayoutVk.h"
#include "dawn_native/vulkan/DeviceVk.h"
#include "dawn_native/vulkan/FencedDeleter.h"
diff --git a/src/dawn_native/vulkan/PipelineLayoutVk.h b/src/dawn_native/vulkan/PipelineLayoutVk.h
index 894084e..f83c5f9 100644
--- a/src/dawn_native/vulkan/PipelineLayoutVk.h
+++ b/src/dawn_native/vulkan/PipelineLayoutVk.h
@@ -17,7 +17,7 @@
#include "dawn_native/PipelineLayout.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/Error.h"
namespace dawn::native::vulkan {
diff --git a/src/dawn_native/vulkan/QuerySetVk.h b/src/dawn_native/vulkan/QuerySetVk.h
index a4cd898..1e5f5f5 100644
--- a/src/dawn_native/vulkan/QuerySetVk.h
+++ b/src/dawn_native/vulkan/QuerySetVk.h
@@ -17,7 +17,7 @@
#include "dawn_native/QuerySet.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
namespace dawn::native::vulkan {
diff --git a/src/dawn_native/vulkan/QueueVk.cpp b/src/dawn_native/vulkan/QueueVk.cpp
index c59f22c..251c39f 100644
--- a/src/dawn_native/vulkan/QueueVk.cpp
+++ b/src/dawn_native/vulkan/QueueVk.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/vulkan/QueueVk.h"
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "dawn_native/Buffer.h"
#include "dawn_native/CommandValidation.h"
#include "dawn_native/Commands.h"
diff --git a/src/dawn_native/vulkan/RenderPassCache.cpp b/src/dawn_native/vulkan/RenderPassCache.cpp
index 095380f..98424bc 100644
--- a/src/dawn_native/vulkan/RenderPassCache.cpp
+++ b/src/dawn_native/vulkan/RenderPassCache.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/vulkan/RenderPassCache.h"
-#include "common/BitSetIterator.h"
-#include "common/HashUtils.h"
+#include "dawn/common/BitSetIterator.h"
+#include "dawn/common/HashUtils.h"
#include "dawn_native/vulkan/DeviceVk.h"
#include "dawn_native/vulkan/TextureVk.h"
#include "dawn_native/vulkan/VulkanError.h"
@@ -195,11 +195,13 @@
++resolveAttachmentIndex;
}
- // All color attachments without a corresponding resolve attachment must be set to VK_ATTACHMENT_UNUSED
+ // All color attachments without a corresponding resolve attachment must be set to
+ // VK_ATTACHMENT_UNUSED
for (; resolveAttachmentIndex < colorAttachmentIndex; resolveAttachmentIndex++) {
auto& attachmentRef = resolveAttachmentRefs[resolveAttachmentIndex];
attachmentRef.attachment = VK_ATTACHMENT_UNUSED;
- attachmentRef.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; // The Khronos Vulkan validation layer will complain if not set
+ // The Khronos Vulkan validation layer will complain if not set
+ attachmentRef.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
}
VkAttachmentReference* resolveTargetAttachmentRefs =
diff --git a/src/dawn_native/vulkan/RenderPassCache.h b/src/dawn_native/vulkan/RenderPassCache.h
index 08c55c3..5716d13 100644
--- a/src/dawn_native/vulkan/RenderPassCache.h
+++ b/src/dawn_native/vulkan/RenderPassCache.h
@@ -15,10 +15,10 @@
#ifndef DAWNNATIVE_VULKAN_RENDERPASSCACHE_H_
#define DAWNNATIVE_VULKAN_RENDERPASSCACHE_H_
-#include "common/Constants.h"
-#include "common/ityp_array.h"
-#include "common/ityp_bitset.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/ityp_array.h"
+#include "dawn/common/ityp_bitset.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/Error.h"
#include "dawn_native/IntegerTypes.h"
#include "dawn_native/dawn_platform.h"
diff --git a/src/dawn_native/vulkan/RenderPipelineVk.h b/src/dawn_native/vulkan/RenderPipelineVk.h
index f47e239..7bdfe8e 100644
--- a/src/dawn_native/vulkan/RenderPipelineVk.h
+++ b/src/dawn_native/vulkan/RenderPipelineVk.h
@@ -17,7 +17,7 @@
#include "dawn_native/RenderPipeline.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/Error.h"
namespace dawn::native::vulkan {
diff --git a/src/dawn_native/vulkan/ResourceHeapVk.h b/src/dawn_native/vulkan/ResourceHeapVk.h
index 318f5f7..2538290 100644
--- a/src/dawn_native/vulkan/ResourceHeapVk.h
+++ b/src/dawn_native/vulkan/ResourceHeapVk.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_VULKAN_RESOURCEHEAPVK_H_
#define DAWNNATIVE_VULKAN_RESOURCEHEAPVK_H_
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/ResourceHeap.h"
namespace dawn::native::vulkan {
diff --git a/src/dawn_native/vulkan/ResourceMemoryAllocatorVk.cpp b/src/dawn_native/vulkan/ResourceMemoryAllocatorVk.cpp
index 3e8d55e..f8cb966 100644
--- a/src/dawn_native/vulkan/ResourceMemoryAllocatorVk.cpp
+++ b/src/dawn_native/vulkan/ResourceMemoryAllocatorVk.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/vulkan/ResourceMemoryAllocatorVk.h"
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "dawn_native/BuddyMemoryAllocator.h"
#include "dawn_native/ResourceHeapAllocator.h"
#include "dawn_native/vulkan/DeviceVk.h"
diff --git a/src/dawn_native/vulkan/ResourceMemoryAllocatorVk.h b/src/dawn_native/vulkan/ResourceMemoryAllocatorVk.h
index f77cc48..b3fdeae 100644
--- a/src/dawn_native/vulkan/ResourceMemoryAllocatorVk.h
+++ b/src/dawn_native/vulkan/ResourceMemoryAllocatorVk.h
@@ -15,8 +15,8 @@
#ifndef DAWNNATIVE_VULKAN_RESOURCEMEMORYALLOCATORVK_H_
#define DAWNNATIVE_VULKAN_RESOURCEMEMORYALLOCATORVK_H_
-#include "common/SerialQueue.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/SerialQueue.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/Error.h"
#include "dawn_native/IntegerTypes.h"
#include "dawn_native/PooledResourceMemoryAllocator.h"
diff --git a/src/dawn_native/vulkan/SamplerVk.h b/src/dawn_native/vulkan/SamplerVk.h
index 1367967..c32cb11 100644
--- a/src/dawn_native/vulkan/SamplerVk.h
+++ b/src/dawn_native/vulkan/SamplerVk.h
@@ -17,7 +17,7 @@
#include "dawn_native/Sampler.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/Error.h"
namespace dawn::native::vulkan {
diff --git a/src/dawn_native/vulkan/ShaderModuleVk.h b/src/dawn_native/vulkan/ShaderModuleVk.h
index 862f30a..2de986f 100644
--- a/src/dawn_native/vulkan/ShaderModuleVk.h
+++ b/src/dawn_native/vulkan/ShaderModuleVk.h
@@ -17,7 +17,7 @@
#include "dawn_native/ShaderModule.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/Error.h"
#include <mutex>
diff --git a/src/dawn_native/vulkan/StagingBufferVk.h b/src/dawn_native/vulkan/StagingBufferVk.h
index ed6f6c6..acae114 100644
--- a/src/dawn_native/vulkan/StagingBufferVk.h
+++ b/src/dawn_native/vulkan/StagingBufferVk.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_STAGINGBUFFERVK_H_
#define DAWNNATIVE_STAGINGBUFFERVK_H_
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/ResourceMemoryAllocation.h"
#include "dawn_native/StagingBuffer.h"
diff --git a/src/dawn_native/vulkan/SwapChainVk.cpp b/src/dawn_native/vulkan/SwapChainVk.cpp
index 020719f..7d6df49 100644
--- a/src/dawn_native/vulkan/SwapChainVk.cpp
+++ b/src/dawn_native/vulkan/SwapChainVk.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/vulkan/SwapChainVk.h"
-#include "common/Compiler.h"
+#include "dawn/common/Compiler.h"
#include "dawn_native/Instance.h"
#include "dawn_native/Surface.h"
#include "dawn_native/vulkan/AdapterVk.h"
diff --git a/src/dawn_native/vulkan/SwapChainVk.h b/src/dawn_native/vulkan/SwapChainVk.h
index 2becbe9..f5fd581 100644
--- a/src/dawn_native/vulkan/SwapChainVk.h
+++ b/src/dawn_native/vulkan/SwapChainVk.h
@@ -17,7 +17,7 @@
#include "dawn_native/SwapChain.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
#include <vector>
diff --git a/src/dawn_native/vulkan/TextureVk.cpp b/src/dawn_native/vulkan/TextureVk.cpp
index 65b7da7..c4b3bbd 100644
--- a/src/dawn_native/vulkan/TextureVk.cpp
+++ b/src/dawn_native/vulkan/TextureVk.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/vulkan/TextureVk.h"
-#include "common/Assert.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
#include "dawn_native/DynamicUploader.h"
#include "dawn_native/EnumMaskIterator.h"
#include "dawn_native/Error.h"
diff --git a/src/dawn_native/vulkan/TextureVk.h b/src/dawn_native/vulkan/TextureVk.h
index a2a8f70..d4bbf61 100644
--- a/src/dawn_native/vulkan/TextureVk.h
+++ b/src/dawn_native/vulkan/TextureVk.h
@@ -17,7 +17,7 @@
#include "dawn_native/Texture.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/PassResourceUsage.h"
#include "dawn_native/ResourceMemoryAllocation.h"
#include "dawn_native/vulkan/ExternalHandle.h"
@@ -156,12 +156,7 @@
ResourceMemoryAllocation mMemoryAllocation;
VkDeviceMemory mExternalAllocation = VK_NULL_HANDLE;
- enum class ExternalState {
- InternalOnly,
- PendingAcquire,
- Acquired,
- Released
- };
+ enum class ExternalState { InternalOnly, PendingAcquire, Acquired, Released };
ExternalState mExternalState = ExternalState::InternalOnly;
ExternalState mLastExternalState = ExternalState::InternalOnly;
diff --git a/src/dawn_native/vulkan/UtilsVulkan.cpp b/src/dawn_native/vulkan/UtilsVulkan.cpp
index 0a200fd..a6cfc5c 100644
--- a/src/dawn_native/vulkan/UtilsVulkan.cpp
+++ b/src/dawn_native/vulkan/UtilsVulkan.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/vulkan/UtilsVulkan.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/EnumMaskIterator.h"
#include "dawn_native/Format.h"
#include "dawn_native/Pipeline.h"
diff --git a/src/dawn_native/vulkan/UtilsVulkan.h b/src/dawn_native/vulkan/UtilsVulkan.h
index 1b5013c..0f1f33d 100644
--- a/src/dawn_native/vulkan/UtilsVulkan.h
+++ b/src/dawn_native/vulkan/UtilsVulkan.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_VULKAN_UTILSVULKAN_H_
#define DAWNNATIVE_VULKAN_UTILSVULKAN_H_
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/Commands.h"
#include "dawn_native/dawn_platform.h"
diff --git a/src/dawn_native/vulkan/VulkanBackend.cpp b/src/dawn_native/vulkan/VulkanBackend.cpp
index f7e3560..4fa81c9 100644
--- a/src/dawn_native/vulkan/VulkanBackend.cpp
+++ b/src/dawn_native/vulkan/VulkanBackend.cpp
@@ -17,11 +17,11 @@
// Include vulkan_platform.h before VulkanBackend.h includes vulkan.h so that we use our version
// of the non-dispatchable handles.
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/VulkanBackend.h"
-#include "common/SwapChainUtils.h"
+#include "dawn/common/SwapChainUtils.h"
#include "dawn_native/vulkan/DeviceVk.h"
#include "dawn_native/vulkan/NativeSwapChainImplVk.h"
#include "dawn_native/vulkan/TextureVk.h"
diff --git a/src/dawn_native/vulkan/VulkanExtensions.cpp b/src/dawn_native/vulkan/VulkanExtensions.cpp
index 660b564..72b6f99 100644
--- a/src/dawn_native/vulkan/VulkanExtensions.cpp
+++ b/src/dawn_native/vulkan/VulkanExtensions.cpp
@@ -14,8 +14,8 @@
#include "dawn_native/vulkan/VulkanExtensions.h"
-#include "common/Assert.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/vulkan_platform.h"
#include <array>
#include <limits>
diff --git a/src/dawn_native/vulkan/VulkanExtensions.h b/src/dawn_native/vulkan/VulkanExtensions.h
index caf2280..0a2c8e8 100644
--- a/src/dawn_native/vulkan/VulkanExtensions.h
+++ b/src/dawn_native/vulkan/VulkanExtensions.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_VULKAN_VULKANEXTENSIONS_H_
#define DAWNNATIVE_VULKAN_VULKANEXTENSIONS_H_
-#include "common/ityp_bitset.h"
+#include "dawn/common/ityp_bitset.h"
#include <unordered_map>
diff --git a/src/dawn_native/vulkan/VulkanFunctions.cpp b/src/dawn_native/vulkan/VulkanFunctions.cpp
index 7146e0a..1bae6be 100644
--- a/src/dawn_native/vulkan/VulkanFunctions.cpp
+++ b/src/dawn_native/vulkan/VulkanFunctions.cpp
@@ -14,7 +14,7 @@
#include "dawn_native/vulkan/VulkanFunctions.h"
-#include "common/DynamicLib.h"
+#include "dawn/common/DynamicLib.h"
#include "dawn_native/vulkan/VulkanInfo.h"
namespace dawn::native::vulkan {
diff --git a/src/dawn_native/vulkan/VulkanFunctions.h b/src/dawn_native/vulkan/VulkanFunctions.h
index 41938c6..bcf06ef 100644
--- a/src/dawn_native/vulkan/VulkanFunctions.h
+++ b/src/dawn_native/vulkan/VulkanFunctions.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_VULKAN_VULKANFUNCTIONS_H_
#define DAWNNATIVE_VULKAN_VULKANFUNCTIONS_H_
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/Error.h"
diff --git a/src/dawn_native/vulkan/VulkanInfo.h b/src/dawn_native/vulkan/VulkanInfo.h
index 1d466f7..6e51115 100644
--- a/src/dawn_native/vulkan/VulkanInfo.h
+++ b/src/dawn_native/vulkan/VulkanInfo.h
@@ -15,8 +15,8 @@
#ifndef DAWNNATIVE_VULKAN_VULKANINFO_H_
#define DAWNNATIVE_VULKAN_VULKANINFO_H_
-#include "common/ityp_array.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/ityp_array.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/Error.h"
#include "dawn_native/vulkan/VulkanExtensions.h"
diff --git a/src/dawn_native/vulkan/external_memory/MemoryService.h b/src/dawn_native/vulkan/external_memory/MemoryService.h
index 89254f0..ba1c0a4 100644
--- a/src/dawn_native/vulkan/external_memory/MemoryService.h
+++ b/src/dawn_native/vulkan/external_memory/MemoryService.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_VULKAN_EXTERNALMEMORY_SERVICE_H_
#define DAWNNATIVE_VULKAN_EXTERNALMEMORY_SERVICE_H_
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/Error.h"
#include "dawn_native/VulkanBackend.h"
#include "dawn_native/vulkan/ExternalHandle.h"
diff --git a/src/dawn_native/vulkan/external_memory/MemoryServiceDmaBuf.cpp b/src/dawn_native/vulkan/external_memory/MemoryServiceDmaBuf.cpp
index 8cdd5ba..384d4d2 100644
--- a/src/dawn_native/vulkan/external_memory/MemoryServiceDmaBuf.cpp
+++ b/src/dawn_native/vulkan/external_memory/MemoryServiceDmaBuf.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/vulkan/AdapterVk.h"
#include "dawn_native/vulkan/BackendVk.h"
#include "dawn_native/vulkan/DeviceVk.h"
diff --git a/src/dawn_native/vulkan/external_memory/MemoryServiceOpaqueFD.cpp b/src/dawn_native/vulkan/external_memory/MemoryServiceOpaqueFD.cpp
index 181a17b..b51ec93 100644
--- a/src/dawn_native/vulkan/external_memory/MemoryServiceOpaqueFD.cpp
+++ b/src/dawn_native/vulkan/external_memory/MemoryServiceOpaqueFD.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/vulkan/AdapterVk.h"
#include "dawn_native/vulkan/BackendVk.h"
#include "dawn_native/vulkan/DeviceVk.h"
diff --git a/src/dawn_native/vulkan/external_memory/MemoryServiceZirconHandle.cpp b/src/dawn_native/vulkan/external_memory/MemoryServiceZirconHandle.cpp
index 2966144..3e0ff7c 100644
--- a/src/dawn_native/vulkan/external_memory/MemoryServiceZirconHandle.cpp
+++ b/src/dawn_native/vulkan/external_memory/MemoryServiceZirconHandle.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/vulkan/AdapterVk.h"
#include "dawn_native/vulkan/BackendVk.h"
#include "dawn_native/vulkan/DeviceVk.h"
diff --git a/src/dawn_native/vulkan/external_semaphore/SemaphoreService.h b/src/dawn_native/vulkan/external_semaphore/SemaphoreService.h
index 58cc8e9..582b598 100644
--- a/src/dawn_native/vulkan/external_semaphore/SemaphoreService.h
+++ b/src/dawn_native/vulkan/external_semaphore/SemaphoreService.h
@@ -15,7 +15,7 @@
#ifndef DAWNNATIVE_VULKAN_EXTERNALSEMAPHORE_SERVICE_H_
#define DAWNNATIVE_VULKAN_EXTERNALSEMAPHORE_SERVICE_H_
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/Error.h"
#include "dawn_native/vulkan/ExternalHandle.h"
#include "dawn_native/vulkan/VulkanFunctions.h"
diff --git a/src/dawn_platform/BUILD.gn b/src/dawn_platform/BUILD.gn
index cbd3238..30c9434 100644
--- a/src/dawn_platform/BUILD.gn
+++ b/src/dawn_platform/BUILD.gn
@@ -19,7 +19,7 @@
dawn_component("dawn_platform") {
DEFINE_PREFIX = "DAWN_PLATFORM"
- configs = [ "${dawn_root}/src/common:dawn_internal" ]
+ configs = [ "${dawn_root}/src/dawn/common:internal_config" ]
sources = [
"${dawn_root}/src/include/dawn_platform/DawnPlatform.h",
@@ -32,7 +32,7 @@
"tracing/TraceEvent.h",
]
- deps = [ "${dawn_root}/src/common" ]
+ deps = [ "${dawn_root}/src/dawn/common" ]
public_deps = [
# DawnPlatform.h has #include <dawn/webgpu.h>
diff --git a/src/dawn_platform/DawnPlatform.cpp b/src/dawn_platform/DawnPlatform.cpp
index 9f1b3db..a63b180 100644
--- a/src/dawn_platform/DawnPlatform.cpp
+++ b/src/dawn_platform/DawnPlatform.cpp
@@ -15,7 +15,7 @@
#include "dawn_platform/DawnPlatform.h"
#include "dawn_platform/WorkerThread.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
namespace dawn::platform {
diff --git a/src/dawn_platform/WorkerThread.cpp b/src/dawn_platform/WorkerThread.cpp
index ac600ae..c2f5683 100644
--- a/src/dawn_platform/WorkerThread.cpp
+++ b/src/dawn_platform/WorkerThread.cpp
@@ -18,7 +18,7 @@
#include <functional>
#include <thread>
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
namespace {
diff --git a/src/dawn_platform/WorkerThread.h b/src/dawn_platform/WorkerThread.h
index cfb43e7..70ce1f8 100644
--- a/src/dawn_platform/WorkerThread.h
+++ b/src/dawn_platform/WorkerThread.h
@@ -15,7 +15,7 @@
#ifndef COMMON_WORKERTHREAD_H_
#define COMMON_WORKERTHREAD_H_
-#include "common/NonCopyable.h"
+#include "dawn/common/NonCopyable.h"
#include "dawn_platform/DawnPlatform.h"
namespace dawn::platform {
diff --git a/src/dawn_platform/tracing/EventTracer.cpp b/src/dawn_platform/tracing/EventTracer.cpp
index 56c46bf..08b7ecd 100644
--- a/src/dawn_platform/tracing/EventTracer.cpp
+++ b/src/dawn_platform/tracing/EventTracer.cpp
@@ -13,7 +13,7 @@
// limitations under the License.
#include "dawn_platform/tracing/EventTracer.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_platform/DawnPlatform.h"
namespace dawn::platform::tracing {
diff --git a/src/dawn_wire/BUILD.gn b/src/dawn_wire/BUILD.gn
index cfebb57..448f509 100644
--- a/src/dawn_wire/BUILD.gn
+++ b/src/dawn_wire/BUILD.gn
@@ -21,7 +21,7 @@
# dependencies of dawn_wire
source_set("dawn_wire_headers") {
public_deps = [ "${dawn_root}/src/dawn:dawn_headers" ]
- all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ]
+ all_dependent_configs = [ "${dawn_root}/src/dawn/common:public_include_dirs" ]
sources = [
"${dawn_root}/src/include/dawn_wire/Wire.h",
"${dawn_root}/src/include/dawn_wire/WireClient.h",
@@ -53,10 +53,10 @@
deps = [
":dawn_wire_gen",
- "${dawn_root}/src/common",
+ "${dawn_root}/src/dawn/common",
]
- configs = [ "${dawn_root}/src/common:dawn_internal" ]
+ configs = [ "${dawn_root}/src/dawn/common:internal_config" ]
sources = get_target_outputs(":dawn_wire_gen")
sources += [
"BufferConsumer.h",
diff --git a/src/dawn_wire/ChunkedCommandHandler.cpp b/src/dawn_wire/ChunkedCommandHandler.cpp
index d513b5e..beb4896 100644
--- a/src/dawn_wire/ChunkedCommandHandler.cpp
+++ b/src/dawn_wire/ChunkedCommandHandler.cpp
@@ -14,7 +14,7 @@
#include "dawn_wire/ChunkedCommandHandler.h"
-#include "common/Alloc.h"
+#include "dawn/common/Alloc.h"
#include <algorithm>
#include <cstring>
diff --git a/src/dawn_wire/ChunkedCommandHandler.h b/src/dawn_wire/ChunkedCommandHandler.h
index d7d2c06..422f789 100644
--- a/src/dawn_wire/ChunkedCommandHandler.h
+++ b/src/dawn_wire/ChunkedCommandHandler.h
@@ -15,7 +15,7 @@
#ifndef DAWNWIRE_CHUNKEDCOMMANDHANDLER_H_
#define DAWNWIRE_CHUNKEDCOMMANDHANDLER_H_
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_wire/Wire.h"
#include "dawn_wire/WireCmd_autogen.h"
diff --git a/src/dawn_wire/ChunkedCommandSerializer.h b/src/dawn_wire/ChunkedCommandSerializer.h
index 10572b1..d764b72 100644
--- a/src/dawn_wire/ChunkedCommandSerializer.h
+++ b/src/dawn_wire/ChunkedCommandSerializer.h
@@ -15,8 +15,8 @@
#ifndef DAWNWIRE_CHUNKEDCOMMANDSERIALIZER_H_
#define DAWNWIRE_CHUNKEDCOMMANDSERIALIZER_H_
-#include "common/Alloc.h"
-#include "common/Compiler.h"
+#include "dawn/common/Alloc.h"
+#include "dawn/common/Compiler.h"
#include "dawn_wire/Wire.h"
#include "dawn_wire/WireCmd_autogen.h"
diff --git a/src/dawn_wire/WireResult.h b/src/dawn_wire/WireResult.h
index 165b57a..4025c2c 100644
--- a/src/dawn_wire/WireResult.h
+++ b/src/dawn_wire/WireResult.h
@@ -15,7 +15,7 @@
#ifndef DAWNWIRE_WIRERESULT_H_
#define DAWNWIRE_WIRERESULT_H_
-#include "common/Compiler.h"
+#include "dawn/common/Compiler.h"
namespace dawn::wire {
diff --git a/src/dawn_wire/client/Adapter.cpp b/src/dawn_wire/client/Adapter.cpp
index 4b4908c..48a125b 100644
--- a/src/dawn_wire/client/Adapter.cpp
+++ b/src/dawn_wire/client/Adapter.cpp
@@ -14,7 +14,7 @@
#include "dawn_wire/client/Adapter.h"
-#include "common/Log.h"
+#include "dawn/common/Log.h"
#include "dawn_wire/client/Client.h"
namespace dawn::wire::client {
diff --git a/src/dawn_wire/client/Client.cpp b/src/dawn_wire/client/Client.cpp
index f5c1370..bf6f410 100644
--- a/src/dawn_wire/client/Client.cpp
+++ b/src/dawn_wire/client/Client.cpp
@@ -14,7 +14,7 @@
#include "dawn_wire/client/Client.h"
-#include "common/Compiler.h"
+#include "dawn/common/Compiler.h"
#include "dawn_wire/client/Device.h"
namespace dawn::wire::client {
diff --git a/src/dawn_wire/client/Client.h b/src/dawn_wire/client/Client.h
index e84f7a5..ba946e9 100644
--- a/src/dawn_wire/client/Client.h
+++ b/src/dawn_wire/client/Client.h
@@ -18,8 +18,8 @@
#include <dawn/webgpu.h>
#include <dawn_wire/Wire.h>
-#include "common/LinkedList.h"
-#include "common/NonCopyable.h"
+#include "dawn/common/LinkedList.h"
+#include "dawn/common/NonCopyable.h"
#include "dawn_wire/ChunkedCommandSerializer.h"
#include "dawn_wire/WireClient.h"
#include "dawn_wire/WireCmd_autogen.h"
diff --git a/src/dawn_wire/client/ClientDoers.cpp b/src/dawn_wire/client/ClientDoers.cpp
index 8f2be8b..4588691 100644
--- a/src/dawn_wire/client/ClientDoers.cpp
+++ b/src/dawn_wire/client/ClientDoers.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_wire/client/Client.h"
#include "dawn_wire/client/Device.h"
diff --git a/src/dawn_wire/client/ClientInlineMemoryTransferService.cpp b/src/dawn_wire/client/ClientInlineMemoryTransferService.cpp
index 0830b88..00e79d4 100644
--- a/src/dawn_wire/client/ClientInlineMemoryTransferService.cpp
+++ b/src/dawn_wire/client/ClientInlineMemoryTransferService.cpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Alloc.h"
-#include "common/Assert.h"
+#include "dawn/common/Alloc.h"
+#include "dawn/common/Assert.h"
#include "dawn_wire/WireClient.h"
#include "dawn_wire/client/Client.h"
diff --git a/src/dawn_wire/client/ClientMemoryTransferService_mock.cpp b/src/dawn_wire/client/ClientMemoryTransferService_mock.cpp
index 451a64c..adbc800 100644
--- a/src/dawn_wire/client/ClientMemoryTransferService_mock.cpp
+++ b/src/dawn_wire/client/ClientMemoryTransferService_mock.cpp
@@ -15,7 +15,7 @@
#include "dawn_wire/client/ClientMemoryTransferService_mock.h"
#include <cstdio>
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
namespace dawn::wire::client {
diff --git a/src/dawn_wire/client/Device.cpp b/src/dawn_wire/client/Device.cpp
index 3b40015..3db96b8 100644
--- a/src/dawn_wire/client/Device.cpp
+++ b/src/dawn_wire/client/Device.cpp
@@ -14,8 +14,8 @@
#include "dawn_wire/client/Device.h"
-#include "common/Assert.h"
-#include "common/Log.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Log.h"
#include "dawn_wire/client/ApiObjects_autogen.h"
#include "dawn_wire/client/Client.h"
#include "dawn_wire/client/ObjectAllocator.h"
diff --git a/src/dawn_wire/client/Device.h b/src/dawn_wire/client/Device.h
index e9c15a6..fa74df0 100644
--- a/src/dawn_wire/client/Device.h
+++ b/src/dawn_wire/client/Device.h
@@ -17,7 +17,7 @@
#include <dawn/webgpu.h>
-#include "common/LinkedList.h"
+#include "dawn/common/LinkedList.h"
#include "dawn_wire/WireCmd_autogen.h"
#include "dawn_wire/client/ApiObjects_autogen.h"
#include "dawn_wire/client/LimitsAndFeatures.h"
diff --git a/src/dawn_wire/client/LimitsAndFeatures.cpp b/src/dawn_wire/client/LimitsAndFeatures.cpp
index 96d4c63..1f6169f 100644
--- a/src/dawn_wire/client/LimitsAndFeatures.cpp
+++ b/src/dawn_wire/client/LimitsAndFeatures.cpp
@@ -14,7 +14,7 @@
#include "dawn_wire/client/LimitsAndFeatures.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_wire/SupportedFeatures.h"
namespace dawn::wire::client {
diff --git a/src/dawn_wire/client/ObjectAllocator.h b/src/dawn_wire/client/ObjectAllocator.h
index 3876e7e..0b42b1c 100644
--- a/src/dawn_wire/client/ObjectAllocator.h
+++ b/src/dawn_wire/client/ObjectAllocator.h
@@ -15,8 +15,8 @@
#ifndef DAWNWIRE_CLIENT_OBJECTALLOCATOR_H_
#define DAWNWIRE_CLIENT_OBJECTALLOCATOR_H_
-#include "common/Assert.h"
-#include "common/Compiler.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Compiler.h"
#include "dawn_wire/WireCmd_autogen.h"
#include <limits>
diff --git a/src/dawn_wire/client/ObjectBase.h b/src/dawn_wire/client/ObjectBase.h
index 1a023f8..7e05ed7 100644
--- a/src/dawn_wire/client/ObjectBase.h
+++ b/src/dawn_wire/client/ObjectBase.h
@@ -17,7 +17,7 @@
#include <dawn/webgpu.h>
-#include "common/LinkedList.h"
+#include "dawn/common/LinkedList.h"
#include "dawn_wire/ObjectType_autogen.h"
namespace dawn::wire::client {
diff --git a/src/dawn_wire/client/RequestTracker.h b/src/dawn_wire/client/RequestTracker.h
index 59aedce..c57ae92 100644
--- a/src/dawn_wire/client/RequestTracker.h
+++ b/src/dawn_wire/client/RequestTracker.h
@@ -15,8 +15,8 @@
#ifndef DAWNWIRE_CLIENT_REQUESTTRACKER_H_
#define DAWNWIRE_CLIENT_REQUESTTRACKER_H_
-#include "common/Assert.h"
-#include "common/NonCopyable.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/NonCopyable.h"
#include <cstdint>
#include <map>
diff --git a/src/dawn_wire/server/ServerBuffer.cpp b/src/dawn_wire/server/ServerBuffer.cpp
index c6eca06..2829287 100644
--- a/src/dawn_wire/server/ServerBuffer.cpp
+++ b/src/dawn_wire/server/ServerBuffer.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_wire/BufferConsumer_impl.h"
#include "dawn_wire/WireCmd_autogen.h"
#include "dawn_wire/server/Server.h"
diff --git a/src/dawn_wire/server/ServerInlineMemoryTransferService.cpp b/src/dawn_wire/server/ServerInlineMemoryTransferService.cpp
index 5dd9281..094b72b 100644
--- a/src/dawn_wire/server/ServerInlineMemoryTransferService.cpp
+++ b/src/dawn_wire/server/ServerInlineMemoryTransferService.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_wire/WireServer.h"
#include "dawn_wire/server/Server.h"
diff --git a/src/dawn_wire/server/ServerMemoryTransferService_mock.cpp b/src/dawn_wire/server/ServerMemoryTransferService_mock.cpp
index b52e8f7..8a4dee6 100644
--- a/src/dawn_wire/server/ServerMemoryTransferService_mock.cpp
+++ b/src/dawn_wire/server/ServerMemoryTransferService_mock.cpp
@@ -14,7 +14,7 @@
#include "dawn_wire/server/ServerMemoryTransferService_mock.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
namespace dawn::wire::server {
diff --git a/src/dawn_wire/server/ServerQueue.cpp b/src/dawn_wire/server/ServerQueue.cpp
index 5d92921..5f68149 100644
--- a/src/dawn_wire/server/ServerQueue.cpp
+++ b/src/dawn_wire/server/ServerQueue.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_wire/server/Server.h"
namespace dawn::wire::server {
diff --git a/src/fuzzers/dawn/BUILD.gn b/src/fuzzers/dawn/BUILD.gn
index c47b79e..23f6081 100644
--- a/src/fuzzers/dawn/BUILD.gn
+++ b/src/fuzzers/dawn/BUILD.gn
@@ -75,9 +75,9 @@
"DawnWireServerFuzzer.h",
]
public_deps = [
- "${dawn_root}/src/common",
"${dawn_root}/src/dawn:dawn_proc",
"${dawn_root}/src/dawn:dawncpp",
+ "${dawn_root}/src/dawn/common",
"${dawn_root}/src/dawn_native:dawn_native_static",
"${dawn_root}/src/dawn_wire:dawn_wire_static",
"${dawn_root}/src/utils:dawn_utils",
@@ -89,7 +89,7 @@
deps = [ ":dawn_wire_server_fuzzer_common" ]
- additional_configs = [ "${dawn_root}/src/common:dawn_internal" ]
+ additional_configs = [ "${dawn_root}/src/dawn/common:internal_config" ]
}
if (is_win) {
@@ -98,7 +98,7 @@
deps = [ ":dawn_wire_server_fuzzer_common" ]
- additional_configs = [ "${dawn_root}/src/common:dawn_internal" ]
+ additional_configs = [ "${dawn_root}/src/dawn/common:internal_config" ]
}
}
@@ -107,7 +107,7 @@
deps = [ ":dawn_wire_server_fuzzer_common" ]
- additional_configs = [ "${dawn_root}/src/common:dawn_internal" ]
+ additional_configs = [ "${dawn_root}/src/dawn/common:internal_config" ]
}
# A group target to build all the fuzzers
diff --git a/src/fuzzers/dawn/DawnWireServerAndFrontendFuzzer.cpp b/src/fuzzers/dawn/DawnWireServerAndFrontendFuzzer.cpp
index 0a6f3f0..47c5312 100644
--- a/src/fuzzers/dawn/DawnWireServerAndFrontendFuzzer.cpp
+++ b/src/fuzzers/dawn/DawnWireServerAndFrontendFuzzer.cpp
@@ -14,7 +14,7 @@
#include "DawnWireServerFuzzer.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/DawnNative.h"
#include "testing/libfuzzer/libfuzzer_exports.h"
diff --git a/src/fuzzers/dawn/DawnWireServerFuzzer.cpp b/src/fuzzers/dawn/DawnWireServerFuzzer.cpp
index 367d79a..ba12da3 100644
--- a/src/fuzzers/dawn/DawnWireServerFuzzer.cpp
+++ b/src/fuzzers/dawn/DawnWireServerFuzzer.cpp
@@ -14,9 +14,9 @@
#include "DawnWireServerFuzzer.h"
-#include "common/Assert.h"
-#include "common/Log.h"
-#include "common/SystemUtils.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Log.h"
+#include "dawn/common/SystemUtils.h"
#include "dawn/dawn_proc.h"
#include "dawn/webgpu_cpp.h"
#include "dawn_native/DawnNative.h"
diff --git a/src/tests/BUILD.gn b/src/tests/BUILD.gn
index 862f611..9d6287e 100644
--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -160,15 +160,15 @@
}
test("dawn_unittests") {
- configs += [ "${dawn_root}/src/common:dawn_internal" ]
+ configs += [ "${dawn_root}/src/dawn/common:internal_config" ]
deps = [
":dawn_native_mocks_sources",
":gmock_and_gtest",
":mock_webgpu_gen",
- "${dawn_root}/src/common",
"${dawn_root}/src/dawn:dawn_proc",
"${dawn_root}/src/dawn:dawncpp",
+ "${dawn_root}/src/dawn/common",
"${dawn_root}/src/dawn_native:dawn_native_sources",
"${dawn_root}/src/dawn_native:dawn_native_static",
"${dawn_root}/src/dawn_wire",
@@ -318,14 +318,14 @@
###############################################################################
source_set("dawn_end2end_tests_sources") {
- configs += [ "${dawn_root}/src/common:dawn_internal" ]
+ configs += [ "${dawn_root}/src/dawn/common:internal_config" ]
testonly = true
deps = [
":gmock_and_gtest",
- "${dawn_root}/src/common",
"${dawn_root}/src/dawn:dawn_proc",
"${dawn_root}/src/dawn:dawncpp",
+ "${dawn_root}/src/dawn/common",
# Statically linked because the end2end white_box tests use Dawn internals.
"${dawn_root}/src/dawn_native:dawn_native_static",
@@ -471,9 +471,9 @@
deps = [
":gmock_and_gtest",
- "${dawn_root}/src/common",
"${dawn_root}/src/dawn:dawn_proc",
"${dawn_root}/src/dawn:dawncpp",
+ "${dawn_root}/src/dawn/common",
"${dawn_root}/src/dawn_native:dawn_native_sources",
# Statically linked because the end2end white_box tests use Dawn internals.
@@ -542,15 +542,15 @@
}
test("dawn_end2end_tests") {
- configs += [ "${dawn_root}/src/common:dawn_internal" ]
+ configs += [ "${dawn_root}/src/dawn/common:internal_config" ]
deps = [
":dawn_end2end_tests_sources",
":dawn_white_box_tests_sources",
":gmock_and_gtest",
- "${dawn_root}/src/common",
"${dawn_root}/src/dawn:dawn_proc",
"${dawn_root}/src/dawn:dawncpp",
+ "${dawn_root}/src/dawn/common",
"${dawn_root}/src/dawn_native:dawn_native_static",
"${dawn_root}/src/dawn_wire",
"${dawn_root}/src/utils:dawn_utils",
@@ -585,13 +585,13 @@
###############################################################################
test("dawn_perf_tests") {
- configs += [ "${dawn_root}/src/common:dawn_internal" ]
+ configs += [ "${dawn_root}/src/dawn/common:internal_config" ]
deps = [
":gmock_and_gtest",
- "${dawn_root}/src/common",
"${dawn_root}/src/dawn:dawn_proc",
"${dawn_root}/src/dawn:dawncpp",
+ "${dawn_root}/src/dawn/common",
"${dawn_root}/src/dawn_native",
"${dawn_root}/src/dawn_platform",
"${dawn_root}/src/dawn_wire",
diff --git a/src/tests/DawnNativeTest.cpp b/src/tests/DawnNativeTest.cpp
index 7532dfd..4c30730 100644
--- a/src/tests/DawnNativeTest.cpp
+++ b/src/tests/DawnNativeTest.cpp
@@ -15,7 +15,7 @@
#include "tests/DawnNativeTest.h"
#include "absl/strings/str_cat.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn/dawn_proc.h"
#include "dawn_native/ErrorData.h"
diff --git a/src/tests/DawnTest.cpp b/src/tests/DawnTest.cpp
index 018fc72..30a14bd 100644
--- a/src/tests/DawnTest.cpp
+++ b/src/tests/DawnTest.cpp
@@ -14,12 +14,12 @@
#include "tests/DawnTest.h"
-#include "common/Assert.h"
-#include "common/GPUInfo.h"
-#include "common/Log.h"
-#include "common/Math.h"
-#include "common/Platform.h"
-#include "common/SystemUtils.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/GPUInfo.h"
+#include "dawn/common/Log.h"
+#include "dawn/common/Math.h"
+#include "dawn/common/Platform.h"
+#include "dawn/common/SystemUtils.h"
#include "dawn/dawn_proc.h"
#include "dawn_wire/WireClient.h"
#include "dawn_wire/WireServer.h"
diff --git a/src/tests/DawnTest.h b/src/tests/DawnTest.h
index 9c9f228..f074cc0 100644
--- a/src/tests/DawnTest.h
+++ b/src/tests/DawnTest.h
@@ -15,9 +15,9 @@
#ifndef TESTS_DAWNTEST_H_
#define TESTS_DAWNTEST_H_
-#include "common/Log.h"
-#include "common/Platform.h"
-#include "common/Preprocessor.h"
+#include "dawn/common/Log.h"
+#include "dawn/common/Platform.h"
+#include "dawn/common/Preprocessor.h"
#include "dawn/dawn_proc_table.h"
#include "dawn/webgpu_cpp.h"
#include "dawn/webgpu_cpp_print.h"
@@ -675,7 +675,7 @@
// Instantiate the test once for each backend provided in the first param list.
// The test will be parameterized over the following param lists.
// Use it like this:
-// DAWN_INSTANTIATE_TEST_P(MyTestFixture, {MetalBackend(), OpenGLBackend()}, {A, B, C}, {1, 2, 3})
+// DAWN_INSTANTIATE_TEST_P(MyTestFixture, {MetalBackend(), OpenGLBackend()}, {A, B}, {1, 2})
// MyTestFixture must extend DawnTestWithParams<Param> where Param is a struct that extends
// AdapterTestParam, and whose constructor looks like:
// Param(AdapterTestParam, ABorC, 12or3, ..., otherParams... )
diff --git a/src/tests/MockCallback.h b/src/tests/MockCallback.h
index 4acb904..2b795ed 100644
--- a/src/tests/MockCallback.h
+++ b/src/tests/MockCallback.h
@@ -14,7 +14,7 @@
#include <gmock/gmock.h>
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include <memory>
#include <set>
diff --git a/src/tests/end2end/AdapterDiscoveryTests.cpp b/src/tests/end2end/AdapterDiscoveryTests.cpp
index e2841cf..ecb7604 100644
--- a/src/tests/end2end/AdapterDiscoveryTests.cpp
+++ b/src/tests/end2end/AdapterDiscoveryTests.cpp
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/GPUInfo.h"
-#include "common/Log.h"
-#include "common/Platform.h"
-#include "common/SystemUtils.h"
+#include "dawn/common/GPUInfo.h"
+#include "dawn/common/Log.h"
+#include "dawn/common/Platform.h"
+#include "dawn/common/SystemUtils.h"
#include "dawn/dawn_proc.h"
#include "dawn/webgpu_cpp.h"
#include "dawn_native/DawnNative.h"
diff --git a/src/tests/end2end/BindGroupTests.cpp b/src/tests/end2end/BindGroupTests.cpp
index 10216cc..ff1a9e6 100644
--- a/src/tests/end2end/BindGroupTests.cpp
+++ b/src/tests/end2end/BindGroupTests.cpp
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Assert.h"
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "tests/DawnTest.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/BufferZeroInitTests.cpp b/src/tests/end2end/BufferZeroInitTests.cpp
index 8d86b25..034fbd6 100644
--- a/src/tests/end2end/BufferZeroInitTests.cpp
+++ b/src/tests/end2end/BufferZeroInitTests.cpp
@@ -14,7 +14,7 @@
#include "tests/DawnTest.h"
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/TestUtils.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/ColorStateTests.cpp b/src/tests/end2end/ColorStateTests.cpp
index 5d35619..69f2287 100644
--- a/src/tests/end2end/ColorStateTests.cpp
+++ b/src/tests/end2end/ColorStateTests.cpp
@@ -18,8 +18,8 @@
#include "tests/DawnTest.h"
-#include "common/Assert.h"
-#include "common/Constants.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Constants.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/CompressedTextureFormatTests.cpp b/src/tests/end2end/CompressedTextureFormatTests.cpp
index c209fe8..8110d12 100644
--- a/src/tests/end2end/CompressedTextureFormatTests.cpp
+++ b/src/tests/end2end/CompressedTextureFormatTests.cpp
@@ -14,9 +14,9 @@
#include "tests/DawnTest.h"
-#include "common/Assert.h"
-#include "common/Constants.h"
-#include "common/Math.h"
+#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"
diff --git a/src/tests/end2end/ComputeLayoutMemoryBufferTests.cpp b/src/tests/end2end/ComputeLayoutMemoryBufferTests.cpp
index aac6c30..3140e49 100644
--- a/src/tests/end2end/ComputeLayoutMemoryBufferTests.cpp
+++ b/src/tests/end2end/ComputeLayoutMemoryBufferTests.cpp
@@ -14,7 +14,7 @@
#include "tests/DawnTest.h"
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "utils/WGPUHelpers.h"
#include <array>
diff --git a/src/tests/end2end/CopyTests.cpp b/src/tests/end2end/CopyTests.cpp
index 20cacaa..829d7b7 100644
--- a/src/tests/end2end/CopyTests.cpp
+++ b/src/tests/end2end/CopyTests.cpp
@@ -15,8 +15,8 @@
#include "tests/DawnTest.h"
#include <array>
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "utils/TestUtils.h"
#include "utils/TextureUtils.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/CopyTextureForBrowserTests.cpp b/src/tests/end2end/CopyTextureForBrowserTests.cpp
index ed3991b..cb3b0e3 100644
--- a/src/tests/end2end/CopyTextureForBrowserTests.cpp
+++ b/src/tests/end2end/CopyTextureForBrowserTests.cpp
@@ -14,8 +14,8 @@
#include "tests/DawnTest.h"
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/TestUtils.h"
#include "utils/TextureUtils.h"
diff --git a/src/tests/end2end/DeprecatedAPITests.cpp b/src/tests/end2end/DeprecatedAPITests.cpp
index 8a188473..febdee3 100644
--- a/src/tests/end2end/DeprecatedAPITests.cpp
+++ b/src/tests/end2end/DeprecatedAPITests.cpp
@@ -19,7 +19,7 @@
#include "tests/DawnTest.h"
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/DepthBiasTests.cpp b/src/tests/end2end/DepthBiasTests.cpp
index d1023ad..075d132 100644
--- a/src/tests/end2end/DepthBiasTests.cpp
+++ b/src/tests/end2end/DepthBiasTests.cpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "tests/DawnTest.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/TextureUtils.h"
diff --git a/src/tests/end2end/DepthStencilCopyTests.cpp b/src/tests/end2end/DepthStencilCopyTests.cpp
index c94738d..4d847ca 100644
--- a/src/tests/end2end/DepthStencilCopyTests.cpp
+++ b/src/tests/end2end/DepthStencilCopyTests.cpp
@@ -15,8 +15,8 @@
#include "tests/DawnTest.h"
#include <array>
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/TestUtils.h"
#include "utils/TextureUtils.h"
diff --git a/src/tests/end2end/DepthStencilSamplingTests.cpp b/src/tests/end2end/DepthStencilSamplingTests.cpp
index 6a1a721..7b1085a 100644
--- a/src/tests/end2end/DepthStencilSamplingTests.cpp
+++ b/src/tests/end2end/DepthStencilSamplingTests.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "tests/DawnTest.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/DepthStencilStateTests.cpp b/src/tests/end2end/DepthStencilStateTests.cpp
index ccc108c..98ae22d 100644
--- a/src/tests/end2end/DepthStencilStateTests.cpp
+++ b/src/tests/end2end/DepthStencilStateTests.cpp
@@ -14,7 +14,7 @@
#include "tests/DawnTest.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/DynamicBufferOffsetTests.cpp b/src/tests/end2end/DynamicBufferOffsetTests.cpp
index 4315f00..3719486 100644
--- a/src/tests/end2end/DynamicBufferOffsetTests.cpp
+++ b/src/tests/end2end/DynamicBufferOffsetTests.cpp
@@ -14,7 +14,7 @@
#include "tests/DawnTest.h"
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/GpuMemorySynchronizationTests.cpp b/src/tests/end2end/GpuMemorySynchronizationTests.cpp
index 9c4cd3b..62b509d 100644
--- a/src/tests/end2end/GpuMemorySynchronizationTests.cpp
+++ b/src/tests/end2end/GpuMemorySynchronizationTests.cpp
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Assert.h"
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "tests/DawnTest.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/IndexFormatTests.cpp b/src/tests/end2end/IndexFormatTests.cpp
index f7a397c..485b658 100644
--- a/src/tests/end2end/IndexFormatTests.cpp
+++ b/src/tests/end2end/IndexFormatTests.cpp
@@ -14,7 +14,7 @@
#include "tests/DawnTest.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/MaxLimitTests.cpp b/src/tests/end2end/MaxLimitTests.cpp
index 8bc96b8..b4dddc8 100644
--- a/src/tests/end2end/MaxLimitTests.cpp
+++ b/src/tests/end2end/MaxLimitTests.cpp
@@ -14,8 +14,8 @@
#include "tests/DawnTest.h"
-#include "common/Math.h"
-#include "common/Platform.h"
+#include "dawn/common/Math.h"
+#include "dawn/common/Platform.h"
#include "utils/WGPUHelpers.h"
class MaxLimitTests : public DawnTest {
diff --git a/src/tests/end2end/MultisampledRenderingTests.cpp b/src/tests/end2end/MultisampledRenderingTests.cpp
index 1b6239b..55a79d8 100644
--- a/src/tests/end2end/MultisampledRenderingTests.cpp
+++ b/src/tests/end2end/MultisampledRenderingTests.cpp
@@ -14,7 +14,7 @@
#include "tests/DawnTest.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/MultisampledSamplingTests.cpp b/src/tests/end2end/MultisampledSamplingTests.cpp
index 8759dad..224c37a 100644
--- a/src/tests/end2end/MultisampledSamplingTests.cpp
+++ b/src/tests/end2end/MultisampledSamplingTests.cpp
@@ -14,7 +14,7 @@
#include "tests/DawnTest.h"
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/NonzeroTextureCreationTests.cpp b/src/tests/end2end/NonzeroTextureCreationTests.cpp
index 957fe02..521a77d 100644
--- a/src/tests/end2end/NonzeroTextureCreationTests.cpp
+++ b/src/tests/end2end/NonzeroTextureCreationTests.cpp
@@ -14,8 +14,8 @@
#include "tests/DawnTest.h"
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/TestUtils.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/OpArrayLengthTests.cpp b/src/tests/end2end/OpArrayLengthTests.cpp
index 87df4b3..1765a68 100644
--- a/src/tests/end2end/OpArrayLengthTests.cpp
+++ b/src/tests/end2end/OpArrayLengthTests.cpp
@@ -14,7 +14,7 @@
#include "tests/DawnTest.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/PipelineLayoutTests.cpp b/src/tests/end2end/PipelineLayoutTests.cpp
index 2f47ad2..444217a 100644
--- a/src/tests/end2end/PipelineLayoutTests.cpp
+++ b/src/tests/end2end/PipelineLayoutTests.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include "tests/DawnTest.h"
#include <vector>
diff --git a/src/tests/end2end/PrimitiveStateTests.cpp b/src/tests/end2end/PrimitiveStateTests.cpp
index 990b369..d66419d 100644
--- a/src/tests/end2end/PrimitiveStateTests.cpp
+++ b/src/tests/end2end/PrimitiveStateTests.cpp
@@ -14,7 +14,7 @@
#include "tests/DawnTest.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/PrimitiveTopologyTests.cpp b/src/tests/end2end/PrimitiveTopologyTests.cpp
index a119934..c3138fb 100644
--- a/src/tests/end2end/PrimitiveTopologyTests.cpp
+++ b/src/tests/end2end/PrimitiveTopologyTests.cpp
@@ -14,7 +14,7 @@
#include "tests/DawnTest.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/QueueTests.cpp b/src/tests/end2end/QueueTests.cpp
index 014eb52..962ee39 100644
--- a/src/tests/end2end/QueueTests.cpp
+++ b/src/tests/end2end/QueueTests.cpp
@@ -14,7 +14,7 @@
#include "tests/DawnTest.h"
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "utils/TestUtils.h"
#include "utils/TextureUtils.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/SamplerFilterAnisotropicTests.cpp b/src/tests/end2end/SamplerFilterAnisotropicTests.cpp
index 72a38ad..dec8405 100644
--- a/src/tests/end2end/SamplerFilterAnisotropicTests.cpp
+++ b/src/tests/end2end/SamplerFilterAnisotropicTests.cpp
@@ -16,8 +16,8 @@
#include "tests/DawnTest.h"
-#include "common/Assert.h"
-#include "common/Constants.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Constants.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/SamplerTests.cpp b/src/tests/end2end/SamplerTests.cpp
index f6255c5..8e91b51 100644
--- a/src/tests/end2end/SamplerTests.cpp
+++ b/src/tests/end2end/SamplerTests.cpp
@@ -16,8 +16,8 @@
#include "tests/DawnTest.h"
-#include "common/Assert.h"
-#include "common/Constants.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Constants.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/ShaderFloat16Tests.cpp b/src/tests/end2end/ShaderFloat16Tests.cpp
index e059c9f..9c9ae47 100644
--- a/src/tests/end2end/ShaderFloat16Tests.cpp
+++ b/src/tests/end2end/ShaderFloat16Tests.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "tests/DawnTest.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/StorageTextureTests.cpp b/src/tests/end2end/StorageTextureTests.cpp
index 88c66c5..e098d05 100644
--- a/src/tests/end2end/StorageTextureTests.cpp
+++ b/src/tests/end2end/StorageTextureTests.cpp
@@ -14,9 +14,9 @@
#include "tests/DawnTest.h"
-#include "common/Assert.h"
-#include "common/Constants.h"
-#include "common/Math.h"
+#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"
diff --git a/src/tests/end2end/SubresourceRenderAttachmentTests.cpp b/src/tests/end2end/SubresourceRenderAttachmentTests.cpp
index 47ef741..0a3879c 100644
--- a/src/tests/end2end/SubresourceRenderAttachmentTests.cpp
+++ b/src/tests/end2end/SubresourceRenderAttachmentTests.cpp
@@ -14,7 +14,7 @@
#include "tests/DawnTest.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/SwapChainTests.cpp b/src/tests/end2end/SwapChainTests.cpp
index e7dc654..6c2bac6 100644
--- a/src/tests/end2end/SwapChainTests.cpp
+++ b/src/tests/end2end/SwapChainTests.cpp
@@ -14,8 +14,8 @@
#include "tests/DawnTest.h"
-#include "common/Constants.h"
-#include "common/Log.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Log.h"
#include "utils/GLFWUtils.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/SwapChainValidationTests.cpp b/src/tests/end2end/SwapChainValidationTests.cpp
index 68ab895..cf0598f 100644
--- a/src/tests/end2end/SwapChainValidationTests.cpp
+++ b/src/tests/end2end/SwapChainValidationTests.cpp
@@ -14,8 +14,8 @@
#include "tests/DawnTest.h"
-#include "common/Constants.h"
-#include "common/Log.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Log.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/GLFWUtils.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/TextureFormatTests.cpp b/src/tests/end2end/TextureFormatTests.cpp
index 35afa36..afe160e 100644
--- a/src/tests/end2end/TextureFormatTests.cpp
+++ b/src/tests/end2end/TextureFormatTests.cpp
@@ -14,8 +14,8 @@
#include "tests/DawnTest.h"
-#include "common/Assert.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/TextureUtils.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/TextureViewTests.cpp b/src/tests/end2end/TextureViewTests.cpp
index 431d6a8..76284c1 100644
--- a/src/tests/end2end/TextureViewTests.cpp
+++ b/src/tests/end2end/TextureViewTests.cpp
@@ -14,9 +14,9 @@
#include "tests/DawnTest.h"
-#include "common/Assert.h"
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/TextureZeroInitTests.cpp b/src/tests/end2end/TextureZeroInitTests.cpp
index 523279e..f7ab2ec 100644
--- a/src/tests/end2end/TextureZeroInitTests.cpp
+++ b/src/tests/end2end/TextureZeroInitTests.cpp
@@ -14,7 +14,7 @@
#include "tests/DawnTest.h"
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/TestUtils.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/VertexFormatTests.cpp b/src/tests/end2end/VertexFormatTests.cpp
index f66054f..b9a7b07 100644
--- a/src/tests/end2end/VertexFormatTests.cpp
+++ b/src/tests/end2end/VertexFormatTests.cpp
@@ -14,8 +14,8 @@
#include "tests/DawnTest.h"
-#include "common/Assert.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/VertexStateTests.cpp b/src/tests/end2end/VertexStateTests.cpp
index 7a1ec79..81a37e5 100644
--- a/src/tests/end2end/VertexStateTests.cpp
+++ b/src/tests/end2end/VertexStateTests.cpp
@@ -14,8 +14,8 @@
#include "tests/DawnTest.h"
-#include "common/Assert.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/end2end/VideoViewsTests_gbm.cpp b/src/tests/end2end/VideoViewsTests_gbm.cpp
index a2540e9..c753913 100644
--- a/src/tests/end2end/VideoViewsTests_gbm.cpp
+++ b/src/tests/end2end/VideoViewsTests_gbm.cpp
@@ -14,7 +14,7 @@
#include "VideoViewsTests.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/VulkanBackend.h"
#include <fcntl.h>
diff --git a/src/tests/end2end/VideoViewsTests_win.cpp b/src/tests/end2end/VideoViewsTests_win.cpp
index 1d38e8f..b0c822e 100644
--- a/src/tests/end2end/VideoViewsTests_win.cpp
+++ b/src/tests/end2end/VideoViewsTests_win.cpp
@@ -14,7 +14,7 @@
#include "VideoViewsTests.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/D3D12Backend.h"
#include <d3d11.h>
diff --git a/src/tests/end2end/WindowSurfaceTests.cpp b/src/tests/end2end/WindowSurfaceTests.cpp
index d8160b6..91735e2 100644
--- a/src/tests/end2end/WindowSurfaceTests.cpp
+++ b/src/tests/end2end/WindowSurfaceTests.cpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Log.h"
-#include "common/Platform.h"
+#include "dawn/common/Log.h"
+#include "dawn/common/Platform.h"
#include "dawn/dawn_proc.h"
#include "dawn_native/DawnNative.h"
#include "tests/DawnTest.h"
@@ -25,13 +25,13 @@
// Include windows.h before GLFW so GLFW's APIENTRY macro doesn't conflict with windows.h's.
#if defined(DAWN_PLATFORM_WINDOWS)
-# include "common/windows_with_undefs.h"
+# include "dawn/common/windows_with_undefs.h"
#endif // defined(DAWN_PLATFORM_WINDOWS)
#include "GLFW/glfw3.h"
#if defined(DAWN_USE_X11)
-# include "common/xlib_with_undefs.h"
+# include "dawn/common/xlib_with_undefs.h"
#endif // defined(DAWN_USE_X11)
#if defined(DAWN_ENABLE_BACKEND_METAL)
diff --git a/src/tests/perf_tests/DawnPerfTest.cpp b/src/tests/perf_tests/DawnPerfTest.cpp
index 7504026..c3c9702 100644
--- a/src/tests/perf_tests/DawnPerfTest.cpp
+++ b/src/tests/perf_tests/DawnPerfTest.cpp
@@ -18,8 +18,8 @@
#include <fstream>
#include <limits>
-#include "common/Assert.h"
-#include "common/Log.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Log.h"
#include "dawn_platform/tracing/TraceEvent.h"
#include "tests/perf_tests/DawnPerfTestPlatform.h"
#include "utils/Timer.h"
diff --git a/src/tests/perf_tests/DawnPerfTestPlatform.cpp b/src/tests/perf_tests/DawnPerfTestPlatform.cpp
index a8ddabb..aeaa42f 100644
--- a/src/tests/perf_tests/DawnPerfTestPlatform.cpp
+++ b/src/tests/perf_tests/DawnPerfTestPlatform.cpp
@@ -16,8 +16,8 @@
#include <algorithm>
-#include "common/Assert.h"
-#include "common/HashUtils.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/HashUtils.h"
#include "dawn_platform/tracing/TraceEvent.h"
#include "tests/perf_tests/DawnPerfTest.h"
#include "utils/Timer.h"
diff --git a/src/tests/perf_tests/DrawCallPerf.cpp b/src/tests/perf_tests/DrawCallPerf.cpp
index 288b215..29d5529 100644
--- a/src/tests/perf_tests/DrawCallPerf.cpp
+++ b/src/tests/perf_tests/DrawCallPerf.cpp
@@ -14,9 +14,9 @@
#include "tests/perf_tests/DawnPerfTest.h"
-#include "common/Assert.h"
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/unittests/AsyncTaskTests.cpp b/src/tests/unittests/AsyncTaskTests.cpp
index 2eb0b05..3eb18c9 100644
--- a/src/tests/unittests/AsyncTaskTests.cpp
+++ b/src/tests/unittests/AsyncTaskTests.cpp
@@ -20,7 +20,7 @@
#include <memory>
#include <mutex>
-#include "common/NonCopyable.h"
+#include "dawn/common/NonCopyable.h"
#include "dawn_native/AsyncTask.h"
#include "dawn_platform/DawnPlatform.h"
diff --git a/src/tests/unittests/BitSetIteratorTests.cpp b/src/tests/unittests/BitSetIteratorTests.cpp
index 7bed713..ecdb92c 100644
--- a/src/tests/unittests/BitSetIteratorTests.cpp
+++ b/src/tests/unittests/BitSetIteratorTests.cpp
@@ -14,8 +14,8 @@
#include <gtest/gtest.h>
-#include "common/BitSetIterator.h"
-#include "common/ityp_bitset.h"
+#include "dawn/common/BitSetIterator.h"
+#include "dawn/common/ityp_bitset.h"
// This is ANGLE's BitSetIterator_unittests.cpp file.
diff --git a/src/tests/unittests/ConcurrentCacheTests.cpp b/src/tests/unittests/ConcurrentCacheTests.cpp
index b733397..7ff2761 100644
--- a/src/tests/unittests/ConcurrentCacheTests.cpp
+++ b/src/tests/unittests/ConcurrentCacheTests.cpp
@@ -14,7 +14,7 @@
#include <gtest/gtest.h>
-#include "common/ConcurrentCache.h"
+#include "dawn/common/ConcurrentCache.h"
#include "dawn_native/AsyncTask.h"
#include "dawn_platform/DawnPlatform.h"
#include "utils/SystemUtils.h"
diff --git a/src/tests/unittests/GPUInfoTests.cpp b/src/tests/unittests/GPUInfoTests.cpp
index d7bf441..60e2190 100644
--- a/src/tests/unittests/GPUInfoTests.cpp
+++ b/src/tests/unittests/GPUInfoTests.cpp
@@ -14,7 +14,7 @@
#include <gtest/gtest.h>
-#include "common/GPUInfo.h"
+#include "dawn/common/GPUInfo.h"
namespace {
const PCIVendorID vendorID = 0x8086;
diff --git a/src/tests/unittests/ITypArrayTests.cpp b/src/tests/unittests/ITypArrayTests.cpp
index 8d43947..d8fa1fc 100644
--- a/src/tests/unittests/ITypArrayTests.cpp
+++ b/src/tests/unittests/ITypArrayTests.cpp
@@ -14,8 +14,8 @@
#include <gtest/gtest.h>
-#include "common/TypedInteger.h"
-#include "common/ityp_array.h"
+#include "dawn/common/TypedInteger.h"
+#include "dawn/common/ityp_array.h"
class ITypArrayTest : public testing::Test {
protected:
diff --git a/src/tests/unittests/ITypBitsetTests.cpp b/src/tests/unittests/ITypBitsetTests.cpp
index 178c913..8a82e41 100644
--- a/src/tests/unittests/ITypBitsetTests.cpp
+++ b/src/tests/unittests/ITypBitsetTests.cpp
@@ -14,8 +14,8 @@
#include <gtest/gtest.h>
-#include "common/TypedInteger.h"
-#include "common/ityp_bitset.h"
+#include "dawn/common/TypedInteger.h"
+#include "dawn/common/ityp_bitset.h"
#include <set>
diff --git a/src/tests/unittests/ITypSpanTests.cpp b/src/tests/unittests/ITypSpanTests.cpp
index 16942ac..e04ba5a 100644
--- a/src/tests/unittests/ITypSpanTests.cpp
+++ b/src/tests/unittests/ITypSpanTests.cpp
@@ -14,8 +14,8 @@
#include <gtest/gtest.h>
-#include "common/TypedInteger.h"
-#include "common/ityp_span.h"
+#include "dawn/common/TypedInteger.h"
+#include "dawn/common/ityp_span.h"
#include <array>
diff --git a/src/tests/unittests/ITypVectorTests.cpp b/src/tests/unittests/ITypVectorTests.cpp
index acc92b5..1654a14 100644
--- a/src/tests/unittests/ITypVectorTests.cpp
+++ b/src/tests/unittests/ITypVectorTests.cpp
@@ -14,8 +14,8 @@
#include <gtest/gtest.h>
-#include "common/TypedInteger.h"
-#include "common/ityp_vector.h"
+#include "dawn/common/TypedInteger.h"
+#include "dawn/common/ityp_vector.h"
class ITypVectorTest : public testing::Test {
protected:
diff --git a/src/tests/unittests/LinkedListTests.cpp b/src/tests/unittests/LinkedListTests.cpp
index 72dd411..c4971d8 100644
--- a/src/tests/unittests/LinkedListTests.cpp
+++ b/src/tests/unittests/LinkedListTests.cpp
@@ -6,7 +6,7 @@
#include <gtest/gtest.h>
-#include "common/LinkedList.h"
+#include "dawn/common/LinkedList.h"
#include <list>
diff --git a/src/tests/unittests/MathTests.cpp b/src/tests/unittests/MathTests.cpp
index 71d0e8e..4635b64 100644
--- a/src/tests/unittests/MathTests.cpp
+++ b/src/tests/unittests/MathTests.cpp
@@ -14,8 +14,8 @@
#include <gtest/gtest.h>
-#include "common/Math.h"
#include "dawn/EnumClassBitmasks.h"
+#include "dawn/common/Math.h"
#include <cmath>
#include "dawn/webgpu_cpp.h"
diff --git a/src/tests/unittests/PlacementAllocatedTests.cpp b/src/tests/unittests/PlacementAllocatedTests.cpp
index 10cae04..8ea1481 100644
--- a/src/tests/unittests/PlacementAllocatedTests.cpp
+++ b/src/tests/unittests/PlacementAllocatedTests.cpp
@@ -15,7 +15,7 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
-#include "common/PlacementAllocated.h"
+#include "dawn/common/PlacementAllocated.h"
using namespace testing;
diff --git a/src/tests/unittests/RefBaseTests.cpp b/src/tests/unittests/RefBaseTests.cpp
index 27fd922..a328711 100644
--- a/src/tests/unittests/RefBaseTests.cpp
+++ b/src/tests/unittests/RefBaseTests.cpp
@@ -14,7 +14,7 @@
#include <gmock/gmock.h>
-#include "common/RefBase.h"
+#include "dawn/common/RefBase.h"
namespace {
using Id = uint32_t;
diff --git a/src/tests/unittests/RefCountedTests.cpp b/src/tests/unittests/RefCountedTests.cpp
index 06bd151..5cfa951 100644
--- a/src/tests/unittests/RefCountedTests.cpp
+++ b/src/tests/unittests/RefCountedTests.cpp
@@ -15,7 +15,7 @@
#include <gtest/gtest.h>
#include <thread>
-#include "common/RefCounted.h"
+#include "dawn/common/RefCounted.h"
class RCTest : public RefCounted {
public:
diff --git a/src/tests/unittests/ResultTests.cpp b/src/tests/unittests/ResultTests.cpp
index bd48217..1775c6d 100644
--- a/src/tests/unittests/ResultTests.cpp
+++ b/src/tests/unittests/ResultTests.cpp
@@ -14,8 +14,8 @@
#include <gtest/gtest.h>
-#include "common/RefCounted.h"
-#include "common/Result.h"
+#include "dawn/common/RefCounted.h"
+#include "dawn/common/Result.h"
namespace {
diff --git a/src/tests/unittests/SerialMapTests.cpp b/src/tests/unittests/SerialMapTests.cpp
index d86b11c..a4ac592 100644
--- a/src/tests/unittests/SerialMapTests.cpp
+++ b/src/tests/unittests/SerialMapTests.cpp
@@ -14,8 +14,8 @@
#include <gtest/gtest.h>
-#include "common/SerialMap.h"
-#include "common/TypedInteger.h"
+#include "dawn/common/SerialMap.h"
+#include "dawn/common/TypedInteger.h"
using TestSerialMap = SerialMap<uint64_t, int>;
diff --git a/src/tests/unittests/SerialQueueTests.cpp b/src/tests/unittests/SerialQueueTests.cpp
index 5161b81..56ce97e 100644
--- a/src/tests/unittests/SerialQueueTests.cpp
+++ b/src/tests/unittests/SerialQueueTests.cpp
@@ -14,8 +14,8 @@
#include <gtest/gtest.h>
-#include "common/SerialQueue.h"
-#include "common/TypedInteger.h"
+#include "dawn/common/SerialQueue.h"
+#include "dawn/common/TypedInteger.h"
using TestSerialQueue = SerialQueue<uint64_t, int>;
diff --git a/src/tests/unittests/SlabAllocatorTests.cpp b/src/tests/unittests/SlabAllocatorTests.cpp
index 45011fc..5139172 100644
--- a/src/tests/unittests/SlabAllocatorTests.cpp
+++ b/src/tests/unittests/SlabAllocatorTests.cpp
@@ -14,8 +14,8 @@
#include <gtest/gtest.h>
-#include "common/Math.h"
-#include "common/SlabAllocator.h"
+#include "dawn/common/Math.h"
+#include "dawn/common/SlabAllocator.h"
namespace {
diff --git a/src/tests/unittests/StackContainerTests.cpp b/src/tests/unittests/StackContainerTests.cpp
index f511172..a427215 100644
--- a/src/tests/unittests/StackContainerTests.cpp
+++ b/src/tests/unittests/StackContainerTests.cpp
@@ -6,8 +6,8 @@
#include <gtest/gtest.h>
-#include "common/RefCounted.h"
-#include "common/StackContainer.h"
+#include "dawn/common/RefCounted.h"
+#include "dawn/common/StackContainer.h"
#include <algorithm>
#include <cstddef>
diff --git a/src/tests/unittests/SubresourceStorageTests.cpp b/src/tests/unittests/SubresourceStorageTests.cpp
index f1e28b3..2121752 100644
--- a/src/tests/unittests/SubresourceStorageTests.cpp
+++ b/src/tests/unittests/SubresourceStorageTests.cpp
@@ -16,7 +16,7 @@
#include "dawn_native/SubresourceStorage.h"
-#include "common/Log.h"
+#include "dawn/common/Log.h"
using namespace dawn::native;
diff --git a/src/tests/unittests/SystemUtilsTests.cpp b/src/tests/unittests/SystemUtilsTests.cpp
index d60c61d..15dff17 100644
--- a/src/tests/unittests/SystemUtilsTests.cpp
+++ b/src/tests/unittests/SystemUtilsTests.cpp
@@ -15,8 +15,8 @@
#include <gmock/gmock-matchers.h>
#include <gtest/gtest.h>
-#include "common/Assert.h"
-#include "common/SystemUtils.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/SystemUtils.h"
using ::testing::_;
using ::testing::Pair;
diff --git a/src/tests/unittests/ToBackendTests.cpp b/src/tests/unittests/ToBackendTests.cpp
index 56514bf..d74088e 100644
--- a/src/tests/unittests/ToBackendTests.cpp
+++ b/src/tests/unittests/ToBackendTests.cpp
@@ -14,7 +14,7 @@
#include <gtest/gtest.h>
-#include "common/RefCounted.h"
+#include "dawn/common/RefCounted.h"
#include "dawn_native/ToBackend.h"
#include <type_traits>
diff --git a/src/tests/unittests/TypedIntegerTests.cpp b/src/tests/unittests/TypedIntegerTests.cpp
index efa7d56..8e4d142 100644
--- a/src/tests/unittests/TypedIntegerTests.cpp
+++ b/src/tests/unittests/TypedIntegerTests.cpp
@@ -14,8 +14,8 @@
#include <gtest/gtest.h>
-#include "common/TypedInteger.h"
-#include "common/UnderlyingType.h"
+#include "dawn/common/TypedInteger.h"
+#include "dawn/common/UnderlyingType.h"
class TypedIntegerTest : public testing::Test {
protected:
diff --git a/src/tests/unittests/WindowsUtilsTests.cpp b/src/tests/unittests/WindowsUtilsTests.cpp
index fcf6b69..70b209e 100644
--- a/src/tests/unittests/WindowsUtilsTests.cpp
+++ b/src/tests/unittests/WindowsUtilsTests.cpp
@@ -14,7 +14,7 @@
#include <gtest/gtest.h>
-#include "common/WindowsUtils.h"
+#include "dawn/common/WindowsUtils.h"
TEST(WindowsUtilsTests, WCharToUTF8) {
// Test the empty string
@@ -48,4 +48,4 @@
// Test three-byte utf8 codepoint
ASSERT_EQ(L"\x1050", UTF8ToWStr("\xe1\x81\x90"));
-}
\ No newline at end of file
+}
diff --git a/src/tests/unittests/d3d12/CopySplitTests.cpp b/src/tests/unittests/d3d12/CopySplitTests.cpp
index 0e265a2..3c9802b 100644
--- a/src/tests/unittests/d3d12/CopySplitTests.cpp
+++ b/src/tests/unittests/d3d12/CopySplitTests.cpp
@@ -14,9 +14,9 @@
#include <gtest/gtest.h>
-#include "common/Assert.h"
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "dawn/webgpu_cpp_print.h"
#include "dawn_native/Format.h"
#include "dawn_native/d3d12/TextureCopySplitter.h"
diff --git a/src/tests/unittests/validation/BindGroupValidationTests.cpp b/src/tests/unittests/validation/BindGroupValidationTests.cpp
index b1ec580..1a5124d 100644
--- a/src/tests/unittests/validation/BindGroupValidationTests.cpp
+++ b/src/tests/unittests/validation/BindGroupValidationTests.cpp
@@ -14,8 +14,8 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "common/Assert.h"
-#include "common/Constants.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Constants.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/unittests/validation/ComputeValidationTests.cpp b/src/tests/unittests/validation/ComputeValidationTests.cpp
index b4c0649..f3e335b 100644
--- a/src/tests/unittests/validation/ComputeValidationTests.cpp
+++ b/src/tests/unittests/validation/ComputeValidationTests.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include "tests/unittests/validation/ValidationTest.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/unittests/validation/CopyCommandsValidationTests.cpp b/src/tests/unittests/validation/CopyCommandsValidationTests.cpp
index 28d05e0..fdf6bd0 100644
--- a/src/tests/unittests/validation/CopyCommandsValidationTests.cpp
+++ b/src/tests/unittests/validation/CopyCommandsValidationTests.cpp
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Assert.h"
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "tests/unittests/validation/ValidationTest.h"
#include "utils/TestUtils.h"
#include "utils/TextureUtils.h"
diff --git a/src/tests/unittests/validation/CopyTextureForBrowserTests.cpp b/src/tests/unittests/validation/CopyTextureForBrowserTests.cpp
index 74041d9..f4a344c 100644
--- a/src/tests/unittests/validation/CopyTextureForBrowserTests.cpp
+++ b/src/tests/unittests/validation/CopyTextureForBrowserTests.cpp
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Assert.h"
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "tests/unittests/validation/ValidationTest.h"
#include "utils/TestUtils.h"
#include "utils/TextureUtils.h"
diff --git a/src/tests/unittests/validation/DrawVertexAndIndexBufferOOBValidationTests.cpp b/src/tests/unittests/validation/DrawVertexAndIndexBufferOOBValidationTests.cpp
index 2bf6493..af8db12 100644
--- a/src/tests/unittests/validation/DrawVertexAndIndexBufferOOBValidationTests.cpp
+++ b/src/tests/unittests/validation/DrawVertexAndIndexBufferOOBValidationTests.cpp
@@ -14,7 +14,7 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/unittests/validation/MinimumBufferSizeValidationTests.cpp b/src/tests/unittests/validation/MinimumBufferSizeValidationTests.cpp
index de139b1..1bef6ba 100644
--- a/src/tests/unittests/validation/MinimumBufferSizeValidationTests.cpp
+++ b/src/tests/unittests/validation/MinimumBufferSizeValidationTests.cpp
@@ -14,8 +14,8 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "common/Assert.h"
-#include "common/Constants.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Constants.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/unittests/validation/OverridableConstantsValidationTests.cpp b/src/tests/unittests/validation/OverridableConstantsValidationTests.cpp
index 35daa8c..4691712 100644
--- a/src/tests/unittests/validation/OverridableConstantsValidationTests.cpp
+++ b/src/tests/unittests/validation/OverridableConstantsValidationTests.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include "tests/unittests/validation/ValidationTest.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/unittests/validation/QueueWriteTextureValidationTests.cpp b/src/tests/unittests/validation/QueueWriteTextureValidationTests.cpp
index d55be2f..b5c02c4 100644
--- a/src/tests/unittests/validation/QueueWriteTextureValidationTests.cpp
+++ b/src/tests/unittests/validation/QueueWriteTextureValidationTests.cpp
@@ -14,7 +14,7 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "utils/TestUtils.h"
#include "utils/TextureUtils.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/unittests/validation/RenderBundleValidationTests.cpp b/src/tests/unittests/validation/RenderBundleValidationTests.cpp
index dacac2c..c4cb2f7 100644
--- a/src/tests/unittests/validation/RenderBundleValidationTests.cpp
+++ b/src/tests/unittests/validation/RenderBundleValidationTests.cpp
@@ -14,7 +14,7 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include "utils/ComboRenderBundleEncoderDescriptor.h"
#include "utils/ComboRenderPipelineDescriptor.h"
diff --git a/src/tests/unittests/validation/RenderPassDescriptorValidationTests.cpp b/src/tests/unittests/validation/RenderPassDescriptorValidationTests.cpp
index 703153e..cbe0d01 100644
--- a/src/tests/unittests/validation/RenderPassDescriptorValidationTests.cpp
+++ b/src/tests/unittests/validation/RenderPassDescriptorValidationTests.cpp
@@ -14,7 +14,7 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/unittests/validation/RenderPipelineValidationTests.cpp b/src/tests/unittests/validation/RenderPipelineValidationTests.cpp
index c64bca6..db70e33 100644
--- a/src/tests/unittests/validation/RenderPipelineValidationTests.cpp
+++ b/src/tests/unittests/validation/RenderPipelineValidationTests.cpp
@@ -14,7 +14,7 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/unittests/validation/ShaderModuleValidationTests.cpp b/src/tests/unittests/validation/ShaderModuleValidationTests.cpp
index 8d6a743..05d4c6e 100644
--- a/src/tests/unittests/validation/ShaderModuleValidationTests.cpp
+++ b/src/tests/unittests/validation/ShaderModuleValidationTests.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include "dawn_native/ShaderModule.h"
diff --git a/src/tests/unittests/validation/StorageTextureValidationTests.cpp b/src/tests/unittests/validation/StorageTextureValidationTests.cpp
index 1be9e84..b60df62 100644
--- a/src/tests/unittests/validation/StorageTextureValidationTests.cpp
+++ b/src/tests/unittests/validation/StorageTextureValidationTests.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "tests/unittests/validation/ValidationTest.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/TextureUtils.h"
diff --git a/src/tests/unittests/validation/TextureValidationTests.cpp b/src/tests/unittests/validation/TextureValidationTests.cpp
index 34ff923..1af5c2c 100644
--- a/src/tests/unittests/validation/TextureValidationTests.cpp
+++ b/src/tests/unittests/validation/TextureValidationTests.cpp
@@ -14,8 +14,8 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/TextureUtils.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/tests/unittests/validation/ValidationTest.cpp b/src/tests/unittests/validation/ValidationTest.cpp
index 9887184..62f8ba0 100644
--- a/src/tests/unittests/validation/ValidationTest.cpp
+++ b/src/tests/unittests/validation/ValidationTest.cpp
@@ -14,8 +14,8 @@
#include "tests/unittests/validation/ValidationTest.h"
-#include "common/Assert.h"
-#include "common/SystemUtils.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/SystemUtils.h"
#include "dawn/dawn_proc.h"
#include "dawn/webgpu.h"
#include "dawn_native/NullBackend.h"
diff --git a/src/tests/unittests/validation/ValidationTest.h b/src/tests/unittests/validation/ValidationTest.h
index 9e0e78b..89bea80 100644
--- a/src/tests/unittests/validation/ValidationTest.h
+++ b/src/tests/unittests/validation/ValidationTest.h
@@ -15,7 +15,7 @@
#ifndef TESTS_UNITTESTS_VALIDATIONTEST_H_
#define TESTS_UNITTESTS_VALIDATIONTEST_H_
-#include "common/Log.h"
+#include "dawn/common/Log.h"
#include "dawn/webgpu_cpp.h"
#include "dawn_native/DawnNative.h"
diff --git a/src/tests/unittests/wire/WireArgumentTests.cpp b/src/tests/unittests/wire/WireArgumentTests.cpp
index 01827ff..dee3070 100644
--- a/src/tests/unittests/wire/WireArgumentTests.cpp
+++ b/src/tests/unittests/wire/WireArgumentTests.cpp
@@ -14,7 +14,7 @@
#include "tests/unittests/wire/WireTest.h"
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include <array>
diff --git a/src/tests/unittests/wire/WireDisconnectTests.cpp b/src/tests/unittests/wire/WireDisconnectTests.cpp
index 24344ca..551b6de 100644
--- a/src/tests/unittests/wire/WireDisconnectTests.cpp
+++ b/src/tests/unittests/wire/WireDisconnectTests.cpp
@@ -14,7 +14,7 @@
#include "tests/unittests/wire/WireTest.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_wire/WireClient.h"
#include "tests/MockCallback.h"
diff --git a/src/tests/white_box/BufferAllocatedSizeTests.cpp b/src/tests/white_box/BufferAllocatedSizeTests.cpp
index e100dc7..eef4a29 100644
--- a/src/tests/white_box/BufferAllocatedSizeTests.cpp
+++ b/src/tests/white_box/BufferAllocatedSizeTests.cpp
@@ -14,7 +14,7 @@
#include "tests/DawnTest.h"
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "dawn_native/DawnNative.h"
#include <algorithm>
diff --git a/src/tests/white_box/EGLImageWrappingTests.cpp b/src/tests/white_box/EGLImageWrappingTests.cpp
index 7fb5fa6..cd6b1ea 100644
--- a/src/tests/white_box/EGLImageWrappingTests.cpp
+++ b/src/tests/white_box/EGLImageWrappingTests.cpp
@@ -14,7 +14,7 @@
#include "tests/DawnTest.h"
-#include "common/DynamicLib.h"
+#include "dawn/common/DynamicLib.h"
#include "dawn_native/OpenGLBackend.h"
#include "dawn_native/opengl/DeviceGL.h"
#include "utils/ComboRenderPipelineDescriptor.h"
diff --git a/src/tests/white_box/VulkanErrorInjectorTests.cpp b/src/tests/white_box/VulkanErrorInjectorTests.cpp
index e442279..6747313 100644
--- a/src/tests/white_box/VulkanErrorInjectorTests.cpp
+++ b/src/tests/white_box/VulkanErrorInjectorTests.cpp
@@ -14,8 +14,8 @@
#include "tests/DawnTest.h"
-#include "common/Math.h"
-#include "common/vulkan_platform.h"
+#include "dawn/common/Math.h"
+#include "dawn/common/vulkan_platform.h"
#include "dawn_native/ErrorData.h"
#include "dawn_native/VulkanBackend.h"
#include "dawn_native/vulkan/DeviceVk.h"
diff --git a/src/tests/white_box/VulkanImageWrappingTests.cpp b/src/tests/white_box/VulkanImageWrappingTests.cpp
index 3e14da5..bda4853 100644
--- a/src/tests/white_box/VulkanImageWrappingTests.cpp
+++ b/src/tests/white_box/VulkanImageWrappingTests.cpp
@@ -14,7 +14,7 @@
#include "tests/white_box/VulkanImageWrappingTests.h"
-#include "common/Math.h"
+#include "dawn/common/Math.h"
#include "dawn_native/vulkan/AdapterVk.h"
#include "dawn_native/vulkan/DeviceVk.h"
#include "tests/DawnTest.h"
diff --git a/src/tests/white_box/VulkanImageWrappingTests.h b/src/tests/white_box/VulkanImageWrappingTests.h
index 6c2deb7..c630c70 100644
--- a/src/tests/white_box/VulkanImageWrappingTests.h
+++ b/src/tests/white_box/VulkanImageWrappingTests.h
@@ -17,9 +17,9 @@
// This must be above all other includes otherwise VulkanBackend.h includes vulkan.h before we had
// time to wrap it with vulkan_platform.h
-#include "common/vulkan_platform.h"
+#include "dawn/common/vulkan_platform.h"
-#include "common/NonCopyable.h"
+#include "dawn/common/NonCopyable.h"
#include "dawn/webgpu_cpp.h"
#include "dawn_native/VulkanBackend.h"
diff --git a/src/utils/BUILD.gn b/src/utils/BUILD.gn
index f372b07..3d3f2fe 100644
--- a/src/utils/BUILD.gn
+++ b/src/utils/BUILD.gn
@@ -50,7 +50,7 @@
"Glfw3Fuchsia.cpp",
]
public_configs = [ ":dawn_glfw_public_config" ]
- deps = [ "${dawn_root}/src/common" ]
+ deps = [ "${dawn_root}/src/dawn/common" ]
}
} else {
# Just skip GLFW on other systems
@@ -63,7 +63,7 @@
###############################################################################
static_library("dawn_utils") {
- configs += [ "${dawn_root}/src/common:dawn_internal" ]
+ configs += [ "${dawn_root}/src/dawn/common:internal_config" ]
sources = [
"ComboRenderBundleEncoderDescriptor.cpp",
@@ -87,8 +87,8 @@
"WireHelper.h",
]
deps = [
- "${dawn_root}/src/common",
"${dawn_root}/src/dawn:dawn_proc",
+ "${dawn_root}/src/dawn/common",
"${dawn_root}/src/dawn_native:dawn_native_headers",
"${dawn_root}/src/dawn_wire",
"${dawn_spirv_tools_dir}:spvtools_opt",
@@ -144,7 +144,7 @@
if (dawn_standalone) {
# Library to handle the interaction of Dawn with GLFW windows in samples
static_library("dawn_bindings") {
- configs += [ "${dawn_root}/src/common:dawn_internal" ]
+ configs += [ "${dawn_root}/src/dawn/common:internal_config" ]
sources = [
"BackendBinding.cpp",
@@ -155,7 +155,7 @@
deps = [
":dawn_glfw",
- "${dawn_root}/src/common",
+ "${dawn_root}/src/dawn/common",
"${dawn_root}/src/dawn_native",
]
libs = []
diff --git a/src/utils/BackendBinding.cpp b/src/utils/BackendBinding.cpp
index d5de4bc..e1aef2c 100644
--- a/src/utils/BackendBinding.cpp
+++ b/src/utils/BackendBinding.cpp
@@ -14,7 +14,7 @@
#include "utils/BackendBinding.h"
-#include "common/Compiler.h"
+#include "dawn/common/Compiler.h"
#include "GLFW/glfw3.h"
diff --git a/src/utils/ComboRenderBundleEncoderDescriptor.h b/src/utils/ComboRenderBundleEncoderDescriptor.h
index cd6044b..c1ef12b 100644
--- a/src/utils/ComboRenderBundleEncoderDescriptor.h
+++ b/src/utils/ComboRenderBundleEncoderDescriptor.h
@@ -17,7 +17,7 @@
#include <dawn/webgpu_cpp.h>
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include <array>
diff --git a/src/utils/ComboRenderPipelineDescriptor.h b/src/utils/ComboRenderPipelineDescriptor.h
index 451c003..1e4662f 100644
--- a/src/utils/ComboRenderPipelineDescriptor.h
+++ b/src/utils/ComboRenderPipelineDescriptor.h
@@ -17,7 +17,7 @@
#include <dawn/webgpu_cpp.h>
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include <array>
diff --git a/src/utils/D3D12Binding.cpp b/src/utils/D3D12Binding.cpp
index 99a34b9..2f54934 100644
--- a/src/utils/D3D12Binding.cpp
+++ b/src/utils/D3D12Binding.cpp
@@ -14,7 +14,7 @@
#include "utils/BackendBinding.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/D3D12Backend.h"
#include "GLFW/glfw3.h"
diff --git a/src/utils/GLFWUtils.cpp b/src/utils/GLFWUtils.cpp
index 9efbfb6d..1ac5b38 100644
--- a/src/utils/GLFWUtils.cpp
+++ b/src/utils/GLFWUtils.cpp
@@ -15,7 +15,7 @@
#include "utils/GLFWUtils.h"
#include "GLFW/glfw3.h"
-#include "common/Platform.h"
+#include "dawn/common/Platform.h"
#include <cstdlib>
diff --git a/src/utils/Glfw3Fuchsia.cpp b/src/utils/Glfw3Fuchsia.cpp
index cc8ed3b..4caa7ac 100644
--- a/src/utils/Glfw3Fuchsia.cpp
+++ b/src/utils/Glfw3Fuchsia.cpp
@@ -20,8 +20,8 @@
// the first header to do so for sanity reasons (e.g. undefining weird
// macros on Windows and Linux).
// clang-format off
-#include "common/vulkan_platform.h"
-#include "common/Assert.h"
+#include "dawn/common/vulkan_platform.h"
+#include "dawn/common/Assert.h"
#include <GLFW/glfw3.h>
// clang-format on
diff --git a/src/utils/MetalBinding.mm b/src/utils/MetalBinding.mm
index 1abeb31..d3ab144 100644
--- a/src/utils/MetalBinding.mm
+++ b/src/utils/MetalBinding.mm
@@ -14,8 +14,8 @@
#include "utils/BackendBinding.h"
-#include "common/Assert.h"
-#include "common/SwapChainUtils.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/SwapChainUtils.h"
#include "dawn_native/MetalBackend.h"
#define GLFW_EXPOSE_NATIVE_COCOA
diff --git a/src/utils/NullBinding.cpp b/src/utils/NullBinding.cpp
index 2060655..8fdc2e8 100644
--- a/src/utils/NullBinding.cpp
+++ b/src/utils/NullBinding.cpp
@@ -14,7 +14,7 @@
#include "utils/BackendBinding.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/NullBackend.h"
#include <memory>
diff --git a/src/utils/OpenGLBinding.cpp b/src/utils/OpenGLBinding.cpp
index d407933..3521b1b 100644
--- a/src/utils/OpenGLBinding.cpp
+++ b/src/utils/OpenGLBinding.cpp
@@ -14,9 +14,9 @@
#include "utils/BackendBinding.h"
-#include "common/Assert.h"
-#include "common/Platform.h"
-#include "common/SwapChainUtils.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Platform.h"
+#include "dawn/common/SwapChainUtils.h"
#include "dawn/dawn_wsi.h"
#include "dawn_native/OpenGLBackend.h"
diff --git a/src/utils/ScopedAutoreleasePool.cpp b/src/utils/ScopedAutoreleasePool.cpp
index 0cee799..b0c5d81 100644
--- a/src/utils/ScopedAutoreleasePool.cpp
+++ b/src/utils/ScopedAutoreleasePool.cpp
@@ -14,7 +14,7 @@
#include "utils/ScopedAutoreleasePool.h"
-#include "common/Compiler.h"
+#include "dawn/common/Compiler.h"
namespace utils {
diff --git a/src/utils/ScopedAutoreleasePool.h b/src/utils/ScopedAutoreleasePool.h
index bc587fa..bd00a1a 100644
--- a/src/utils/ScopedAutoreleasePool.h
+++ b/src/utils/ScopedAutoreleasePool.h
@@ -15,7 +15,7 @@
#ifndef UTILS_SCOPEDAUTORELEASEPOOL_H_
#define UTILS_SCOPEDAUTORELEASEPOOL_H_
-#include "common/Compiler.h"
+#include "dawn/common/Compiler.h"
#include <cstddef>
@@ -49,7 +49,7 @@
ScopedAutoreleasePool(const ScopedAutoreleasePool&) = delete;
ScopedAutoreleasePool& operator=(const ScopedAutoreleasePool&) = delete;
- ScopedAutoreleasePool(ScopedAutoreleasePool&&);
+ ScopedAutoreleasePool(ScopedAutoreleasePool &&);
ScopedAutoreleasePool& operator=(ScopedAutoreleasePool&&);
private:
diff --git a/src/utils/SystemUtils.cpp b/src/utils/SystemUtils.cpp
index b72a2ca..9010e2b 100644
--- a/src/utils/SystemUtils.cpp
+++ b/src/utils/SystemUtils.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "common/Platform.h"
+#include "dawn/common/Platform.h"
#if defined(DAWN_PLATFORM_WINDOWS)
# include <Windows.h>
diff --git a/src/utils/TerribleCommandBuffer.cpp b/src/utils/TerribleCommandBuffer.cpp
index 9985d6a..975962d 100644
--- a/src/utils/TerribleCommandBuffer.cpp
+++ b/src/utils/TerribleCommandBuffer.cpp
@@ -14,7 +14,7 @@
#include "utils/TerribleCommandBuffer.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
namespace utils {
diff --git a/src/utils/TestUtils.cpp b/src/utils/TestUtils.cpp
index d55a8c2..a67182d 100644
--- a/src/utils/TestUtils.cpp
+++ b/src/utils/TestUtils.cpp
@@ -14,9 +14,9 @@
#include "utils/TestUtils.h"
-#include "common/Assert.h"
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
#include "utils/TextureUtils.h"
#include "utils/WGPUHelpers.h"
diff --git a/src/utils/TextureUtils.h b/src/utils/TextureUtils.h
index fac5552..092a637 100644
--- a/src/utils/TextureUtils.h
+++ b/src/utils/TextureUtils.h
@@ -19,7 +19,7 @@
#include <dawn/webgpu_cpp.h>
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
namespace utils {
// TODO(dawn:666): Add Stencil8 format when it's implemented.
diff --git a/src/utils/VulkanBinding.cpp b/src/utils/VulkanBinding.cpp
index b4cc02a..ce856c5 100644
--- a/src/utils/VulkanBinding.cpp
+++ b/src/utils/VulkanBinding.cpp
@@ -14,7 +14,7 @@
#include "utils/BackendBinding.h"
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
#include "dawn_native/VulkanBackend.h"
// Include GLFW after VulkanBackend so that it declares the Vulkan-specific functions
diff --git a/src/utils/WGPUHelpers.cpp b/src/utils/WGPUHelpers.cpp
index c385215..4fab43f 100644
--- a/src/utils/WGPUHelpers.cpp
+++ b/src/utils/WGPUHelpers.cpp
@@ -14,8 +14,8 @@
#include "utils/WGPUHelpers.h"
-#include "common/Constants.h"
-#include "common/Log.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Log.h"
#include "spirv-tools/optimizer.hpp"
diff --git a/src/utils/WGPUHelpers.h b/src/utils/WGPUHelpers.h
index 0dff178..540d171 100644
--- a/src/utils/WGPUHelpers.h
+++ b/src/utils/WGPUHelpers.h
@@ -21,7 +21,7 @@
#include <initializer_list>
#include <vector>
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
#include "utils/TextureUtils.h"
namespace utils {
diff --git a/src/utils/WindowsDebugLogger.cpp b/src/utils/WindowsDebugLogger.cpp
index bcf9670..1190339 100644
--- a/src/utils/WindowsDebugLogger.cpp
+++ b/src/utils/WindowsDebugLogger.cpp
@@ -14,8 +14,8 @@
#include "utils/PlatformDebugLogger.h"
-#include "common/Assert.h"
-#include "common/windows_with_undefs.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/windows_with_undefs.h"
#include <array>
#include <thread>
diff --git a/src/utils/WireHelper.cpp b/src/utils/WireHelper.cpp
index 4745f01..afa4a8c 100644
--- a/src/utils/WireHelper.cpp
+++ b/src/utils/WireHelper.cpp
@@ -14,9 +14,9 @@
#include "utils/WireHelper.h"
-#include "common/Assert.h"
-#include "common/Log.h"
-#include "common/SystemUtils.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Log.h"
+#include "dawn/common/SystemUtils.h"
#include "dawn/dawn_proc.h"
#include "dawn_native/DawnNative.h"
#include "dawn_wire/WireClient.h"
