From 2ec0d179d401d014868515b117f4146900dfdd43 Mon Sep 17 00:00:00 2001
From: xiaozhuai <798047000@qq.com>
Date: Mon, 29 Jun 2026 19:43:16 +0800
Subject: [PATCH] [dawn] Update to 20260624.223603

---
 ports/dawn/002-fix-uwp.patch                   | 18 ------------------
 ports/dawn/007-fix-tint-null-only-writer.patch | 13 -------------
 ports/dawn/portfile.cmake                      | 11 +++--------
 ports/dawn/vcpkg.json                          |  2 +-
 versions/baseline.json                         |  2 +-
 versions/d-/dawn.json                          |  5 +++++
 6 files changed, 10 insertions(+), 41 deletions(-)
 delete mode 100644 ports/dawn/002-fix-uwp.patch
 delete mode 100644 ports/dawn/007-fix-tint-null-only-writer.patch

diff --git a/ports/dawn/002-fix-uwp.patch b/ports/dawn/002-fix-uwp.patch
deleted file mode 100644
index 1ecaea1a4c7471..00000000000000
--- a/ports/dawn/002-fix-uwp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/dawn/native/d3d/PlatformFunctions.cpp b/src/dawn/native/d3d/PlatformFunctions.cpp
-index 9f5cd6e94a..db7ca74019 100644
---- a/src/dawn/native/d3d/PlatformFunctions.cpp
-+++ b/src/dawn/native/d3d/PlatformFunctions.cpp
-@@ -122,12 +122,12 @@ MaybeError PlatformFunctions::EnsureFXC(std::span<const std::string> searchPaths
- }
- 
- void PlatformFunctions::InitWindowsVersion() {
-+#if !DAWN_PLATFORM_IS(WINUWP)
-     // Currently we only care about the build number of Windows 10 and Windows 11.
-     if (!IsWindows10OrGreater()) {
-         return;
-     }
- 
--#if !DAWN_PLATFORM_IS(WINUWP)
-     // Referenced from base/win/windows_version.cc in Chromium
-     constexpr wchar_t kRegKeyWindowsNTCurrentVersion[] =
-         L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion";
diff --git a/ports/dawn/007-fix-tint-null-only-writer.patch b/ports/dawn/007-fix-tint-null-only-writer.patch
deleted file mode 100644
index 39c4e47f7df616..00000000000000
--- a/ports/dawn/007-fix-tint-null-only-writer.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/tint/lang/null/writer/common/options.h b/src/tint/lang/null/writer/common/options.h
-index 3401c5abb0..fdd7c85471 100644
---- a/src/tint/lang/null/writer/common/options.h
-+++ b/src/tint/lang/null/writer/common/options.h
-@@ -30,6 +30,8 @@
- 
- #include <string>
- 
-+#include "src/tint/api/common/binding_point.h"
-+#include "src/tint/api/common/bindings.h"
- #include "src/tint/api/common/substitute_overrides_config.h"
- #include "src/tint/utils/reflection/reflection.h"
- 
diff --git a/ports/dawn/portfile.cmake b/ports/dawn/portfile.cmake
index ab98a9187e2f13..1db2c2b8253649 100644
--- a/ports/dawn/portfile.cmake
+++ b/ports/dawn/portfile.cmake
@@ -2,7 +2,7 @@ if (VCPKG_TARGET_IS_EMSCRIPTEN)
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/google/dawn/releases/download/v${VERSION}/emdawnwebgpu_pkg-v${VERSION}.zip"
         FILENAME "emdawnwebgpu_pkg-v${VERSION}.zip"
-        SHA512 f3649765536fa308cac31e36aaf819c1ce9a9f9f16e055f4419b8ac8617516b44bdd701461d25018a87cc1b7e7b8be860db338fdb7da9cd859d0019070667cdd
+        SHA512 615257384ad7df17174c5733c17d8ac0473dfdcddeac69e334d7109501954dc42e77ed54deb666bf44581fcf8e69c2365311626786cd267e52a3d48d7a9441c5
     )
     vcpkg_extract_source_archive(
         SOURCE_PATH
@@ -36,18 +36,13 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/dawn
     REF "v${VERSION}"
-    SHA512 47fa49d9fe5d3adec694a07709c6f1a515a4f1f850b5ca602205aa2080695e0228752879182ddaad2bd8f9bc40fe87aa39755e9e4e034dc5b45289bb5a57b7e5
+    SHA512 d26d95efd20006f1949804e27c766c31a88183daf7d1c3f42022d856042ea523e1253adb8c90a365bad10a7c3e80acefbae5a3ed6d761f9754573a678283c674
     HEAD_REF master
     PATCHES
         001-fix-windows-build.patch
-        002-fix-uwp.patch
         003-force-disable-cxx-module.patch
         004-deps.patch
         005-bsd-support.patch
-        # https://github.com/google/dawn/commit/fa4a364b9ff215f9fe95823ec89ccc922cf7b254 added a tint writer for the null backend.
-        # When building dawn[core] which only enables dawns null backend and tints null writer, src/dawn/native/ShaderModule.cpp failed to compile
-        # as it was expecting a transitive include of tint::Bindings from a shader language writer.
-        007-fix-tint-null-only-writer.patch
         008-wrong-dxcapi-include.patch
         009-fix-tint-install.patch
         010-fix-glslang.patch
@@ -105,7 +100,7 @@ checkout_in_path(
 checkout_in_path(
     "${SOURCE_PATH}/third_party/webgpu-headers/src"
     "https://github.com/webgpu-native/webgpu-headers"
-    "bf8ddb91dc38ea11ec1b727dae1fa965c4207d22"
+    "a11ef4462405c4506ad7284e5b1edeff2750bb54"
 )
 
 vcpkg_find_acquire_program(PYTHON3)
diff --git a/ports/dawn/vcpkg.json b/ports/dawn/vcpkg.json
index a89145b77c763e..499c506417d752 100644
--- a/ports/dawn/vcpkg.json
+++ b/ports/dawn/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "dawn",
-  "version": "20260623.191042",
+  "version": "20260624.223603",
   "description": "Dawn is an open-source and cross-platform implementation of the WebGPU standard.",
   "homepage": "https://dawn.googlesource.com/dawn",
   "license": "BSD-3-Clause",
diff --git a/versions/baseline.json b/versions/baseline.json
index 2907abbe21a0de..8de81c3b5d5f89 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2425,7 +2425,7 @@
       "port-version": 0
     },
     "dawn": {
-      "baseline": "20260623.191042",
+      "baseline": "20260624.223603",
       "port-version": 0
     },
     "daxa": {
diff --git a/versions/d-/dawn.json b/versions/d-/dawn.json
index c191dca1d08386..7319cc6ffe6cf2 100644
--- a/versions/d-/dawn.json
+++ b/versions/d-/dawn.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "674181babc69b624fec7a64ce61f46fb11ecada3",
+      "version": "20260624.223603",
+      "port-version": 0
+    },
     {
       "git-tree": "7d3bbb5624d7772619116b5c40188bcd6aa8f8eb",
       "version": "20260623.191042",