From 5c7ee8b04ab9febc11a6b79cfb54af6803e03c26 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Fri, 4 Apr 2025 17:31:03 -0600 Subject: [PATCH] Link static dawn on Windows --- CMakeLists.txt | 3 ++- lib/webgpu/gpu.cpp | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7dde9a3..bc5d9b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,13 +53,14 @@ if (EMSCRIPTEN) target_link_options(aurora PUBLIC -sUSE_WEBGPU=1 -sASYNCIFY -sEXIT_RUNTIME) target_compile_definitions(aurora PRIVATE ENABLE_BACKEND_WEBGPU) else () - target_link_libraries(aurora PRIVATE dawn_native dawncpp webgpu_dawn) + target_link_libraries(aurora PRIVATE dawn::dawn_native dawn::dawn_proc) target_sources(aurora PRIVATE lib/dawn/BackendBinding.cpp) target_compile_definitions(aurora PRIVATE WEBGPU_DAWN) endif () target_link_libraries(aurora PRIVATE absl::btree absl::flat_hash_map) if (DAWN_ENABLE_VULKAN) target_compile_definitions(aurora PRIVATE DAWN_ENABLE_BACKEND_VULKAN) + target_link_libraries(aurora PRIVATE Vulkan::Headers) endif () if (DAWN_ENABLE_METAL) target_compile_definitions(aurora PRIVATE DAWN_ENABLE_BACKEND_METAL) diff --git a/lib/webgpu/gpu.cpp b/lib/webgpu/gpu.cpp index 0876cc9..2b8e5f5 100644 --- a/lib/webgpu/gpu.cpp +++ b/lib/webgpu/gpu.cpp @@ -17,6 +17,7 @@ #ifdef WEBGPU_DAWN #include "../dawn/BackendBinding.hpp" #include +#include #endif namespace aurora::webgpu { @@ -287,6 +288,10 @@ static wgpu::BackendType to_wgpu_backend(AuroraBackend backend) { bool initialize(AuroraBackend auroraBackend) { if (!g_instance) { +#ifdef WEBGPU_DAWN + Log.report(LOG_INFO, "Initializing Dawn"); + dawnProcSetProcs(&dawn::native::GetProcs()); +#endif Log.report(LOG_INFO, "Creating WGPU instance"); wgpu::InstanceDescriptor instanceDescriptor{ .capabilities =