Manual Dawn roll
Change-Id: If5dd06b3358a18219f63619852372edf0cada5bf
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/662203
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Auto-Submit: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
diff --git a/DEPS b/DEPS
index 83176d1..1de04c5 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@29428679c4e885d20cf110949a1181abad1d9b59",
+ "third_party/externals/dawn" : "https://dawn.googlesource.com/dawn.git@8e414572be8c970db605f8fb04bae214c819d52e",
"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 4af7dea..ddbe350 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 = "29428679c4e885d20cf110949a1181abad1d9b59",
+ commit = "8e414572be8c970db605f8fb04bae214c819d52e",
remote = "https://dawn.googlesource.com/dawn.git",
)
diff --git a/bazel/external/dawn/BUILD.bazel b/bazel/external/dawn/BUILD.bazel
index cb2aae0..27ab303 100644
--- a/bazel/external/dawn/BUILD.bazel
+++ b/bazel/external/dawn/BUILD.bazel
@@ -577,19 +577,22 @@
"src/dawn/native/vulkan/VulkanFunctions.h",
"src/dawn/native/vulkan/VulkanInfo.cpp",
"src/dawn/native/vulkan/VulkanInfo.h",
+ "src/dawn/native/vulkan/external_memory/MemoryImportParams.h",
"src/dawn/native/vulkan/external_memory/MemoryService.cpp",
"src/dawn/native/vulkan/external_memory/MemoryService.h",
+ "src/dawn/native/vulkan/external_memory/MemoryServiceImplementation.cpp",
+ "src/dawn/native/vulkan/external_memory/MemoryServiceImplementation.h",
"src/dawn/native/vulkan/external_semaphore/SemaphoreService.cpp",
"src/dawn/native/vulkan/external_semaphore/SemaphoreService.h",
- "src/dawn/native/vulkan/external_semaphore/ServiceImplementation.cpp",
- "src/dawn/native/vulkan/external_semaphore/ServiceImplementation.h",
+ "src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementation.cpp",
+ "src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementation.h",
]
DAWN_VULKAN_LINUX_SRCS = [
# From dawn/src/dawn/native/BUILD.gn:sources (dawn_enable_vulkan && is_linux)
- "src/dawn/native/vulkan/external_memory/MemoryServiceOpaqueFD.cpp",
- "src/dawn/native/vulkan/external_semaphore/ServiceImplementationFD.cpp",
- "src/dawn/native/vulkan/external_semaphore/ServiceImplementationFD.h",
+ "src/dawn/native/vulkan/external_memory/MemoryServiceImplementationOpaqueFD.cpp",
+ "src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationFD.cpp",
+ "src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationFD.h",
]
DAWN_VULKAN_DEFINES = [
