diff --git a/DEPS b/DEPS
index 0632d84..e31b277 100644
--- a/DEPS
+++ b/DEPS
@@ -24,7 +24,7 @@
   "third_party/externals/d3d12allocator"         : "https://skia.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git@169895d529dfce00390a20e69c2f516066fe7a3b",
   # Dawn requires jinja2 and markupsafe for the code generator, tint for SPIRV compilation, and abseil for string formatting.
   # When the Dawn revision is updated these should be updated from the Dawn DEPS as well.
-  "third_party/externals/dawn"                   : "https://dawn.googlesource.com/dawn.git@ffe356d558bce8b912890d8080dc7be94c0b0c2d",
+  "third_party/externals/dawn"                   : "https://dawn.googlesource.com/dawn.git@6c8aa8aff9d13050080ce3e7c471d5a72273ade7",
   "third_party/externals/jinja2"                 : "https://chromium.googlesource.com/chromium/src/third_party/jinja2@ee69aa00ee8536f61db6a451f3858745cf587de6",
   "third_party/externals/markupsafe"             : "https://chromium.googlesource.com/chromium/src/third_party/markupsafe@0944e71f4b2cb9a871bcbe353f95e889b64a611a",
   "third_party/externals/abseil-cpp"             : "https://skia.googlesource.com/external/github.com/abseil/abseil-cpp.git@cb436cf0142b4cbe47aae94223443df7f82e2920",
diff --git a/bazel/deps.bzl b/bazel/deps.bzl
index f559b72..5f900fd 100644
--- a/bazel/deps.bzl
+++ b/bazel/deps.bzl
@@ -22,7 +22,7 @@
     new_git_repository(
         name = "dawn",
         build_file = "@//bazel/external/dawn:BUILD.bazel",
-        commit = "ffe356d558bce8b912890d8080dc7be94c0b0c2d",
+        commit = "6c8aa8aff9d13050080ce3e7c471d5a72273ade7",
         remote = "https://dawn.googlesource.com/dawn.git",
     )
 
diff --git a/bazel/external/dawn/BUILD.bazel b/bazel/external/dawn/BUILD.bazel
index 731f54f..07bda7e 100644
--- a/bazel/external/dawn/BUILD.bazel
+++ b/bazel/external/dawn/BUILD.bazel
@@ -712,6 +712,8 @@
     "src/tint/ast/depth_multisampled_texture.h",
     "src/tint/ast/depth_texture.cc",
     "src/tint/ast/depth_texture.h",
+    "src/tint/ast/diagnostic_control.cc",
+    "src/tint/ast/diagnostic_control.h",
     "src/tint/ast/disable_validation_attribute.cc",
     "src/tint/ast/disable_validation_attribute.h",
     "src/tint/ast/discard_statement.cc",
@@ -795,8 +797,8 @@
     "src/tint/ast/stage_attribute.h",
     "src/tint/ast/statement.cc",
     "src/tint/ast/statement.h",
-    "src/tint/ast/static_assert.cc",
-    "src/tint/ast/static_assert.h",
+    "src/tint/ast/const_assert.cc",
+    "src/tint/ast/const_assert.h",
     "src/tint/ast/storage_texture.cc",
     "src/tint/ast/storage_texture.h",
     "src/tint/ast/stride_attribute.cc",
@@ -1147,6 +1149,8 @@
     "src/tint/type/sampled_texture.h",
     "src/tint/type/sampler.cc",
     "src/tint/type/sampler.h",
+    "src/tint/type/sampler_kind.cc",
+    "src/tint/type/sampler_kind.h",
     "src/tint/type/short_name.cc",
     "src/tint/type/short_name.h",
     "src/tint/type/storage_texture.cc",