Skip to content

Commit 4ef6361

Browse files
Bump dawn
1 parent 74e1bd5 commit 4ef6361

File tree

2 files changed

+1198
-737
lines changed

2 files changed

+1198
-737
lines changed

cmake/dawn.cmake

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ if(NOT DAWN_BUILD_FOUND)
6868

6969
set(DAWN_ALWAYS_ASSERT ON CACHE INTERNAL "Always assert in Dawn" FORCE)
7070
set(DAWN_BUILD_PROTOBUF OFF CACHE INTERNAL "Build protobuf" FORCE)
71-
set(DAWN_BUILD_MONOLITHIC_LIBRARY ON CACHE INTERNAL "Build Dawn monolithically" FORCE)
71+
set(DAWN_BUILD_MONOLITHIC_LIBRARY SHARED CACHE INTERNAL "Build Dawn monolithically" FORCE)
7272
set(DAWN_BUILD_EXAMPLES OFF CACHE INTERNAL "Build Dawn examples" FORCE)
7373
set(DAWN_BUILD_SAMPLES OFF CACHE INTERNAL "Build Dawn samples" FORCE)
7474
set(DAWN_BUILD_TESTS OFF CACHE INTERNAL "Build Dawn tests" FORCE)
@@ -80,7 +80,7 @@ if(NOT DAWN_BUILD_FOUND)
8080
set(TINT_BUILD_DOCS OFF CACHE INTERNAL "Build Tint docs" FORCE)
8181
set(DAWN_EMSCRIPTEN_TOOLCHAIN ${EMSCRIPTEN_DIR} CACHE INTERNAL "Emscripten toolchain" FORCE)
8282

83-
set(DAWN_COMMIT "66d57f910357befb441b91162f29a97f687af6d9" CACHE STRING "Dawn commit to checkout" FORCE)
83+
set(DAWN_COMMIT "e1d6e12337080cf9f6d8726209e86df449bc6e9a" CACHE STRING "Dawn commit to checkout" FORCE)
8484

8585
file(MAKE_DIRECTORY ${DAWN_DIR})
8686
# Initialize Git and set/update remote.
@@ -118,6 +118,13 @@ if(NOT DAWN_BUILD_FOUND)
118118
endif()
119119
endif()
120120

121+
set(FIX_FILE "${DAWN_DIR}/src/dawn/native/metal/PhysicalDeviceMTL.mm")
122+
if(EXISTS "${FIX_FILE}")
123+
file(READ "${FIX_FILE}" FIX_CONTENT)
124+
string(REGEX REPLACE "kIOMainPortDefault" "0" FIX_CONTENT "${FIX_CONTENT}")
125+
file(WRITE "${FIX_FILE}" "${FIX_CONTENT}")
126+
endif()
127+
121128
# Fetch the Dawn repository if not already present.
122129
FetchContent_Declare(
123130
dawn

0 commit comments

Comments
 (0)