Manually roll Dawn

https://dawn.googlesource.com/dawn.git/+log/0fc525ad21d9..b04e622eeae

Needed to delete call to swapchain::Configure, as it was deleted
in https://dawn-review.googlesource.com/c/dawn/+/126425

Change-Id: I853a998c9b667f81aaf622c98b6ac246bc6d066e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/669857
Auto-Submit: Kevin Lubick <[email protected]>
Commit-Queue: Michael Ludwig <[email protected]>
Reviewed-by: Michael Ludwig <[email protected]>
Commit-Queue: Kevin Lubick <[email protected]>

DEPS

@@ -24,7 +24,7 @@ deps = {
   "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@0fc525ad21d9ca8907639bb6cc8856cc6c67d5de",
+  "third_party/externals/dawn"                   : "https://dawn.googlesource.com/dawn.git@b04e622eeaea570df4e0e2b29dcc6425ce29f406",
   "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",

bazel/deps.bzl

@@ -22,7 +22,7 @@ def git_repos_from_deps():
     new_git_repository(
         name = "dawn",
         build_file = "@//bazel/external/dawn:BUILD.bazel",
-        commit = "0fc525ad21d9ca8907639bb6cc8856cc6c67d5de",
+        commit = "b04e622eeaea570df4e0e2b29dcc6425ce29f406",
         remote = "https://dawn.googlesource.com/dawn.git",
     )
 

bazel/external/dawn/BUILD.bazel

@@ -229,7 +229,6 @@ DAWN_HDRS = [
     "include/dawn/EnumClassBitmasks.h",
     "include/dawn/dawn_proc.h",
     "include/dawn/dawn_thread_dispatch_proc.h",
-    "include/dawn/dawn_wsi.h",
     "include/dawn/native/D3D12Backend.h",
     "include/dawn/native/DawnNative.h",
     "include/dawn/native/MetalBackend.h",
@@ -460,15 +459,15 @@ DAWN_SRCS = [
     "src/dawn/common/DynamicLib.h",
     "src/dawn/common/GPUInfo.cpp",
     "src/dawn/common/GPUInfo.h",
-    "src/dawn/common/GPUInfo_autogen.cpp",
-    "src/dawn/common/GPUInfo_autogen.h",
     "src/dawn/common/HashUtils.h",
     "src/dawn/common/IOKitRef.h",
     "src/dawn/common/LinkedList.h",
     "src/dawn/common/Log.cpp",
     "src/dawn/common/Log.h",
     "src/dawn/common/Math.cpp",
     "src/dawn/common/Math.h",
+    "src/dawn/common/Mutex.cpp",
+    "src/dawn/common/Mutex.h",
     "src/dawn/common/NSRef.h",
     "src/dawn/common/NonCopyable.h",
     "src/dawn/common/Numeric.h",
@@ -486,20 +485,22 @@ DAWN_SRCS = [
     "src/dawn/common/SlabAllocator.cpp",
     "src/dawn/common/SlabAllocator.h",
     "src/dawn/common/StackContainer.h",
-    "src/dawn/common/SwapChainUtils.h",
     "src/dawn/common/SystemUtils.cpp",
     "src/dawn/common/SystemUtils.h",
     "src/dawn/common/TypeTraits.h",
     "src/dawn/common/TypedInteger.h",
     "src/dawn/common/UnderlyingType.h",
-    "src/dawn/common/Version_autogen.h",
     "src/dawn/common/ityp_array.h",
     "src/dawn/common/ityp_bitset.h",
     "src/dawn/common/ityp_span.h",
     "src/dawn/common/ityp_stack_vec.h",
     "src/dawn/common/ityp_vector.h",
     "src/dawn/common/vulkan_platform.h",
     "src/dawn/common/xlib_with_undefs.h",
+    # Generated files in dawn/src/dawn/common/BUILD.gn
+    "src/dawn/common/GPUInfo_autogen.cpp",
+    "src/dawn/common/GPUInfo_autogen.h",
+    "src/dawn/common/Version_autogen.h",
     # From dawn/src/dawn/platform/BUILD.gn:platform
     "include/dawn/platform/DawnPlatform.h",
     "include/dawn/platform/dawn_platform_export.h",
@@ -540,8 +541,6 @@ DAWN_VULKAN_SRCS = [
     "src/dawn/native/vulkan/FencedDeleter.cpp",
     "src/dawn/native/vulkan/FencedDeleter.h",
     "src/dawn/native/vulkan/Forward.h",
-    "src/dawn/native/vulkan/NativeSwapChainImplVk.cpp",
-    "src/dawn/native/vulkan/NativeSwapChainImplVk.h",
     "src/dawn/native/vulkan/PipelineCacheVk.cpp",
     "src/dawn/native/vulkan/PipelineCacheVk.h",
     "src/dawn/native/vulkan/PipelineLayoutVk.cpp",

tools/sk_app/DawnWindowContext.cpp

@@ -109,7 +109,6 @@ void DawnWindowContext::resize(int w, int h) {
         fContext.reset();
         return;
     }
-    fSwapChain.Configure(fSwapChainFormat, kUsage, fWidth, fHeight);
 }
 
 void DawnWindowContext::setDisplayParams(const DisplayParams& params) {

tools/sk_app/GraphiteDawnWindowContext.cpp

@@ -134,7 +134,6 @@ wgpu::SwapChain GraphiteDawnWindowContext::createSwapChain() {
     swapChainDesc.width = fWidth;
     swapChainDesc.height = fHeight;
     swapChainDesc.presentMode = wgpu::PresentMode::Fifo;
-    swapChainDesc.implementation = 0;
     auto swapChain = fDevice.CreateSwapChain(fSurface, &swapChainDesc);
     SkASSERT(swapChain);
     return swapChain;

whitespace.txt

@@ -7,7 +7,7 @@ Life is a mistry. Everyone must WAKA WAKA WAKA
 This file has gotten so boring.
 epoger added this line using a pure git checkout
 florin was here
-more  whitespace
+more   whitespace
 all the things!!!
 Yet another line.