[dawn] Update to 20260623.191042 (#52595)

This commit is contained in:
Weihang Ding 2026-06-26 03:55:52 +08:00 committed by GitHub
parent 7b86e24899
commit 4a1f5c05fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 73 additions and 100 deletions

View File

@ -1,19 +1,18 @@
diff --git a/src/dawn/native/d3d/PlatformFunctions.cpp b/src/dawn/native/d3d/PlatformFunctions.cpp
index 12d65e0db5..d3abb05fb5 100644
index 9f5cd6e94a..db7ca74019 100644
--- a/src/dawn/native/d3d/PlatformFunctions.cpp
+++ b/src/dawn/native/d3d/PlatformFunctions.cpp
@@ -121,10 +121,14 @@ MaybeError PlatformFunctions::EnsureFXC(std::span<const std::string> searchPaths
@@ -122,12 +122,12 @@ MaybeError PlatformFunctions::EnsureFXC(std::span<const std::string> searchPaths
}
void PlatformFunctions::InitWindowsVersion() {
+#if DAWN_PLATFORM_IS(WINUWP)
+ return;
+#else
+#if !DAWN_PLATFORM_IS(WINUWP)
// Currently we only care about the build number of Windows 10 and Windows 11.
if (!IsWindows10OrGreater()) {
return;
}
+#endif
-#if !DAWN_PLATFORM_IS(WINUWP)
// Referenced from base/win/windows_version.cc in Chromium
constexpr wchar_t kRegKeyWindowsNTCurrentVersion[] =
L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion";

View File

@ -1,26 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7009ba47a..dc6146148e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,6 +222,12 @@ else()
set(TINT_DEFAULT_GLSL OFF)
endif()
+if (DAWN_ENABLE_D3D11 OR DAWN_ENABLE_D3D12)
+ set(TINT_DEFAULT_HLSL ON)
+else()
+ set(TINT_DEFAULT_HLSL OFF)
+endif()
+
option(TINT_ENABLE_INSTALL "Enable install step for Tint libraries" OFF)
option(TINT_BUILD_CMD_TOOLS "Build the Tint command line tools" ON)
@@ -235,7 +241,7 @@ option(TINT_BUILD_SPV_READER "Build the SPIR-V input reader" ${DAWN_ENABLE_VULKA
option(TINT_BUILD_WGSL_READER "Build the WGSL input reader" ON)
option(TINT_BUILD_GLSL_WRITER "Build the GLSL output writer" ${TINT_DEFAULT_GLSL})
option(TINT_BUILD_GLSL_VALIDATOR "Build the GLSL output validator" ON)
-option(TINT_BUILD_HLSL_WRITER "Build the HLSL output writer" ${DAWN_ENABLE_D3D12})
+option(TINT_BUILD_HLSL_WRITER "Build the HLSL output writer" ${TINT_DEFAULT_HLSL})
option(TINT_BUILD_MSL_WRITER "Build the MSL output writer" ${DAWN_ENABLE_METAL})
option(TINT_BUILD_SPV_WRITER "Build the SPIR-V output writer" ${DAWN_ENABLE_VULKAN})
option(TINT_BUILD_WGSL_WRITER "Build the WGSL output writer" ON)

View File

@ -0,0 +1,9 @@
diff --git a/src/cmake/DawnCompilerChecks.cmake b/src/cmake/DawnCompilerChecks.cmake
index 3db8c7ac0e..14a244b1f5 100644
--- a/src/cmake/DawnCompilerChecks.cmake
+++ b/src/cmake/DawnCompilerChecks.cmake
@@ -77,3 +77,4 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.28
else()
set(DAWN_SUPPORTS_CXX_MODULES False)
endif()
+set(DAWN_SUPPORTS_CXX_MODULES False)

View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc6146148e..390c84d4ca 100644
index 9a90f5b74b..6ca0175556 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -481,6 +481,11 @@ set(TINT_SPIRV_TOOLS_DIR ${DAWN_SPIRV_TOOLS_DIR})
@@ -484,6 +484,11 @@ set(TINT_SPIRV_TOOLS_DIR ${DAWN_SPIRV_TOOLS_DIR})
################################################################################
# Run on all subdirectories
################################################################################
@ -60,10 +60,10 @@ index 8bfeda55bc..a0f9858530 100644
+
include ("${CMAKE_CURRENT_LIST_DIR}/DawnTargets.cmake")
diff --git a/src/dawn/native/CMakeLists.txt b/src/dawn/native/CMakeLists.txt
index 4fa7334557..ca48521325 100644
index 9332ff3c71..5f8da13fe0 100644
--- a/src/dawn/native/CMakeLists.txt
+++ b/src/dawn/native/CMakeLists.txt
@@ -661,11 +661,17 @@ if ((DAWN_ENABLE_OPENGL OR DAWN_ENABLE_VULKAN) AND DAWN_ENABLE_SPIRV_VALIDATION)
@@ -668,11 +668,17 @@ if (DAWN_ENABLE_SPIRV_VALIDATION)
endif()
if (DAWN_ENABLE_OPENGL)
@ -83,7 +83,7 @@ index 4fa7334557..ca48521325 100644
"${Dawn_SOURCE_DIR}/src/dawn/native/opengl/supported_extensions.json"
OUTPUT_HEADERS DAWN_NATIVE_OPENGL_AUTOGEN_HEADERS
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 5f22fcc049..0799d87a5e 100644
index 8ff1eb05f7..d8ebe7c3e1 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -41,6 +41,7 @@ if (DAWN_FETCH_DEPENDENCIES)
@ -102,7 +102,7 @@ index 5f22fcc049..0799d87a5e 100644
if (DAWN_BUILD_PROTOBUF AND EXISTS "${DAWN_PROTOBUF_DIR}/cmake")
if (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") AND WIN32)
@@ -183,10 +185,12 @@ endif()
@@ -182,10 +184,12 @@ endif()
if (DAWN_ENABLE_DESKTOP_GL OR DAWN_ENABLE_OPENGLES)
# Header-only library for khrplatform.h
add_library(dawn_khronos_platform INTERFACE)
@ -117,7 +117,7 @@ index 5f22fcc049..0799d87a5e 100644
if (NOT TARGET Vulkan::Headers AND DAWN_ENABLE_VULKAN)
message(STATUS "Dawn: using Vulkan::Headers at ${DAWN_VULKAN_HEADERS_DIR}")
@@ -203,6 +207,7 @@ if (NOT TARGET Vulkan::UtilityHeaders AND DAWN_ENABLE_VULKAN)
@@ -202,6 +206,7 @@ if (NOT TARGET Vulkan::UtilityHeaders AND DAWN_ENABLE_VULKAN)
message(STATUS "Dawn: using VulkanUtilityLibraries at ${DAWN_VULKAN_UTILITY_LIBRARIES_DIR}")
add_subdirectory(${DAWN_VULKAN_UTILITY_LIBRARIES_DIR} "${CMAKE_CURRENT_BINARY_DIR}/vulkan-utility-libraries/src")
endif()

View File

@ -1,5 +1,5 @@
diff --git a/include/dawn/native/VulkanBackend.h b/include/dawn/native/VulkanBackend.h
index 201bc3242f..3221ad2e37 100644
index 355c4b8646..de67992bd3 100644
--- a/include/dawn/native/VulkanBackend.h
+++ b/include/dawn/native/VulkanBackend.h
@@ -83,7 +83,7 @@ struct ExternalImageExportInfoVk : ExternalImageExportInfo {
@ -11,10 +11,23 @@ index 201bc3242f..3221ad2e37 100644
// Common properties of external images represented by FDs. On successful import the file
// descriptor's ownership is transferred to the Dawn implementation and they shouldn't be
diff --git a/src/dawn/common/Platform.h b/src/dawn/common/Platform.h
index b4ac61004d..cbc5c7b8b5 100644
--- a/src/dawn/common/Platform.h
+++ b/src/dawn/common/Platform.h
diff --git a/src/dawn/native/vulkan/BackendVk.cpp b/src/dawn/native/vulkan/BackendVk.cpp
index 86e89f947c..3d9fad8bec 100644
--- a/src/dawn/native/vulkan/BackendVk.cpp
+++ b/src/dawn/native/vulkan/BackendVk.cpp
@@ -58,7 +58,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftshader.dylib";
#endif
#if DAWN_PLATFORM_IS(LINUX)
-#if DAWN_PLATFORM_IS(ANDROID)
+#if DAWN_PLATFORM_IS(ANDROID) || DAWN_PLATFORM_IS(BSD)
constexpr char kVulkanLibName[] = "libvulkan.so";
#else
constexpr char kVulkanLibName[] = "libvulkan.so.1";
diff --git a/src/utils/platform.h b/src/utils/platform.h
index 4dd58a4878..f0d358a374 100644
--- a/src/utils/platform.h
+++ b/src/utils/platform.h
@@ -60,6 +60,11 @@
#error "Unsupported Windows platform."
#endif
@ -27,16 +40,3 @@ index b4ac61004d..cbc5c7b8b5 100644
#elif defined(__linux__)
#define DAWN_PLATFORM_IS_LINUX 1
#define DAWN_PLATFORM_IS_POSIX 1
diff --git a/src/dawn/native/vulkan/BackendVk.cpp b/src/dawn/native/vulkan/BackendVk.cpp
index c34bd57693..4fd060e5bf 100644
--- a/src/dawn/native/vulkan/BackendVk.cpp
+++ b/src/dawn/native/vulkan/BackendVk.cpp
@@ -57,7 +57,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftshader.dylib";
#endif
#if DAWN_PLATFORM_IS(LINUX)
-#if DAWN_PLATFORM_IS(ANDROID)
+#if DAWN_PLATFORM_IS(ANDROID) || DAWN_PLATFORM_IS(BSD)
constexpr char kVulkanLibName[] = "libvulkan.so";
#else
constexpr char kVulkanLibName[] = "libvulkan.so.1";

View File

@ -1,5 +1,5 @@
diff --git a/src/tint/lang/hlsl/validate/validate.cc b/src/tint/lang/hlsl/validate/validate.cc
index 1a50bfacf0..2203921385 100644
index ef69931d97..0f96aae51a 100644
--- a/src/tint/lang/hlsl/validate/validate.cc
+++ b/src/tint/lang/hlsl/validate/validate.cc
@@ -51,7 +51,7 @@ TINT_BEGIN_DISABLE_ALL_WARNINGS();

View File

@ -1,18 +1,8 @@
diff --git a/src/tint/CMakeLists.txt b/src/tint/CMakeLists.txt
index ed9c73d9f4..a4fa0b4a92 100644
index 489e2e9a0a..48e9b23909 100644
--- a/src/tint/CMakeLists.txt
+++ b/src/tint/CMakeLists.txt
@@ -420,7 +420,9 @@ function(tint_add_target TARGET KIND)
elseif(${KIND} STREQUAL cmd)
add_executable(${TARGET})
tint_default_compile_options(${TARGET})
+ if(TINT_ENABLE_INSTALL)
install(TARGETS "${TARGET}")
+ endif()
elseif(${KIND} STREQUAL test_cmd)
add_executable(${TARGET})
tint_test_cmd_compile_options(${TARGET})
@@ -761,3 +763,9 @@ if (TINT_ENABLE_INSTALL)
@@ -766,3 +766,9 @@ if (TINT_ENABLE_INSTALL)
install(FILES ${TINT_ROOT_SOURCE_DIR}/${TINT_HEADER_FILE} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/src/tint/${TINT_HEADER_DIR})
endforeach ()
endif()

View File

@ -1,5 +1,5 @@
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 0799d87a5e..78cc35d582 100644
index d8ebe7c3e1..1d9cbdb5e4 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -122,6 +122,12 @@ if (EMSCRIPTEN)

View File

@ -1,8 +1,8 @@
diff --git a/src/dawn/native/CMakeLists.txt b/src/dawn/native/CMakeLists.txt
index ca48521325..5c5de6dadb 100644
index 5f8da13fe0..ed6ca7f401 100644
--- a/src/dawn/native/CMakeLists.txt
+++ b/src/dawn/native/CMakeLists.txt
@@ -976,7 +976,6 @@ if (DAWN_ENABLE_D3D12)
@@ -989,7 +989,6 @@ if (DAWN_ENABLE_D3D12)
if (DAWN_USE_BUILT_DXC)
target_compile_definitions(dawn_native PRIVATE "DAWN_USE_BUILT_DXC")
target_compile_definitions(dawn_native_objects PRIVATE "DAWN_USE_BUILT_DXC")
@ -10,7 +10,7 @@ index ca48521325..5c5de6dadb 100644
endif()
endif()
@@ -1078,7 +1077,7 @@ endif ()
@@ -1090,7 +1089,7 @@ endif ()
# They happen because dxcompiler is declared a shared library and bundle_libraries
# doesn't work well with shared libs
if (DAWN_USE_BUILT_DXC)
@ -20,10 +20,10 @@ index ca48521325..5c5de6dadb 100644
# Copy d3dcompiler_47.dll from Windows SDK when not using system component loading
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 78cc35d582..e8d6cfdf48 100644
index 1d9cbdb5e4..51777b59a4 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -371,7 +371,7 @@ function(AddSubdirectoryDXC)
@@ -370,7 +370,7 @@ function(AddSubdirectoryDXC)
endfunction()
if (DAWN_USE_BUILT_DXC)

View File

@ -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 42784f70b67197c614322f9fabb0f1dc64228a0de10e88f99941fa9d29bee9ad6683f4651d4eefd5a7a9fbd1f976eb522b190b683219ed1793e9b531c602ffa6
SHA512 f3649765536fa308cac31e36aaf819c1ce9a9f9f16e055f4419b8ac8617516b44bdd701461d25018a87cc1b7e7b8be860db338fdb7da9cd859d0019070667cdd
)
vcpkg_extract_source_archive(
SOURCE_PATH
@ -36,12 +36,12 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/dawn
REF "v${VERSION}"
SHA512 da4057fc5f92d451a008a22f5089256ec1f021953aa979b224e3ccc8ac68ce468b54226378dea8a6dbff2d62ca2ab80074410ddd3ded50740cda6c1428987121
SHA512 47fa49d9fe5d3adec694a07709c6f1a515a4f1f850b5ca602205aa2080695e0228752879182ddaad2bd8f9bc40fe87aa39755e9e4e034dc5b45289bb5a57b7e5
HEAD_REF master
PATCHES
001-fix-windows-build.patch
002-fix-uwp.patch
003-fix-d3d11.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.
@ -90,22 +90,22 @@ checkout_in_path(
checkout_in_path(
"${SOURCE_PATH}/third_party/spirv-headers/src"
"https://github.com/KhronosGroup/SPIRV-Headers"
"ad9184e76a66b1001c29db9b0a3e87f646c64de0"
"c63848ecf2200425511319fd8bf2c17b751e501e"
)
checkout_in_path(
"${SOURCE_PATH}/third_party/spirv-tools/src"
"https://github.com/KhronosGroup/SPIRV-Tools"
"ff5c50339cc1e9f34f04cb440a3e5fe89db0161d"
"58fe144fdc8847b303be51d4f8fcc9e7da17056e"
PATCHES
# Dawn sets SPIRV_WERROR to OFF when building SPIRV-Tools, but https://github.com/KhronosGroup/SPIRV-Tools/commit/337fdb6a284fe7f7e374a14271f8e20e579f3263 ignores that CMake variable and forces /WX
006-msvc-spirv-tools-disable-warnaserror.patch
800-msvc-spirv-tools-disable-warnaserror.patch
)
checkout_in_path(
"${SOURCE_PATH}/third_party/webgpu-headers/src"
"https://github.com/webgpu-native/webgpu-headers"
"dc16b3e531cf4f31be54236d1a3e988ba5f295a2"
"bf8ddb91dc38ea11ec1b727dae1fa965c4207d22"
)
vcpkg_find_acquire_program(PYTHON3)

View File

@ -1,6 +1,6 @@
{
"name": "dawn",
"version": "20260423.175430",
"version": "20260623.191042",
"description": "Dawn is an open-source and cross-platform implementation of the WebGPU standard.",
"homepage": "https://dawn.googlesource.com/dawn",
"license": "BSD-3-Clause",

View File

@ -1,7 +1,9 @@
cmake_minimum_required(VERSION 3.15)
project(vcpkg_ci_dawn)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
find_package(glfw3 CONFIG REQUIRED)

View File

@ -1,9 +1,9 @@
diff --git a/examples/example_glfw_wgpu/CMakeLists.txt b/examples/example_glfw_wgpu/CMakeLists.txt
index 11248df..f34d704 100644
index 4eaaee762..3e3254e60 100644
--- a/examples/example_glfw_wgpu/CMakeLists.txt
+++ b/examples/example_glfw_wgpu/CMakeLists.txt
@@ -35,20 +35,11 @@ endif()
set(CMAKE_CXX_STANDARD 17) # Dawn requires C++17
@@ -40,20 +40,11 @@ endif()
set(CMAKE_CXX_STANDARD 20) # Dawn requires C++20
# Dear ImGui
-set(IMGUI_DIR ../../)
@ -24,7 +24,7 @@ index 11248df..f34d704 100644
)
if(EMSCRIPTEN)
@@ -147,6 +138,7 @@ else() # Native/Desktop build
@@ -172,6 +163,7 @@ else() # Native/Desktop build
endif()
add_executable(${IMGUI_EXECUTABLE} ${IMGUI_EXAMPLE_SOURCE_FILES})

View File

@ -1,11 +1,10 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
# https://github.com/ocornut/imgui/tree/v1.92.5/examples/example_glfw_wgpu
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ocornut/imgui
REF v1.92.6
SHA512 1742eaa4811fc63f4ed3804ecd6970cbc0a960c85014903e302ab082ccf7ff7488d534bd4cb7a6d7c2a71824cb80d6c9923ea5a4951190941121cf1b05e3df9d
REF be374fa598aae658ea43f843a6d821b2957d4a83 # 2026-06-24
SHA512 1db92d036a0505389d6259dd5afe4638acc1747554378dfbcb730f8b8b843b9007fbce2046845eccff51aa552adf82a3cd4fb454d834cef95b04ed687bcb4a17
HEAD_REF master
PATCHES
# use find_package(imgui) instead of source file list

View File

@ -6,13 +6,7 @@
"license": "MIT",
"dependencies": [
{
"name": "imgui",
"features": [
"test-engine"
]
},
{
"name":"glfw3",
"name": "glfw3",
"features": [
"wayland"
],
@ -22,6 +16,7 @@
"name": "imgui",
"features": [
"glfw-binding",
"test-engine",
"webgpu-binding"
]
},

View File

@ -2425,7 +2425,7 @@
"port-version": 0
},
"dawn": {
"baseline": "20260423.175430",
"baseline": "20260623.191042",
"port-version": 0
},
"daxa": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7d3bbb5624d7772619116b5c40188bcd6aa8f8eb",
"version": "20260623.191042",
"port-version": 0
},
{
"git-tree": "979147dd294298634d3a788ed7a8f2b79357eceb",
"version": "20260423.175430",