update for latest changes upstream

.github/workflows/build-dawn.yml

@@ -40,6 +40,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release.outputs.upload_url }}
-          asset_path: "webgpu-${{ steps.build.outputs.BUILD_DATE }}.zip"
-          asset_name: "webgpu-${{ steps.build.outputs.BUILD_DATE }}.zip"
+          asset_path: "webgpu-dawn-${{ steps.build.outputs.BUILD_DATE }}.zip"
+          asset_name: "webgpu-dawn-${{ steps.build.outputs.BUILD_DATE }}.zip"
           asset_content_type: application/zip

README.md

@@ -1,7 +1,7 @@
 Automatic weekly build of [dawn][] WebGPU implementation for 64-bit Windows.
 
-Build produces single `webgpu.dll` file that exports all public Dawn WebGPU C functions.
-To use in your code - either load the `webgpu.dll` file dynamically or link to it via `webgpu.lib` import library.
+Build produces single `webgpu_dawn.dll` file that exports all public Dawn WebGPU C functions.
+To use in your code - either load the `webgpu_dawn.dll` file dynamically or link to it via `webgpu_dawn.lib` import library.
 
 Download binary build as zip archive from [latest release][] page.
 

build.cmd

@@ -64,7 +64,6 @@ if not exist dawn (
   call git clone --depth=1 --no-tags --single-branch https://dawn.googlesource.com/dawn || exit /b 1
 ) else (
   cd dawn
-  call git restore src\dawn\native\CMakeLists.txt
   call git pull --force --no-tags || exit /b 1
   cd ..
 )
@@ -74,8 +73,6 @@ copy /y scripts\standalone.gclient .gclient
 call gclient sync || exit /b 1
 cd ..
 
-type extra.cmake >> dawn\src\dawn\native\CMakeLists.txt
-
 rem
 rem build dawn
 rem
@@ -101,26 +98,26 @@ cmake                                         ^
   || exit /b 1
 
 set CL=/Wv:18
-cmake.exe --build dawn.build --config Release --target webgpu --parallel || exit /b 1
+cmake.exe --build dawn.build --config Release --target webgpu_dawn --parallel || exit /b 1
 
 rem
 rem GitHub actions stuff
 rem
 
-copy /y dawn.build\gen\include\dawn\webgpu.h          .
-copy /y dawn.build\Release\webgpu.dll                 .
-copy /y dawn.build\src\dawn\native\Release\webgpu.lib .
+copy /y dawn.build\gen\include\dawn\webgpu.h               .
+copy /y dawn.build\Release\webgpu_dawn.dll                 .
+copy /y dawn.build\src\dawn\native\Release\webgpu_dawn.lib .
 
 if "%GITHUB_WORKFLOW%" neq "" (
 
   set /p DAWN_COMMIT=<dawn\.git\refs\heads\main
-  echo !DAWN_COMMIT! > dawn_commit.txt
+  echo !DAWN_COMMIT! > webgpu_dawn_commit.txt
 
   for /F "skip=1" %%D in ('WMIC OS GET LocalDateTime') do (set LDATE=%%D & goto :dateok)
   :dateok
   set BUILD_DATE=%LDATE:~0,4%-%LDATE:~4,2%-%LDATE:~6,2%
 
-  %SZIP% a -y -mx=9 webgpu-%BUILD_DATE%.zip webgpu.dll webgpu.lib webgpu.h dawn_commit.txt || exit /b 1
+  %SZIP% a -y -mx=9 webgpu-dawn-%BUILD_DATE%.zip webgpu_dawn.dll webgpu_dawn.lib webgpu.h webgpu_dawn_commit.txt || exit /b 1
 
   echo ::set-output name=DAWN_COMMIT::!DAWN_COMMIT!
   echo ::set-output name=BUILD_DATE::%BUILD_DATE%